Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
===================================================================
diff -u -r8b539226552978ff77efe129fff621ec8b660f59 -r7dd66b6ceff2f45df32f0cca72018901f6c92133
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java (.../MonitoringController.java) (revision 8b539226552978ff77efe129fff621ec8b660f59)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java (.../MonitoringController.java) (revision 7dd66b6ceff2f45df32f0cca72018901f6c92133)
@@ -985,6 +985,11 @@
public String displayLearnersTab() {
return "monitor-learners-tab";
}
+
+ @RequestMapping("/displayGradebookTab")
+ public String displayGradebookTab() {
+ return "monitor-gradebook-tab";
+ }
/**
* Gets users whose progress bars will be displayed in Learner tab in Monitor.
Index: lams_monitoring/web/includes/javascript/monitorLesson5.js
===================================================================
diff -u -r10196b1af5f81615329dbf0de64e0ee91bf9ca94 -r7dd66b6ceff2f45df32f0cca72018901f6c92133
--- lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision 10196b1af5f81615329dbf0de64e0ee91bf9ca94)
+++ lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision 7dd66b6ceff2f45df32f0cca72018901f6c92133)
@@ -36,16 +36,28 @@
loadTab('sequence');
});
-function loadTab(tabName) {
+function loadTab(tabName, button) {
+ $('.navigate-btn, .lesson-properties').removeClass('active');
+ $('.component-sidebar').removeClass('expanded');
+ if (button) {
+ $(button).addClass('active');
+ }
+
+ let tabContent = $('.monitoring-page-content .tab-content');
+
if (tabName == 'sequence') {
- $('.monitoring-page-content .tab-content').load(LAMS_URL + 'monitoring/monitoring/displaySequenceTab.do', function(){
+ tabContent.load(LAMS_URL + 'monitoring/monitoring/displaySequenceTab.do', function(){
refreshMonitor('sequence');
canvasFitScreen(learningDesignSvgFitScreen, true);
});
- } else if (tabName = 'learners') {
- $('.monitoring-page-content .tab-content').load(LAMS_URL + 'monitoring/monitoring/displayLearnersTab.do', function(){
+ } 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(){
+ refreshMonitor('gradebook');
+ });
}
}
@@ -61,21 +73,18 @@
});
$('#load-sequence-tab-btn').click(function(){
- $('.navigate-btn, .lesson-properties').removeClass('active');
- $('.component-sidebar').removeClass('expanded');
- $(this).addClass('active');
-
- loadTab('sequence');
+ loadTab('sequence', this);
});
$('#load-learners-tab-btn').click(function(){
- $('.navigate-btn, .lesson-properties').removeClass('active');
- $('.component-sidebar').removeClass('expanded');
- $(this).addClass('active');
-
- loadTab('learners');
+ loadTab('learners', this);
});
+ $('#load-gradebook-tab-btn').click(function(){
+ loadTab('gradebook', this);
+ });
+
+
initLessonTab();
}
Index: lams_monitoring/web/monitor-gradebook-tab.jsp
===================================================================
diff -u
--- lams_monitoring/web/monitor-gradebook-tab.jsp (revision 0)
+++ lams_monitoring/web/monitor-gradebook-tab.jsp (revision 7dd66b6ceff2f45df32f0cca72018901f6c92133)
@@ -0,0 +1,3 @@
+
+<%@ include file="/taglibs.jsp"%>
+
Index: lams_monitoring/web/monitor5.jsp
===================================================================
diff -u -r10196b1af5f81615329dbf0de64e0ee91bf9ca94 -r7dd66b6ceff2f45df32f0cca72018901f6c92133
--- lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision 10196b1af5f81615329dbf0de64e0ee91bf9ca94)
+++ lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision 7dd66b6ceff2f45df32f0cca72018901f6c92133)
@@ -225,6 +225,7 @@
+