Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r562089bd7ef5093aed1d28a87a7366a0448a6145 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java (.../GradebookMonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java (.../GradebookMonitoringController.java) (revision 562089bd7ef5093aed1d28a87a7366a0448a6145) @@ -68,7 +68,7 @@ /** * Handles the monitor interfaces for gradebook. * This is where marking for an activity/lesson takes place - * + * * @author lfoxton */ @Controller @@ -142,7 +142,8 @@ return null; } - Organisation organisation = (Organisation) userManagementService.findById(Organisation.class, organisationID); + Organisation organisation = (Organisation) userManagementService.findById(Organisation.class, + organisationID); request.setAttribute("organisationID", organisationID); request.setAttribute("organisationName", organisation.getName()); @@ -247,11 +248,11 @@ Lesson lesson = lessonService.getLesson(lessonID); if ((markStr != null) && !markStr.equals("")) { Double mark = Double.parseDouble(markStr); - gradebookService.updateUserLessonGradebookMark(lesson, learner, mark); + gradebookService.updateGradebookUserActivityMark(lesson, learner, activity, mark, true, true); } if (feedback != null) { - gradebookService.updateUserLessonGradebookFeedback(lesson, learner, feedback); + gradebookService.updateGradebookUserActivityFeedback(activity, learner, feedback); } }