Index: lams_monitoring/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r7f77e44fdb4996032d179a0bd2ade7160a13de88 -r414a355d456645b304e8480116f8530a4499f83c
--- lams_monitoring/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 7f77e44fdb4996032d179a0bd2ade7160a13de88)
+++ lams_monitoring/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 414a355d456645b304e8480116f8530a4499f83c)
@@ -317,6 +317,7 @@
tour.tab.selection.content.2 =Lesson gives the overall lesson details.
tour.tab.selection.content.3 =Sequence gives an overview of the lesson sequence and is used to access the activities within the lesson.
tour.tab.selection.content.4 =Learners shows the details about each learner.
+tour.tab.selection.content.5 =Gradebook shows the marks for each learner.
tour.tab.refresh.content =Updates the screen.
tour.lesson.state.content.1 =Click on the current status to change the status. The lesson can be Started, Suspended, Archived or Removed.
tour.lesson.state.content.2 =Started or Activated lessons are available for learners to participate in.
@@ -359,6 +360,7 @@
tour.more.help =More
tour.end.tour =End Tour
label.tour =Tour
+tab.gradebook = Gradebook
#======= End labels: Exported 352 labels for en AU =====
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
diff -u -r54c097c33fcdbfafd6f61d9c53b8940d7380b60c -r414a355d456645b304e8480116f8530a4499f83c
--- lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 54c097c33fcdbfafd6f61d9c53b8940d7380b60c)
+++ lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 414a355d456645b304e8480116f8530a4499f83c)
@@ -349,6 +349,7 @@
var date = $('#scheduleDatetimeField').val();
if (date) {
$.ajax({
+ dataType : 'xml',
url : LAMS_URL + 'monitoring/monitoring.do',
cache : false,
data : {
@@ -368,7 +369,7 @@
function startLesson(){
$.ajax({
- dataType : 'text',
+ dataType : 'xml',
url : LAMS_URL + 'monitoring/monitoring.do',
cache : false,
data : {
@@ -1790,8 +1791,25 @@
$('.dialogSearchPhraseClear', dialog).css('visibility', 'hidden');
}
+//********** GRADEBOOK TAB FUNCTIONS **********
+/**
+ * Inits Gradebook Tab.
+ */
+function initGradebookTab() {
+ $("#gradebookLoading").hide();
+}
+/**
+ * Refreshes Gradebook Tab.
+ */
+function updateGradebookTab() {
+ $("#gradebookLoading").show();
+ $("#gradebookDiv").load(LAMS_URL + 'gradebook/gradebookMonitoring.do?isInTabs=true&lessonID=' + lessonId, function() {
+ $("#gradebookLoading").hide();
+ });
+}
+
//********** COMMON FUNCTIONS **********
/**
@@ -1826,6 +1844,8 @@
} else if (tabName == 'learners'){
updateLessonTab();
updateLearnersTab();
+ } else if (tabName == 'gradebook'){
+ updateGradebookTab();
}
}
Index: lams_monitoring/web/monitor.jsp
===================================================================
diff -u -r72f9ae3dbdd2be9d7e7495480d7344d2268bcf70 -r414a355d456645b304e8480116f8530a4499f83c
--- lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 72f9ae3dbdd2be9d7e7495480d7344d2268bcf70)
+++ lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 414a355d456645b304e8480116f8530a4499f83c)
@@ -10,13 +10,16 @@
+
+
+
+
+
-
-
-
+
-
-
+
+
+
+
-
+
@@ -180,6 +185,7 @@
initLessonTab();
initSequenceTab();
initLearnersTab();
+ initGradebookTab();
refreshMonitor();
$('#description').readmore({
@@ -211,6 +217,9 @@
} else {
sequenceInfoDialog.modal("hide");
}
+ if ( tabId == '4' ) {
+ updateGradebookTab();
+ }
}
@@ -234,6 +243,7 @@
+
@@ -527,6 +537,19 @@
+
+
+
+ 
+
Index: lams_monitoring/web/monitorTour.jsp
===================================================================
diff -u -rba5863200976de68c44033676cfb7bf2b4b904ef -r414a355d456645b304e8480116f8530a4499f83c
--- lams_monitoring/web/monitorTour.jsp (.../monitorTour.jsp) (revision ba5863200976de68c44033676cfb7bf2b4b904ef)
+++ lams_monitoring/web/monitorTour.jsp (.../monitorTour.jsp) (revision 414a355d456645b304e8480116f8530a4499f83c)
@@ -24,7 +24,7 @@
}, {
element: "#page-tabs",
title: "",
- content: "
",
+ content: "
",
placement: "bottom",
},{
element: "#tour-refresh-button",
@@ -220,6 +220,8 @@
url = "http://wiki.lamsfoundation.org/display/lamsdocs/monitoringsequence";
} else if ( selectedTabID == 3 ) {
url = "http://wiki.lamsfoundation.org/display/lamsdocs/monitoringlearners";
+ } else if ( selectedTabID == 4 ) {
+ url = "http://wiki.lamsfoundation.org/display/lamsdocs/Gradebook+Lesson+Marking";
}
openPopUp(url,'', 648, 1152, false);
}
\ No newline at end of file