Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java =================================================================== diff -u -r6c765552ace140caa004eebd60096ff9ff26bb7c -rf5c030a4d14cabcb06aa62390e7389f33d4678b1 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java (.../GradebookService.java) (revision 6c765552ace140caa004eebd60096ff9ff26bb7c) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java (.../GradebookService.java) (revision f5c030a4d14cabcb06aa62390e7389f33d4678b1) @@ -192,7 +192,7 @@ } @Override - public List getGBLessonComplete(Long lessonId, Integer userId) { + public Object[] getGBLessonComplete(Long lessonId, Integer userId) { GradebookService.logger .debug("Getting lesson complete gradebook user data for lesson: " + lessonId + ". For user: " + userId); @@ -228,7 +228,9 @@ gradebookActivityDTOs.add(activityDTO); } - return gradebookActivityDTOs; + return new Object[] { gradebookActivityDTOs, + gradebookDAO.getGradebookUserDataForLesson(lessonId, userId).getMark(), + getAverageMarkForLesson(lessonId) }; } @Override Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java =================================================================== diff -u -r6c765552ace140caa004eebd60096ff9ff26bb7c -rf5c030a4d14cabcb06aa62390e7389f33d4678b1 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java (.../IGradebookService.java) (revision 6c765552ace140caa004eebd60096ff9ff26bb7c) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java (.../IGradebookService.java) (revision f5c030a4d14cabcb06aa62390e7389f33d4678b1) @@ -93,7 +93,11 @@ List getGBUserRowsForLesson(Lesson lesson, int page, int size, String sortBy, String sortOrder, String searchString, TimeZone userTimezone); - List getGBLessonComplete(Long lessonId, Integer userId); + /** + * Returns several outputs: leaner's rows for lesson's each activity, learner's mark for lesson, learners average + * mark for lesson. + */ + Object[] getGBLessonComplete(Long lessonId, Integer userId); // /** // * Gets the user rows containing only users' names. Do proper paging on DB side. Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java =================================================================== diff -u -r6c765552ace140caa004eebd60096ff9ff26bb7c -rf5c030a4d14cabcb06aa62390e7389f33d4678b1 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java (.../GradebookAction.java) (revision 6c765552ace140caa004eebd60096ff9ff26bb7c) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java (.../GradebookAction.java) (revision f5c030a4d14cabcb06aa62390e7389f33d4678b1) @@ -153,6 +153,7 @@ return null; } + @SuppressWarnings("unchecked") public ActionForward getLessonCompleteGridData(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { // Getting the params passed in from the jqGrid @@ -164,7 +165,8 @@ return null; } - List gradebookActivityDTOs = getGradebookService().getGBLessonComplete(lessonID, userId); + Object[] lessonCompleteData = getGradebookService().getGBLessonComplete(lessonID, userId); + List gradebookActivityDTOs = (List) lessonCompleteData[0]; JSONObject resultJSON = new JSONObject(); resultJSON.put(GradebookConstants.ELEMENT_RECORDS, gradebookActivityDTOs.size()); @@ -185,7 +187,8 @@ } resultJSON.put(GradebookConstants.ELEMENT_ROWS, rowsJSON); - resultJSON.put("averageLessonMark", getGradebookService().getAverageMarkForLesson(lessonID)); + resultJSON.put("learnerLessonMark", lessonCompleteData[1]); + resultJSON.put("averageLessonMark", lessonCompleteData[2]); response.setContentType("application/json;charset=utf-8"); response.getWriter().print(resultJSON.toString()); Index: lams_learning/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r6c765552ace140caa004eebd60096ff9ff26bb7c -rf5c030a4d14cabcb06aa62390e7389f33d4678b1 --- lams_learning/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 6c765552ace140caa004eebd60096ff9ff26bb7c) +++ lams_learning/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision f5c030a4d14cabcb06aa62390e7389f33d4678b1) @@ -156,4 +156,5 @@ gradebook.columntitle.averageMark =Average mark gradebook.columntitle.progress =Progress gradebook.lesson.complete =Grades for this lesson +gradebook.learner.lesson.mark =Your mark #======= End labels: Exported 102 labels for en AU ===== Index: lams_learning/web/lessonComplete.jsp =================================================================== diff -u -r6c765552ace140caa004eebd60096ff9ff26bb7c -rf5c030a4d14cabcb06aa62390e7389f33d4678b1 --- lams_learning/web/lessonComplete.jsp (.../lessonComplete.jsp) (revision 6c765552ace140caa004eebd60096ff9ff26bb7c) +++ lams_learning/web/lessonComplete.jsp (.../lessonComplete.jsp) (revision f5c030a4d14cabcb06aa62390e7389f33d4678b1) @@ -36,7 +36,7 @@ margin-right: auto; } - h4 { + h3, h4 { text-align: center; } @@ -122,6 +122,7 @@ } ], loadComplete : function(data) { + $('#learnerLessonMark').text(data.learnerLessonMark); $('#averageLessonMark').text(data.averageLessonMark); }, loadError : function(xhr,st,err) { @@ -188,10 +189,11 @@
 
+

:

:

- + \ No newline at end of file