Index: lams_gradebook/web/gradebookMonitor.jsp =================================================================== diff -u -r93b041b5d566cc683b2e0a268c63556879b1222f -rb67f087068e5b478fc4e3205dc308b470195fe42 --- lams_gradebook/web/gradebookMonitor.jsp (.../gradebookMonitor.jsp) (revision 93b041b5d566cc683b2e0a268c63556879b1222f) +++ lams_gradebook/web/gradebookMonitor.jsp (.../gradebookMonitor.jsp) (revision b67f087068e5b478fc4e3205dc308b470195fe42) @@ -28,25 +28,34 @@ var graphLoaded = false; function toggleMarkChart() { + // the two methods showMarkChart and hideMarkChart are used in the Monitoring tour if ( $("#markChartDiv").css("display") == "none" ) { - $("#markChartDiv").css("display", "block"); - $("#markChartHidden").css("display", "none"); - if ( ! graphLoaded ) { - $("#markChartBusy").css("display", "block"); - drawHistogram('markChartDiv', - '/gradebook/gradebookMonitoring.do?dispatch=getMarkChartData&lessonID=${lessonDetails.lessonID}', - '', ''); - graphLoaded = true; - $("#markChartBusy").css("display", "none"); - } - $("#markChartShown").css("display", "inline"); + showMarkChart(); } else { - $("#markChartDiv").css("display", "none"); - $("#markChartShown").css("display", "none"); - $("#markChartHidden").css("display", "inline"); + hideMarkChart(); } } + function showMarkChart() { + $("#markChartDiv").css("display", "block"); + $("#markChartHidden").css("display", "none"); + if ( ! graphLoaded ) { + $("#markChartBusy").css("display", "block"); + drawHistogram('markChartDiv', + '/gradebook/gradebookMonitoring.do?dispatch=getMarkChartData&lessonID=${lessonDetails.lessonID}', + '', ''); + graphLoaded = true; + $("#markChartBusy").css("display", "none"); + } + $("#markChartShown").css("display", "inline"); + } + + function hideMarkChart() { + $("#markChartDiv").css("display", "none"); + $("#markChartShown").css("display", "none"); + $("#markChartHidden").css("display", "inline"); + } + function toggleRelease() { var conf; @@ -538,17 +547,20 @@ + -
+
+
-
Index: lams_monitoring/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r414a355d456645b304e8480116f8530a4499f83c -rb67f087068e5b478fc4e3205dc308b470195fe42 --- lams_monitoring/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 414a355d456645b304e8480116f8530a4499f83c) +++ lams_monitoring/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision b67f087068e5b478fc4e3205dc308b470195fe42) @@ -361,6 +361,19 @@ tour.end.tour =End Tour label.tour =Tour tab.gradebook = Gradebook +tour.gradebook.learner.grades=Grades By Learner +tour.gradebook.learner.grades.content=View each learner in the lesson and their overall mark. Click on the + to see the details for individual activities. +tour.gradebook.activity.grades=Grades By Activity +tour.gradebook.activity.grades.content=View the average marks for each activity. Click on the + to see the details for learners. +tour.gradebook.export.grades=Export Grades +tour.gradebook.export.grades.content=Download the grades in an Excel (.xlsx) spreadsheet. +tour.gradebook.release.marks=Release Marks +tour.gradebook.release.marks.content=Enable/Disable the marks being shown to Learners +tour.gradebook.show.marks.chart=Show Marks Chart +tour.gradebook.show.marks.chart.content=Show/Hide a graph of the marks. +tour.gradebook.show.dates=Show Dates +tour.gradebook.show.dates.content=Show/Hide some of the date columns in the grids to make it easier to read. +tour.gradebook.marks.chart=Marks Chart +tour.histogram.help.content=Click on a bar in the graph and then use your mouse wheel to zoom in and out of the graph. Once you zoom in, the grey selection in the bottom graph can be dragged left or right to show a different set of marks. - #======= End labels: Exported 352 labels for en AU ===== Index: lams_monitoring/web/monitorTour.jsp =================================================================== diff -u -r414a355d456645b304e8480116f8530a4499f83c -rb67f087068e5b478fc4e3205dc308b470195fe42 --- lams_monitoring/web/monitorTour.jsp (.../monitorTour.jsp) (revision 414a355d456645b304e8480116f8530a4499f83c) +++ lams_monitoring/web/monitorTour.jsp (.../monitorTour.jsp) (revision b67f087068e5b478fc4e3205dc308b470195fe42) @@ -8,6 +8,8 @@ startStep = 10; } else if ( selectedTabID == 3 ) { startStep = 18; + } else if ( selectedTabID == 4 ) { + startStep = 24; } tourInProgress = true; @@ -146,15 +148,56 @@ title: "", content: "", placement: "left", + onNext: switchToGradebook },{ + element: "#userView", + title: "", + content: "", + placement: "top", + onPrev: switchToLearners + },{ + element: "#activityView", + title: "", + content: "", + placement: "top" + },{ + element: "#export-grades-button", + title: "", + content: "", + placement: "bottom" + },{ + element: "#tour-release-marks", + title: "", + content: "", + placement: "bottom" + },{ + element: "#tour-mark-chart-button", + title: "", + content: "", + placement: "bottom", + onNext: showMarkChart + },{ + element: "#markChartDiv", + title: "", + content: "", + backdrop: true, + placement: "top", + onNext: hideMarkChart + },{ + element: "#tour-dates", + title: "", + content: "", + placement: "bottom", + onPrev: showMarkChart + },{ title: "", content: "

", placement: "top", orphan: true } ], onEnd: tourEnd, - debug: false, + debug: true, backdrop: false, storage: false, template: '