Index: lams_build/lib/lams/lams-gradebook.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams-gradebook.jar,v diff -u -r1.7 -r1.8 Binary files differ Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml,v diff -u -r1.5 -r1.6 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml 11 Aug 2014 21:35:18 -0000 1.5 +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml 11 Aug 2014 22:12:52 -0000 1.6 @@ -28,6 +28,7 @@ PROPAGATION_REQUIRED + PROPAGATION_REQUIRED PROPAGATION_REQUIRED,readOnly PROPAGATION_REQUIRED,readOnly Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java =================================================================== RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java,v diff -u -r1.37 -r1.38 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java 11 Aug 2014 21:35:18 -0000 1.37 +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java 11 Aug 2014 22:12:51 -0000 1.38 @@ -41,9 +41,15 @@ import java.util.TimeZone; import java.util.TreeSet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.gradebook.GradebookUserActivity; import org.lamsfoundation.lams.gradebook.GradebookUserLesson; @@ -81,6 +87,7 @@ import org.lamsfoundation.lams.util.DateUtil; import org.lamsfoundation.lams.util.ExcelCell; import org.lamsfoundation.lams.util.MessageService; +import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.util.audit.IAuditService; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; @@ -446,7 +453,23 @@ gradebookUserActivity.setFeedback(feedback); gradebookDAO.insertOrUpdate(gradebookUserActivity); } + + @Override + public void toggleMarksReleased(Long lessonId) { + Lesson lesson = lessonService.getLesson(lessonId); + + boolean isMarksReleased = (lesson.getMarksReleased() != null) && lesson.getMarksReleased(); + lesson.setMarksReleased(!isMarksReleased); + userService.save(lesson); + + // audit log marks released + UserDTO monitor = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); + String messageKey = (isMarksReleased) ? "audit.marks.released.off" : "audit.marks.released.on"; + String message = messageService.getMessage(messageKey, new String[] {lessonId.toString()}); + auditService.log(monitor, GradebookConstants.MODULE_NAME, message); + } + @SuppressWarnings("unchecked") public List getGBLessonRows(Organisation organisation, User user, User viewer, GBGridView view) { List lessonRows = new ArrayList(); Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java =================================================================== RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java,v diff -u -r1.11 -r1.12 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java 11 Aug 2014 21:35:17 -0000 1.11 +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java 11 Aug 2014 22:12:51 -0000 1.12 @@ -130,6 +130,13 @@ void updateUserLessonGradebookFeedback(Lesson lesson, User learner, String feedback); /** + * Toggle on/off marks released option + * + * @param lessonId + */ + void toggleMarksReleased(Long lessonId); + + /** * Gets the lesson row dtos for a given organisation * * @param organisation Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java,v diff -u -r1.16 -r1.17 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java 11 Aug 2014 21:35:18 -0000 1.16 +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java 11 Aug 2014 22:12:52 -0000 1.17 @@ -265,33 +265,27 @@ return null; } - /** - * Toggles the release mark flag for a lesson - * - * @param mapping - * @param form - * @param request - * @param response - * @return - * @throws Exception - */ - public ActionForward toggleReleaseMarks(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) throws Exception { - initServices(); - Long lessonID = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID); + /** + * Toggles the release mark flag for a lesson + * + * @param mapping + * @param form + * @param request + * @param response + * @return + * @throws Exception + */ + public ActionForward toggleReleaseMarks(ActionMapping mapping, ActionForm form, HttpServletRequest request, + HttpServletResponse response) throws Exception { + initServices(); + Long lessonID = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID); + + gradebookService.toggleMarksReleased(lessonID); - Lesson lesson = lessonService.getLesson(lessonID); + writeResponse(response, CONTENT_TYPE_TEXT_PLAIN, ENCODING_UTF8, "success"); + return null; + } - boolean marksReleased = lesson.getMarksReleased() != null && lesson.getMarksReleased(); - - lesson.setMarksReleased(!marksReleased); - - userService.save(lesson); - - writeResponse(response, CONTENT_TYPE_TEXT_PLAIN, ENCODING_UTF8, "success"); - return null; - } - /** * Exports Lesson Gradebook into excel. */