Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml,v
diff -u -r1.22.2.6 -r1.22.2.7
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	9 May 2016 14:27:14 -0000	1.22.2.6
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	4 May 2017 04:10:39 -0000	1.22.2.7
@@ -100,6 +100,7 @@
 			</meta>
 		</property>
 
+		<!--  enableGradebookForMonitors is no longer used - will always return true in the code  -->
 		<property name="enableGradebookForMonitors" type="java.lang.Boolean"
 			column="enable_monitor_gradebook" not-null="true" length="1">
 			<meta attribute="field-description">
Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/IGradebookDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/IGradebookDAO.java,v
diff -u -r1.2.4.6 -r1.2.4.7
--- lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/IGradebookDAO.java	29 Jun 2016 10:22:28 -0000	1.2.4.6
+++ lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/IGradebookDAO.java	4 May 2017 04:10:39 -0000	1.2.4.7
@@ -101,4 +101,6 @@
     List<GradebookUserLesson> getGradebookUserLessons(Lesson lesson, List<Integer> userIds);
 
     List<GradebookUserLesson> getGradebookUserLessons(List<Long> lessonIds);
+    
+    List<Number> getAllMarksForLesson(Long lessonID);
 }
Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java,v
diff -u -r1.4.2.10 -r1.4.2.11
--- lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java	29 Jun 2016 10:22:28 -0000	1.4.2.10
+++ lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java	4 May 2017 04:10:39 -0000	1.4.2.11
@@ -63,6 +63,9 @@
     private static final String GET_AVERAGE_MARK_FOR_GROUPED_ACTIVTY = "select avg(gact.mark) from GradebookUserActivity gact, GroupUser gu, Group grp where "
 	    + "gact.activity.activityId=:activityID and grp.groupId=:groupID and gu.user=gact.learner and gu.group=grp";
 
+    private static final String GET_ALL_MARKS_FOR_LESSON = "SELECT gles.mark FROM GradebookUserLesson gles WHERE "
+	    + "gles.lesson.lessonId=:lessonID";
+
     @Override
     @SuppressWarnings("unchecked")
     public GradebookUserActivity getGradebookUserDataForActivity(Long activityID, Integer userID) {
@@ -153,6 +156,12 @@
     }
 
     @Override
+    public List<Number> getAllMarksForLesson(Long lessonID) {
+	return (List<Number>) getSessionFactory().getCurrentSession().createQuery(GET_ALL_MARKS_FOR_LESSON)
+		.setLong("lessonID", lessonID.longValue()).list();
+    }
+
+    @Override
     @SuppressWarnings("unchecked")
     public long getMedianTimeTakenLesson(Long lessonID) {
 	
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java,v
diff -u -r1.24.2.5 -r1.24.2.6
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java	11 May 2016 07:07:23 -0000	1.24.2.5
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java	4 May 2017 04:10:39 -0000	1.24.2.6
@@ -116,7 +116,7 @@
 	this.courseAdminCanCreateGuestAccounts = Boolean.FALSE;
 	this.enableCourseNotifications = Boolean.FALSE;
 	this.enableGradebookForLearners = Boolean.FALSE;
-	this.enableGradebookForMonitors = Boolean.FALSE;
+	this.enableGradebookForMonitors = Boolean.TRUE;
 	this.enableSingleActivityLessons = Boolean.FALSE;
 	this.enableLiveEdit = Boolean.FALSE;
     }
@@ -339,10 +339,17 @@
 	this.orderedLessonIds = orderedLessonIds;
     }
 
+    /** getEnableGradebookForMonitors() is now deprecated as we always display gradebook in monitor.
+     * For compatibility with existing code, this will always true
+     * @return
+     */
+    @Deprecated
     public Boolean getEnableGradebookForMonitors() {
-	return enableGradebookForMonitors;
+	return true;
     }
 
+    /** See getEnableGradebookForMonitors() */
+    @Deprecated
     public void setEnableGradebookForMonitors(Boolean enableGradebookForMonitors) {
 	this.enableGradebookForMonitors = enableGradebookForMonitors;
     }