Index: lams_monitoring/web/includes/javascript/monitorLesson.js =================================================================== diff -u -r932a4e7a2b89bcbae0db13d296ea1038e9571891 -rd642e043e5cec55215c6e5dba9a1d779dca16665 --- lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 932a4e7a2b89bcbae0db13d296ea1038e9571891) +++ lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision d642e043e5cec55215c6e5dba9a1d779dca16665) @@ -2228,6 +2228,10 @@ //********** COMMON FUNCTIONS ********** +function isAutoRefreshBlocked(){ + return autoRefreshBlocked || $('#learnerGroupDialog').hasClass('in'); +} + /** * Updates all changeable elements of monitoring screen. */ @@ -2239,12 +2243,12 @@ if (!autoRefreshIntervalObject) { autoRefreshIntervalObject = setInterval(function(){ - if (!autoRefreshBlocked) { + if (!isAutoRefreshBlocked()) { refreshMonitor(null, true); } }, autoRefreshInterval); } - + if (!tabName) { // update Lesson tab widgets (state, number of learners etc.) updateLessonTab(); Index: lams_monitoring/web/tblmonitor/tblmonitor.jsp =================================================================== diff -u -r711411d243b9bca70b87eec757a2baa5bebe6964 -rd642e043e5cec55215c6e5dba9a1d779dca16665 --- lams_monitoring/web/tblmonitor/tblmonitor.jsp (.../tblmonitor.jsp) (revision 711411d243b9bca70b87eec757a2baa5bebe6964) +++ lams_monitoring/web/tblmonitor/tblmonitor.jsp (.../tblmonitor.jsp) (revision d642e043e5cec55215c6e5dba9a1d779dca16665) @@ -54,16 +54,18 @@ // refresh automatically every X seconds window.setInterval(function(){ - loadTab(null, null, true); + refresh(true); }, TAB_REFRESH_INTERVAL); }); function loadTab(method, toolContentID, autoRefresh) { if (!method && !toolContentID) { // tab was refreshed, get stored parameters method = lastTabMethod; - if (autoRefresh && (method == 'burningQuestions' || method == 'aes' || method == 'aesStudentChoices')) { + + if (autoRefresh && (method == 'burningQuestions' || method == 'aes' || method == 'aesStudentChoices' || method == 'sequence' || $('.modal').hasClass('in'))){ // do not auto refresh Burning Questions nor AES tabs + // or if a modal dialog is open return; } @@ -158,8 +160,8 @@ }, 100); } - function refresh() { - loadTab(); + function refresh(autoRefresh) { + loadTab(null, null, autoRefresh); } function switchToRegularMonitor() {