Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
===================================================================
diff -u -ra949c337adc53b2df9207aa1de6e500281de7c20 -r23a6845aa6db9fc477a99de3d241d7e76da45360
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(.../GradebookService.java)	(revision a949c337adc53b2df9207aa1de6e500281de7c20)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(.../GradebookService.java)	(revision 23a6845aa6db9fc477a99de3d241d7e76da45360)
@@ -1146,6 +1146,8 @@
 
 	Set<Lesson> lessons = new TreeSet<Lesson>(new LessonComparator());
 	lessons.addAll(lessonService.getLessonsByGroupAndUser(userId, organisationId));
+	
+	Map<Long, Boolean> isWeightedLessonMap = new HashMap<Long, Boolean>();
 
 	if ((lessons != null) && (lessons.size() > 0)) {
 
@@ -1184,13 +1186,14 @@
 	    }
 	    rowList.add(headerRow);
 
-	    // collect users from all lessons
+	    // collect users from all lessons & check if lesson uses weightings
 	    LinkedHashSet<User> allLearners = new LinkedHashSet<User>();
 	    List<Long> lessonIds = new LinkedList<Long>();
 	    for (Lesson lesson : lessons) {
 		Set dbLessonUsers = lesson.getAllLearners();
 		allLearners.addAll(dbLessonUsers);
 		lessonIds.add(lesson.getLessonId());
+		isWeightedLessonMap.put(lesson.getLessonId(), isWeightedMarks(lesson.getLearningDesign()));
 	    }
 
 	    // Fetching the user data
@@ -1217,7 +1220,7 @@
 		    String startDate = "";
 		    String finishDate = "";
 		    Long timeTakenSeconds = null;
-		    Double mark = null;
+		    Object mark = null;
 		    String feedback = "";
 
 		    // check if learner is participating in this lesson
@@ -1268,7 +1271,12 @@
 			}
 
 			if (gradebookUserLesson != null) {
-			    mark = gradebookUserLesson.getMark();
+			    Double rawMark = gradebookUserLesson.getMark();
+			    if ( rawMark != null && isWeightedLessonMap.get(lesson.getLessonId()) ) {
+				mark = GradebookUtil.niceFormatting(rawMark, true);
+			    } else {
+				mark = rawMark;
+			    }
 			    feedback = gradebookUserLesson.getFeedback();
 			}
 		    } else {
Index: lams_monitoring/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r2a41cf4278b6f1becbc45e7708b6c8e4b2116e41 -r23a6845aa6db9fc477a99de3d241d7e76da45360
--- lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2a41cf4278b6f1becbc45e7708b6c8e4b2116e41)
+++ lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 23a6845aa6db9fc477a99de3d241d7e76da45360)
@@ -407,4 +407,7 @@
 
 audit.lesson.removed.permanently  =Lesson "{0}" ({1}) removed permanently.
 audit.lesson.status.changed=Lesson "{0}" ({1}) status changed from "{2}" to "{3}"
+
+tour.gradebook.show.weight  =Show Weights
+tour.gradebook.show.weight.content  =Show/hide the activity weights used for marking this lesson.
 #======= End labels: Exported 398 labels for en AU =====
Index: lams_monitoring/web/monitorTour.jsp
===================================================================
diff -u -r8714ac689fdad46746bbb7f28005ec080d1d4ba6 -r23a6845aa6db9fc477a99de3d241d7e76da45360
--- lams_monitoring/web/monitorTour.jsp	(.../monitorTour.jsp)	(revision 8714ac689fdad46746bbb7f28005ec080d1d4ba6)
+++ lams_monitoring/web/monitorTour.jsp	(.../monitorTour.jsp)	(revision 23a6845aa6db9fc477a99de3d241d7e76da45360)
@@ -194,6 +194,12 @@
 			        placement: "top",
 			        onNext: hideMarkChart
 			      },{
+			        element: "#tour-weight-button",
+			        title: "<fmt:message key="tour.gradebook.show.weight"/>",
+			        content: "<fmt:message key="tour.gradebook.show.weight.content"/>",
+			        placement: "bottom",
+			        onPrev: showMarkChart
+			      },{
 			        element: "#tour-dates",
 			        title: "<fmt:message key="tour.gradebook.show.dates"/>",
 			        content: "<fmt:message key="tour.gradebook.show.dates.content"/>",