Index: lams_build/lib/lams/lams.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v
diff -u -r1.420.2.122 -r1.420.2.123
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java,v
diff -u -r1.45.2.16 -r1.45.2.17
--- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java 3 Apr 2017 11:47:30 -0000 1.45.2.16
+++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java 4 May 2017 04:11:24 -0000 1.45.2.17
@@ -187,8 +187,7 @@
}
// Adding gradebook course monitor links if enabled
- if (org.getEnableGradebookForMonitors()
- && (roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_GROUP_ADMIN))) {
+ if (roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_GROUP_ADMIN)) {
String link = "javascript:showGradebookCourseDialog(" + org.getOrganisationId() + ")";
moreLinks.add(new IndexLinkBean("index.coursegradebook", link, "fa fa-fw fa-list-ol",
"index.coursegradebook.tooltip"));
@@ -203,8 +202,7 @@
}
// Adding gradebook course monitor links if enabled
- if (org.getParentOrganisation().getEnableGradebookForMonitors()
- && (roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_GROUP_ADMIN))) {
+ if (roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_GROUP_ADMIN)) {
String link = "javascript:showGradebookCourseDialog(" + org.getOrganisationId() + ")";
moreLinks.add(new IndexLinkBean("index.coursegradebook.subgroup", link, "fa fa-fw fa-list-ol", null));
}
@@ -322,14 +320,6 @@
"index.emailnotifications.tooltip"));
}
- // Adding gradebook course monitor links if enabled
- if (isGroupManagerOrMonitor && (org.getEnableGradebookForMonitors()
- || ((parent != null) && parent.getEnableGradebookForMonitors()))) {
- String link = "javascript:showGradebookLessonDialog(" + bean.getId() + ")";
- lessonLinks
- .addFirst(new IndexLinkBean("index.coursegradebookmonitor", link, "fa fa-fw fa-list-ol", null));
- }
-
// Add lesson conditions
if (isGroupManagerOrMonitor) {
String conditionsLink = "javascript:showConditionsDialog(" + bean.getId() + ")";
Index: lams_central/web/css/chart.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/chart.css,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_central/web/css/chart.css 18 Nov 2016 17:11:12 -0000 1.1.2.3
+++ lams_central/web/css/chart.css 4 May 2017 04:11:24 -0000 1.1.2.4
@@ -17,4 +17,19 @@
border-radius: 8px;
pointer-events: none;
opacity: 0;
-}
\ No newline at end of file
+}
+
+/* Histogram Chart */
+.bar rect {
+ fill: steelblue;
+}
+
+.bar text {
+ fill: #fff;
+ font: 14px sans-serif;
+}
+.zoom {
+ cursor: move;
+ fill: none;
+ pointer-events: all;
+}
Index: lams_central/web/includes/javascript/chart.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/chart.js,v
diff -u -r1.1.2.8 -r1.1.2.9
--- lams_central/web/includes/javascript/chart.js 28 Apr 2017 03:56:22 -0000 1.1.2.8
+++ lams_central/web/includes/javascript/chart.js 4 May 2017 04:11:24 -0000 1.1.2.9
@@ -272,6 +272,11 @@
var max = Number(d3.max(data))+1;
var min = Number(d3.min(data));
var range = max-min;
+ if ( range > 11 ) {
+ // tweak the range to have more space at the top so it charts better for larger numbers
+ range+=3;
+ max+=3;
+ }
var buckets = range <= 11 ? range : 10;
// where the range > 11, aim for a zoom where bucket width is no more than a half a mark
Index: lams_central/web/includes/javascript/main.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/Attic/main.js,v
diff -u -r1.1.2.26 -r1.1.2.27
--- lams_central/web/includes/javascript/main.js 24 Feb 2017 19:59:38 -0000 1.1.2.26
+++ lams_central/web/includes/javascript/main.js 4 May 2017 04:11:23 -0000 1.1.2.27
@@ -480,25 +480,6 @@
}, true);
}
-function showGradebookLessonDialog(lessonID){
- var id = "dialogGradebookLesson" + lessonID;
- showDialog(id, {
- 'data' : {
- 'lessonID' : lessonID
- },
- 'height': Math.max(380, Math.min(800, $(window).height() - 30)),
- 'width' : Math.max(380, Math.min(1024, $(window).width() - 60)),
- 'title' : LABELS.GRADEBOOK_LESSON_TITLE,
- 'open' : function() {
- var lessonID = $(this).data('lessonID');
- // load contents after opening the dialog
- $('iframe', this).attr('src', LAMS_URL + 'gradebook/gradebookMonitoring.do?lessonID=' + lessonID);
- }
- }, true);
-}
-
-
-
function showGradebookLearnerDialog(orgID){
var id = "dialogGradebookLearner" + orgID;
showDialog(id, {
Index: lams_monitoring/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.66.2.31 -r1.66.2.32
--- lams_monitoring/conf/language/lams/ApplicationResources.properties 28 Apr 2017 01:23:20 -0000 1.66.2.31
+++ lams_monitoring/conf/language/lams/ApplicationResources.properties 4 May 2017 04:17:54 -0000 1.66.2.32
@@ -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/monitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/monitor.jsp,v
diff -u -r1.27.2.57 -r1.27.2.58
--- lams_monitoring/web/monitor.jsp 28 Apr 2017 21:33:19 -0000 1.27.2.57
+++ lams_monitoring/web/monitor.jsp 4 May 2017 04:17:54 -0000 1.27.2.58
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/monitorTour.jsp,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_monitoring/web/monitorTour.jsp 30 Mar 2017 01:56:03 -0000 1.1.2.3
+++ lams_monitoring/web/monitorTour.jsp 4 May 2017 04:17:54 -0000 1.1.2.4
@@ -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
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/includes/javascript/monitorLesson.js,v
diff -u -r1.44.2.69 -r1.44.2.70
--- lams_monitoring/web/includes/javascript/monitorLesson.js 28 Apr 2017 21:52:38 -0000 1.44.2.69
+++ lams_monitoring/web/includes/javascript/monitorLesson.js 4 May 2017 04:17:54 -0000 1.44.2.70
@@ -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();
}
}