Index: lams_monitoring/web/css/components-monitoring.css =================================================================== diff -u -r3f478fc78fc8176489071ec12663230b4c48f172 -rd0a966a0d817bebcc0ffbc9fa386e5ab5e8f3628 --- lams_monitoring/web/css/components-monitoring.css (.../components-monitoring.css) (revision 3f478fc78fc8176489071ec12663230b4c48f172) +++ lams_monitoring/web/css/components-monitoring.css (.../components-monitoring.css) (revision d0a966a0d817bebcc0ffbc9fa386e5ab5e8f3628) @@ -103,6 +103,7 @@ .component-sidebar .component-menu-btn label { display: block; font-size: 15px; + white-space: nowrap; } .component-sidebar .lesson-properties { @@ -113,12 +114,14 @@ .component-sidebar .lesson-properties #lessonDetails { opacity: 0; height: 0; + visibility: hidden; transition: height 0s ease 0s; } .component-sidebar .lesson-properties.active #lessonDetails { opacity: 1; height: initial; + visibility: visible; transition: opacity .3s ease .3s; } Index: lams_monitoring/web/includes/javascript/monitorLesson5.js =================================================================== diff -u -rfd7c55b02c1430bad3c5e057f7a2a25db97db1f3 -rd0a966a0d817bebcc0ffbc9fa386e5ab5e8f3628 --- lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision fd7c55b02c1430bad3c5e057f7a2a25db97db1f3) +++ lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision d0a966a0d817bebcc0ffbc9fa386e5ab5e8f3628) @@ -82,52 +82,67 @@ let tabContent = $('.monitoring-page-content .tab-content'); - if (tabName == 'sequence') { - tabContent.load(LAMS_URL + 'monitoring/monitoring/displaySequenceTab.do', function(){ - openEventSource(LAMS_URL + 'monitoring/monitoring/getLearnerProgressUpdateFlux.do?lessonId=' + lessonId, - function (event) { - if ("doRefresh" == event.data && $('#sequence-tab-content').length === 1){ - updateSequenceTab(); - } - }); - refreshMonitor('sequence'); - canvasFitScreen(learningDesignSvgFitScreen, true); - $("#load-sequence-tab-btn").addClass('active'); - }); - } else if (tabName == 'learners') { - tabContent.load(LAMS_URL + 'monitoring/monitoring/displayLearnersTab.do', function(){ - refreshMonitor('learners'); - }); - } else if (tabName == 'gradebook') { - tabContent.load(LAMS_URL + 'monitoring/monitoring/displayGradebookTab.do', function(){ - openEventSource(LAMS_URL + 'monitoring/monitoring/getGradebookUpdateFlux.do?lessonId=' + lessonId, - function (event) { - if ("doRefresh" == event.data && $('#gradebookDiv').length === 1){ - let expandedGridIds = [], - userGrid = $('#userView'), - activityGrid = $('#activityView'); - // do not update if grid is being edited by the teacher - if (userGrid.data('isCellEdited') === true || activityGrid.data('isCellEdited') === true) { - return; - } - - $("tr:has(.sgexpanded)", userGrid).each(function () { - let num = $(this).attr('id'); - expandedGridIds.push(num); - }); - userGrid.data('expandedGridIds', expandedGridIds).trigger("reloadGrid"); - - expandedGridIds = []; - $("tr:has(.sgexpanded)", activityGrid).each(function () { - let num = $(this).attr('id'); - expandedGridIds.push(num); - }); - activityGrid.data('expandedGridIds', expandedGridIds).trigger("reloadGrid"); + + switch(tabName) { + case 'sequence': { + tabContent.load(LAMS_URL + 'monitoring/monitoring/displaySequenceTab.do', function(){ + openEventSource(LAMS_URL + 'monitoring/monitoring/getLearnerProgressUpdateFlux.do?lessonId=' + lessonId, + function (event) { + if ("doRefresh" == event.data && $('#sequence-tab-content').length === 1){ + updateSequenceTab(); } }); - - refreshMonitor('gradebook'); - }); + refreshMonitor('sequence'); + canvasFitScreen(learningDesignSvgFitScreen, true); + $("#load-sequence-tab-btn").addClass('active'); + }); + } + break; + + case 'learners': { + tabContent.load(LAMS_URL + 'monitoring/monitoring/displayLearnersTab.do', function(){ + refreshMonitor('learners'); + }); + } + break; + + case 'gradebook': { + tabContent.load(LAMS_URL + 'monitoring/monitoring/displayGradebookTab.do', function(){ + openEventSource(LAMS_URL + 'monitoring/monitoring/getGradebookUpdateFlux.do?lessonId=' + lessonId, + function (event) { + if ("doRefresh" == event.data && $('#gradebookDiv').length === 1){ + let expandedGridIds = [], + userGrid = $('#userView'), + activityGrid = $('#activityView'); + // do not update if grid is being edited by the teacher + if (userGrid.data('isCellEdited') === true || activityGrid.data('isCellEdited') === true) { + return; + } + + $("tr:has(.sgexpanded)", userGrid).each(function () { + let num = $(this).attr('id'); + expandedGridIds.push(num); + }); + userGrid.data('expandedGridIds', expandedGridIds).trigger("reloadGrid"); + + expandedGridIds = []; + $("tr:has(.sgexpanded)", activityGrid).each(function () { + let num = $(this).attr('id'); + expandedGridIds.push(num); + }); + activityGrid.data('expandedGridIds', expandedGridIds).trigger("reloadGrid"); + } + }); + + refreshMonitor('gradebook'); + }); + } + break; + + case 'teams': { + tabContent.load(LAMS_URL + 'monitoring/tblmonitor/teams.do?lessonID=' + lessonId); + } + break; } } @@ -155,6 +170,10 @@ loadTab('gradebook', this); }); + $('#load-teams-tab-btn').click(function(){ + loadTab('teams', this); + }); + $('#load-other-nvg-btn').click(function(){ let switchButton = $(this), tblButtons = $('#tbl-navigate-btn-group'), Index: lams_monitoring/web/monitor5.jsp =================================================================== diff -u -rf932b797330099220514e4c2acef885899567207 -rd0a966a0d817bebcc0ffbc9fa386e5ab5e8f3628 --- lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision f932b797330099220514e4c2acef885899567207) +++ lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision d0a966a0d817bebcc0ffbc9fa386e5ab5e8f3628) @@ -236,22 +236,149 @@