Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
===================================================================
diff -u -rf5c030a4d14cabcb06aa62390e7389f33d4678b1 -r0ed631e40db21814547bde9728628fd891473dd5
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(.../GradebookService.java)	(revision f5c030a4d14cabcb06aa62390e7389f33d4678b1)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(.../GradebookService.java)	(revision 0ed631e40db21814547bde9728628fd891473dd5)
@@ -198,7 +198,6 @@
 
 	Lesson lesson = lessonService.getLesson(lessonId);
 	User learner = (User) userService.findById(User.class, userId);
-
 	List<GradebookGridRowDTO> gradebookActivityDTOs = new ArrayList<GradebookGridRowDTO>();
 
 	List<ToolActivity> activities = getLessonActivitiesForLearner(lesson, userId);
@@ -230,7 +229,7 @@
 
 	return new Object[] { gradebookActivityDTOs,
 		gradebookDAO.getGradebookUserDataForLesson(lessonId, userId).getMark(),
-		getAverageMarkForLesson(lessonId) };
+		getAverageMarkForLesson(lessonId), isWeightedMarks(lesson.getLearningDesign()) };
     }
 
     @Override
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
===================================================================
diff -u -rf5c030a4d14cabcb06aa62390e7389f33d4678b1 -r0ed631e40db21814547bde9728628fd891473dd5
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java	(.../IGradebookService.java)	(revision f5c030a4d14cabcb06aa62390e7389f33d4678b1)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java	(.../IGradebookService.java)	(revision 0ed631e40db21814547bde9728628fd891473dd5)
@@ -95,7 +95,7 @@
 
     /**
      * Returns several outputs: leaner's rows for lesson's each activity, learner's mark for lesson, learners average
-     * mark for lesson.
+     * mark for lesson, are the marks weighted.
      */
     Object[] getGBLessonComplete(Long lessonId, Integer userId);
 
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
===================================================================
diff -u -rf5c030a4d14cabcb06aa62390e7389f33d4678b1 -r0ed631e40db21814547bde9728628fd891473dd5
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java	(.../GradebookAction.java)	(revision f5c030a4d14cabcb06aa62390e7389f33d4678b1)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java	(.../GradebookAction.java)	(revision 0ed631e40db21814547bde9728628fd891473dd5)
@@ -171,6 +171,7 @@
 	JSONObject resultJSON = new JSONObject();
 	resultJSON.put(GradebookConstants.ELEMENT_RECORDS, gradebookActivityDTOs.size());
 
+	boolean isWeighted = (Boolean) lessonCompleteData[3];
 	JSONArray rowsJSON = new JSONArray();
 	for (GradebookGridRowDTO gradebookActivityDTO : gradebookActivityDTOs) {
 	    JSONObject rowJSON = new JSONObject();
@@ -179,16 +180,16 @@
 	    JSONArray cellJSON = new JSONArray();
 	    cellJSON.put(gradebookActivityDTO.getRowName());
 	    cellJSON.put(gradebookActivityDTO.getStatus());
-	    cellJSON.put(gradebookActivityDTO.getAverageMark());
-	    cellJSON.put(gradebookActivityDTO.getMark());
+	    cellJSON.put(GradebookUtil.niceFormatting(gradebookActivityDTO.getAverageMark(), isWeighted));
+	    cellJSON.put(GradebookUtil.niceFormatting(gradebookActivityDTO.getMark(), isWeighted));
 
 	    rowJSON.put(GradebookConstants.ELEMENT_CELL, cellJSON);
 	    rowsJSON.put(rowJSON);
 	}
 	resultJSON.put(GradebookConstants.ELEMENT_ROWS, rowsJSON);
 
-	resultJSON.put("learnerLessonMark", lessonCompleteData[1]);
-	resultJSON.put("averageLessonMark", lessonCompleteData[2]);
+	resultJSON.put("learnerLessonMark", GradebookUtil.niceFormatting((Double) lessonCompleteData[1], isWeighted));
+	resultJSON.put("averageLessonMark", GradebookUtil.niceFormatting((Double) lessonCompleteData[2], isWeighted));
 
 	response.setContentType("application/json;charset=utf-8");
 	response.getWriter().print(resultJSON.toString());