Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r1af47d73988107c29a5a32920b50080ceade5453 -r97f98aae7a2eedbfb3f591309f4d5cf8356d0e08 Binary files differ Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java =================================================================== diff -u -r9807d867577b8ff5f05e60a88902a8debca2913d -r97f98aae7a2eedbfb3f591309f4d5cf8356d0e08 --- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java (.../DisplayGroupAction.java) (revision 9807d867577b8ff5f05e60a88902a8debca2913d) +++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java (.../DisplayGroupAction.java) (revision 97f98aae7a2eedbfb3f591309f4d5cf8356d0e08) @@ -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 =================================================================== diff -u -r8d7332a908101db10e719593c2e6666247e5934f -r97f98aae7a2eedbfb3f591309f4d5cf8356d0e08 --- lams_central/web/css/chart.css (.../chart.css) (revision 8d7332a908101db10e719593c2e6666247e5934f) +++ lams_central/web/css/chart.css (.../chart.css) (revision 97f98aae7a2eedbfb3f591309f4d5cf8356d0e08) @@ -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 =================================================================== diff -u -raef767dc1db044179375b93c59c8e28ee30a6743 -r97f98aae7a2eedbfb3f591309f4d5cf8356d0e08 --- lams_central/web/includes/javascript/chart.js (.../chart.js) (revision aef767dc1db044179375b93c59c8e28ee30a6743) +++ lams_central/web/includes/javascript/chart.js (.../chart.js) (revision 97f98aae7a2eedbfb3f591309f4d5cf8356d0e08) @@ -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 =================================================================== diff -u -ra856bd9adcfa3454d6f7f891a84f9e759a7e9000 -r97f98aae7a2eedbfb3f591309f4d5cf8356d0e08 --- lams_central/web/includes/javascript/main.js (.../main.js) (revision a856bd9adcfa3454d6f7f891a84f9e759a7e9000) +++ lams_central/web/includes/javascript/main.js (.../main.js) (revision 97f98aae7a2eedbfb3f591309f4d5cf8356d0e08) @@ -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, {