Index: lams_monitoring/web/css/components-monitoring.css =================================================================== diff -u -rf0779a2fffb02955df23b5465a9afc387eebd1ae -r27708872e7df43fe07cd093b785b4d4cbf35fa64 --- lams_monitoring/web/css/components-monitoring.css (.../components-monitoring.css) (revision f0779a2fffb02955df23b5465a9afc387eebd1ae) +++ lams_monitoring/web/css/components-monitoring.css (.../components-monitoring.css) (revision 27708872e7df43fe07cd093b785b4d4cbf35fa64) @@ -975,6 +975,12 @@ user-select: none; } +#canvas-container.svg-learner-draggable-area.force-completing, +#canvas-container.svg-learner-draggable-area.force-completing div#sequenceCanvas svg.svg-learning-design, +#canvas-container.svg-learner-draggable-area.force-completing div#sequenceCanvas svg.svg-learning-design * { + cursor: wait !important; +} + #canvas-container div#sequenceCanvas div.learner-icon-container { position: relative; } Index: lams_monitoring/web/includes/javascript/monitorLesson5.js =================================================================== diff -u -rdb1f3f7a22ffaa3c9753f3bbf317b8582690ed20 -r27708872e7df43fe07cd093b785b4d4cbf35fa64 --- lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision db1f3f7a22ffaa3c9753f3bbf317b8582690ed20) +++ lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision 27708872e7df43fe07cd093b785b4d4cbf35fa64) @@ -157,7 +157,7 @@ $(this).val(ui.item.rawLabel); // mark the learner's ID and make him highlighted after the refresh sequenceSearchedLearner = ui.item.value; - refreshMonitor(); + loadTab(); return false; } }); @@ -279,7 +279,9 @@ 'resizable' : true, 'height' : 300, 'width' : 400, - 'title' : LABELS.FORCE_COMPLETE_BUTTON + 'title' : LABELS.FORCE_COMPLETE_BUTTON, + 'close' : function(){ + } }, false); // only need to do this once as then it updates the msg field directly. $('.modal-body', '#forceBackwardsDialog').empty().append($('#forceBackwardsDialogContents').show()); @@ -405,7 +407,7 @@ 'title' : LABELS.LESSON_EDIT_CLASS, 'resizable' : true, 'close' : function(){ - refreshMonitor(); + loadTab(); } }, false); @@ -1742,7 +1744,6 @@ } var targetActivityId = null, - executeForceComplete = false, isEndLesson = !targetActivity.is('g'), learnerNames = ''; @@ -1811,6 +1812,8 @@ * Tell server to force complete the learner. */ function forceCompleteExecute(learners, moveAllFromActivityId, activityId, removeContent) { + $('.svg-learner-draggable-area').addClass('force-completing'); + var learnerIds = ''; if (learners) { $.each(learners, function() { @@ -1841,7 +1844,7 @@ showToast(response); // progress changed, show it to monitor - refreshMonitor(); + loadTab(); } }); } @@ -2041,9 +2044,7 @@ 'distance' : 20, 'scroll' : false, 'cursorAt' : {'left' : 10, 'top' : 15}, - 'helper' : function(){ - return learnerIcon.clone(); - }, + 'helper' : "clone", 'stop' : function(event, ui) { var learners = [{ 'id' : learner.id, @@ -2237,7 +2238,7 @@ $('#sequenceSearchedLearnerHighlighter').hide(); sequenceSearchedLearner = null; if (refresh) { - refreshMonitor(); + loadTab(); } }