Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#39] Updating web client for teacher (0.7.4) #72

Merged
merged 7 commits into from
Jun 4, 2014
Merged

[#39] Updating web client for teacher (0.7.4) #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1d4c879
[#39] Scrolling within the table in the list of iqsets
chrqls May 28, 2014
0d04672
[#39] New interface: this interface limits useless scrolling, less em…
chrqls May 29, 2014
b12a44b
Merge commit 'bc81bd3' into dev
chrqls May 29, 2014
8366d2a
[#39] Ajusting absolute alerts to new design and forcing 2 rows for '…
chrqls May 30, 2014
435e086
[#39] First part (the get part) of the finger selection for iqsets
chrqls May 30, 2014
4dd8296
[#39] Second part (the post part) of the finger selection for iqsets
chrqls Jun 3, 2014
37ceeb3
[#39] Upgrading smileAlert (cross or not), removing old way, removing…
chrqls Jun 3, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
179 changes: 105 additions & 74 deletions static/js/smileteacher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,14 @@
#SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
**/

var VERSION = '0.7.1';
var VERSION = '0.7.4';

// Interval of time used to update the GlobalViewModel
var DELAY_UPDATE_BOARD = 5000;
var DELAY_ERROR = 60000;
var DELAY_SHORT = 5000;
var DELAY_NORMAL = 10000;
var DELAY_LONG = 20000;
var DELAY_NORMAL = 10000;/*
var DELAY_LONG = 20000;*/

var SMILEROUTES = {
'all': '/smile/all',
Expand All @@ -51,6 +52,13 @@ var SMILEROUTES = {

var deamon_updating_board;

$(document).ready(function() {

// Init Data Model
ko.applyBindings(GlobalViewModel);

GlobalViewModel.redirectView();
});

/* ------------------

Expand Down Expand Up @@ -107,7 +115,6 @@ var GlobalViewModel = {
iqset_to_preview: ko.observableArray([]),

// Start making questions
position: ko.observable(''),
students: ko.observableArray([]),
questions: ko.observableArray([]),

Expand Down Expand Up @@ -143,11 +150,12 @@ ko.extenders.required = function(target, overrideMessage) {
return target;
};

/* ------------------

ACTIONS
/* -----------------------------------

ACTIONS
(functions called by the view)

------------------ */
----------------------------------- */

GlobalViewModel.redirectView = function() {

Expand All @@ -170,6 +178,9 @@ GlobalViewModel.redirectView = function() {
break;

case 'START_MAKE':
// If we are at least at START_MAKE phase, we display the 'status' progress bar
switchProgressBar('loading');

section = 'general-board';
clearInterval(deamon_updating_board);
deamon_updating_board = setInterval(updateGVM, DELAY_UPDATE_BOARD);
Expand Down Expand Up @@ -213,6 +224,7 @@ GlobalViewModel.resetSession = function() {
this.session_name('');
this.group_name('');
this.status('');
switchProgressBar('');
GlobalViewModel.questions.removeAll();
GlobalViewModel.students.removeAll();
clearInterval(deamon_updating_board);
Expand All @@ -233,6 +245,7 @@ GlobalViewModel.startMakingQuestions = function() {

GlobalViewModel.usePreparedQuestions = function() {

// If a session is already running, we redirect directly to the current session
if(typeExist('START_MAKE')) {
this.redirectView();
} else {
Expand Down Expand Up @@ -261,6 +274,16 @@ GlobalViewModel.usePreparedQuestions = function() {
iqset.iqdata.length
));
}

// Preparing listener for single selection (radio mode)
$('section[smile=list-of-iqsets] table tr').click(function() {
if(!$(this).hasClass('selected')) {
$('section[smile=list-of-iqsets] table tr.selected').each(function(index) {
$(this).removeClass('selected');
});
$(this).addClass('selected');
}
});
}
}

Expand Down Expand Up @@ -310,24 +333,34 @@ function previewIQSet(idIQSet) {

GlobalViewModel.startMakingQuestionsWithIQSet = function() {

var iqset = JSON.parse(smile_iqset(GlobalViewModel.iqsets()[GlobalViewModel.position()].id));
var iqdata = iqset.iqdata;
if($('section[smile=list-of-iqsets] table tr.selected')) {

var positionOfIQSet = document.querySelector('[smile=list-of-iqsets]')
.querySelector('[class=selected]')
.getAttribute('position_iqset');

/* We get the position to get the id of the iqset
var iqset = JSON.parse(smile_iqset(GlobalViewModel.iqsets()[GlobalViewModel.position()].id));*/
var iqset = JSON.parse(smile_iqset(GlobalViewModel.iqsets()[positionOfIQSet].id));
var iqdata = iqset.iqdata;

for (i = 0; i < iqdata.length; i++) {
for (i = 0; i < iqdata.length; i++) {

// We send each question to the server
postMessage('question',iqdata[i]);
}

postMessage('startmake');
// We send each question to the server
postMessage('question',iqdata[i]);
}
postMessage('startmake');

deamon_updating_board = setInterval(updateGVM, DELAY_UPDATE_BOARD);
location.reload();
deamon_updating_board = setInterval(updateGVM, DELAY_UPDATE_BOARD);
location.reload();
} else {
smileAlert('Please <b>select</b> an iqset', DELAY_SHORT,'red');
}
}

GlobalViewModel.startSolvingQuestions = function() {

$('.start_solving').addClass('hidden');
postMessage('startsolve');
smileAlert('Trying to start solving...', DELAY_SHORT);
this.redirectView();
Expand Down Expand Up @@ -422,10 +455,10 @@ GlobalViewModel.removeQuestionFromSession = function() {
data: {},

error: function(xhr, text, err) {
smileAlert('Unable to remove question from session', DELAY_LONG, 'trace','#globalstatus');
smileAlert('Unable to remove question from session', DELAY_ERROR, 'trace');
},
success: function(data) {
smileAlert('Question deleted', DELAY_NORMAL, 'green');
smileAlert('Question deleted', DELAY_NORMAL, 'green');
switchSection('general-board');
}
});
Expand Down Expand Up @@ -484,19 +517,14 @@ GlobalViewModel.saveNewIQSet = function() {
}
}

$(document).ready(function() {

// Init Data Model
ko.applyBindings(GlobalViewModel);

GlobalViewModel.redirectView();
});

/* ------------------
/* --------------------------------------------------------

UTILITY
UTILITY
(encapsulation of code used by the actions)

------------------ */
-------------------------------------------------------- */
/*
GlobalViewModel.seeContent = function() {

Expand All @@ -509,40 +537,35 @@ GlobalViewModel.seeContent = function() {
smileAlert('checked:'+content,10000);
}*/

function smileAlert(text, lifetime, alerttype, divId) {
function smileAlert(text, lifetime, alerttype, hasCross) {

var container = '#absolute_alerts';
var alertID = 'id_'+Math.floor(Math.random()*99999);
var cross = hasCross? '<a style="color:white" class="close" href="">×</a>' : '';

// Colors
var defaultalert = 'secondary';
var redalert = 'alert';
var bluealert = '';
var greenalert = 'success';
// Types of box
var box_grey = 'secondary';
var box_red = 'alert';
var box_blue = '';
var box_green = 'success';

if (!alerttype) { alerttype = defaultalert; }
else if (alerttype === 'trace') { alerttype = redalert;
text += ' : ' + printStackTrace(); }
else if (alerttype === 'red') { alerttype = redalert; }
else if (alerttype === 'blue') { alerttype = bluealert; }
else if (alerttype === 'green') { alerttype = greenalert; }

if(!divId || divId === '') {
divId = '#absolute_alerts';
}
if (!alerttype) { alerttype = box_grey; }
else if (alerttype === 'trace') { alerttype = box_red; text += ' : ' + printStackTrace(); }
else if (alerttype === 'red') { alerttype = box_red; }
else if (alerttype === 'blue') { alerttype = box_blue; }
else if (alerttype === 'green') { alerttype = box_green; }

var formatstr = '<div id="%s"> \
<div style="margin:3px 0;opacity:0.8;display: inline-block" class="alert-box %s" style="opacity:0.4"> \
<span style="font-weight:normal">%s</span><br> \
</div><br> \
</div>';
var html_to_inject = '<div id="%s"> \
<div style="margin:3px 0;opacity:0.8;display: inline-block" class="alert-box %s" data-alert=""> \
<span style="font-weight:normal">%s</span>%s \
</div> \
</div>';

if (divId) {
$(divId).append(sprintf(formatstr, alertID, alerttype, text));
}
$(container).append(sprintf(html_to_inject, alertID, alerttype, text, cross));

if (lifetime) {
setInterval(function() {
$(divId).find('#'+alertID).fadeOut().remove();
$(container).find('#'+alertID).fadeOut().remove();
}, lifetime)
}
}
Expand All @@ -552,6 +575,11 @@ function switchSection(newSection) {
$('section[smile='+newSection+']').addClass('visible').removeClass('hidden');
}

function switchProgressBar(newProgressBar) {
$('.status-progress-bars div.visible').removeClass('visible').addClass('hidden');
$('.status-progress-bars div[smile='+newProgressBar+']').addClass('visible').removeClass('hidden');
}

function addQuestion(question) {

var options = [];
Expand Down Expand Up @@ -615,14 +643,18 @@ function updateGVM() {
if(GlobalViewModel.students().length > 0) {
$('.start_solving').removeClass('hidden');
}
GlobalViewModel.status('START_MAKE');
GlobalViewModel.status('START_MAKE');
switchProgressBar('start-make');
break;
case 'START_SOLVE':
GlobalViewModel.status('START_SOLVE');
switchProgressBar('start-solve');
$('.start_solving').addClass('hidden');
$('.see_results').removeClass('hidden');
break;
case 'START_SHOW':
GlobalViewModel.status('START_SHOW');
switchProgressBar('start-show');
$('.see_results').addClass('hidden');
$('.retake').removeClass('hidden');
break;
Expand Down Expand Up @@ -653,14 +685,14 @@ function updateGVM() {
}
}

// Everytime updateGVM() is called, we have to restart the listener (by doing off/on) to wake up the multiple selection
//
// Everytime updateGVM() is called, we have to restart the listener (by doing off/on) to wake up the multiple selection (checkbox mode)
// Why? If you call a 'click' listener already listening, the listener will be disabled
$(document).off('click', 'table#questions tr').on('click', 'table#questions tr', function() {
if($(this).hasClass('checked'))
$(this).removeClass('checked');
else
$(this).addClass('checked');
});
if($(this).hasClass('checked'))
$(this).removeClass('checked');
else
$(this).addClass('checked');
});
}

function typeExist(type) {
Expand Down Expand Up @@ -709,8 +741,8 @@ function postMessage(type,values) {

$.ajax({
cache: false,
type: "POST",
dataType: "text",
type: 'POST',
dataType: 'text',
url: SMILEROUTES['startmake'],
data: { "TYPE":"START_MAKE" },
async: false,
Expand All @@ -726,9 +758,9 @@ function postMessage(type,values) {

$.ajax({
cache: false,
type: "GET",
contentType: "application/json",
dataType: "text",
type: 'GET',
contentType: 'application/json',
dataType: 'text',
url: SMILEROUTES['startsolve'],
data: {},
//async: false,
Expand Down Expand Up @@ -785,15 +817,14 @@ function postMessage(type,values) {
},

error: function(xhr, text, err) {
smileAlert('Unable to post session values. Reason: ' + xhr.status + ':' + xhr.responseText + '. Please verify your connection or server status.', DELAY_LONG, 'trace', '#globalstatus');
smileAlert('Unable to post session values. Reason: ' + xhr.status + ':' + xhr.responseText + '. Please verify your connection or server status.', DELAY_ERROR, 'trace');
},
success: function(data) {}
});
break;

case 'iqset':

//var newIqset =
console.log(values);

$.ajax({
Expand All @@ -805,7 +836,7 @@ function postMessage(type,values) {
data: values,

error: function(xhr, text, err) {
smileAlert('Unable to post session values. Reason: ' + xhr.status + ':' + xhr.responseText + '. Please verify your connection or server status.', DELAY_LONG, 'trace', '#globalstatus');
smileAlert('Unable to post session values. Reason: ' + xhr.status + ':' + xhr.responseText + '. Please verify your connection or server status.', DELAY_ERROR, 'trace');
},
success: function(data) {
smileAlert('New iqset <i>"'+data.title+'"</i> saved!',DELAY_NORMAL,'green');
Expand All @@ -832,7 +863,7 @@ function smile_all() {
async: false,
data: {},
error: function(xhr, text, err) {
smileAlert('Unable to call /smile/all', DELAY_NORMAL, 'trace');
smileAlert('Unable to call /smile/all', DELAY_ERROR, 'trace',true);
},
success: function(data) { all = data; }
});
Expand All @@ -851,7 +882,7 @@ function smile_reset() {
async: false,

error: function(xhr, text, err) {
smileAlert('Unable to reset. Reason: ' + xhr.status + ':' + xhr.responseText, DELAY_LONG, 'trace', '#globalstatus');
smileAlert('Unable to reset. Reason: ' + xhr.status + ':' + xhr.responseText, DELAY_ERROR, 'trace');
},
success: function(data) {}
});
Expand All @@ -870,7 +901,7 @@ function smile_iqsets() {
data: {},

error: function(xhr, text, err) {
smileAlert('Unable to call /smile/iqsets. Reason: ' + xhr.status + ':' + xhr.responseText + '. Please verify your connection or server status.', DELAY_LONG, 'trace', '#globalstatus');
smileAlert('Unable to call /smile/iqsets. Reason: ' + xhr.status + ':' + xhr.responseText + '. Please verify your connection or server status.', DELAY_ERROR, 'trace');
},
success: function(data) {
iqsets = data;
Expand Down
Loading