Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml,v diff -u -r1.38 -r1.38.2.1 --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml 9 Apr 2009 05:05:40 -0000 1.38 +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml 17 Apr 2009 07:22:28 -0000 1.38.2.1 @@ -61,6 +61,9 @@ + + Index: lams_common/db/sql/create_lams_11_tables.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/create_lams_11_tables.sql,v diff -u -r1.138 -r1.138.2.1 --- lams_common/db/sql/create_lams_11_tables.sql 7 Apr 2009 05:23:52 -0000 1.138 +++ lams_common/db/sql/create_lams_11_tables.sql 17 Apr 2009 07:22:28 -0000 1.138.2.1 @@ -661,6 +661,7 @@ , learner_im_avail TINYINT(1) DEFAULT 0 , live_edit_enabled TINYINT(1) DEFAULT 0 , locked_for_edit TINYINT DEFAULT 0 + , marks_released TINYINT DEFAULT 0 , version INTEGER DEFAULT 1 , PRIMARY KEY (lesson_id) , INDEX (learning_design_id) Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql,v diff -u -r1.13.2.2 -r1.13.2.3 --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql 14 Apr 2009 06:48:53 -0000 1.13.2.2 +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql 17 Apr 2009 07:22:28 -0000 1.13.2.3 @@ -111,10 +111,9 @@ , PRIMARY KEY (uid) )TYPE=InnoDB; +-- LDEV-2207 ------------ Adding flag in lesson to release marks for gradebook +ALTER TABLE lams_lesson ADD COLUMN marks_released TINYINT DEFAULT 0; - - - ----------------------Put all sql statements above here------------------------- -- If there were no errors, commit and restore autocommit to on Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java,v diff -u -r1.1.2.1 -r1.1.2.2 --- lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java 16 Apr 2009 06:46:26 -0000 1.1.2.1 +++ lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java 17 Apr 2009 07:22:28 -0000 1.1.2.2 @@ -61,7 +61,7 @@ + "gact.activity.activityId=:activityID and grp.groupId=:groupID and gu.user=gact.learner and gu.group=grp"; private static final String GET_AVERAGE_COMPLETION_TIME_GROUPED_ACTIVITY = "select compProg.finishDate, compProg.startDate from CompletedActivityProgress compProg, Activity act, Group grp, GroupUser gu where " - + "compProg.activity.activityId=:activityID and grp.groupId=:groupID and gu.user=compProg.learnerProgress.user and gu.group=grp"; + + "compProg.activity.activityId=:activityID and grp.groupId=:groupID and gu.user=compProg.learnerProgress.user and gu.group=grp"; @SuppressWarnings("unchecked") public GradebookUserActivity getGradebookUserDataForActivity(Long activityID, Integer userID) { Index: lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java,v diff -u -r1.33 -r1.33.2.1 --- lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java 9 Apr 2009 05:05:40 -0000 1.33 +++ lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java 17 Apr 2009 07:22:28 -0000 1.33.2.1 @@ -139,6 +139,9 @@ /** Persistent field. Defaults to FALSE if not set to anything by a constructor parameter. */ private Boolean liveEditEnabled; + /** Persistent field. Defaults to FALSE if not set to anything by a constructor parameter. */ + private Boolean marksReleased; + //--------------------------------------------------------------------- // constructors //--------------------------------------------------------------------- @@ -620,4 +623,16 @@ public void setGradebookUserLessons(Set gradebookUserLessons) { this.gradebookUserLessons = gradebookUserLessons; } + + /** + * @hibernate.property type="java.lang.Boolean" column="marks_released" + * length="1" + */ + public Boolean getMarksReleased() { + return marksReleased; + } + + public void setMarksReleased(Boolean marksReleased) { + this.marksReleased = marksReleased; + } } Index: lams_gradebook/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_gradebook/conf/language/lams/ApplicationResources.properties,v diff -u -r1.1.2.2 -r1.1.2.3 --- lams_gradebook/conf/language/lams/ApplicationResources.properties 17 Apr 2009 07:18:31 -0000 1.1.2.2 +++ lams_gradebook/conf/language/lams/ApplicationResources.properties 17 Apr 2009 07:22:27 -0000 1.1.2.3 @@ -44,6 +44,12 @@ gradebook.function.search.equalTo =equal to gradebook.function.search.notEqualTo =not equal to gradebook.error.loaderror =There was an error loading the grid. If this problem persists, please contact your system administrator. +gradebook.monitor.releasemarks.1 =Release +gradebook.monitor.releasemarks.2 =Un-release +gradebook.monitor.releasemarks.3 =marks for this lesson. +gradebook.monitoy.releasemarks.check =Are you sure you want to release marks for this lesson to learners? +gradebook.monitoy.releasemarks.check2 =Are you sure you want to un-release marks for this lesson? +error.releasemarks.fail =Mark release failed, please contact your system adminstrator. label.ok =OK label.cancel =Cancel label.find =Find Index: lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.1.2.2 -r1.1.2.3 --- lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties 17 Apr 2009 07:18:32 -0000 1.1.2.2 +++ lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties 17 Apr 2009 07:22:27 -0000 1.1.2.3 @@ -44,6 +44,12 @@ gradebook.function.search.equalTo =equal to gradebook.function.search.notEqualTo =not equal to gradebook.error.loaderror =There was an error loading the grid. If this problem persists, please contact your system administrator. +gradebook.monitor.releasemarks.1 =Release +gradebook.monitor.releasemarks.2 =Un-release +gradebook.monitor.releasemarks.3 =marks for this lesson. +gradebook.monitoy.releasemarks.check =Are you sure you want to release marks for this lesson to learners? +gradebook.monitoy.releasemarks.check2 =Are you sure you want to un-release marks for this lesson? +error.releasemarks.fail =Mark release failed, please contact your system adminstrator. label.ok =OK label.cancel =Cancel label.find =Find 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.1.2.4 -r1.1.2.5 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java 16 Apr 2009 06:46:25 -0000 1.1.2.4 +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java 17 Apr 2009 07:22:27 -0000 1.1.2.5 @@ -417,7 +417,7 @@ if (!(view == GBGridView.MON_COURSE && (lesson.getLessonClass().isStaffMember(user) || userService.isUserInRole(user .getUserId(), organisation.getOrganisationId(), Role.GROUP_MANAGER)) || view == GBGridView.LRN_COURSE - && lesson.getAllLearners().contains(user))) { + && lesson.getAllLearners().contains(user) && lesson.getMarksReleased())) { continue; } 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.1.2.1 -r1.1.2.2 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java 16 Apr 2009 06:46:25 -0000 1.1.2.1 +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java 17 Apr 2009 07:22:27 -0000 1.1.2.2 @@ -107,6 +107,8 @@ LessonDetailsDTO lessonDetatilsDTO = lesson.getLessonDetails(); request.setAttribute("lessonDetails", lessonDetatilsDTO); + request.setAttribute("marksReleased", lesson.getMarksReleased()); + return mapping.findForward("monitorgradebook"); } @@ -257,7 +259,32 @@ } 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); + Lesson lesson = lessonService.getLesson(lessonID); + + lesson.setMarksReleased(!lesson.getMarksReleased()); + userService.save(lesson); + + response.setContentType("text/plain"); + response.getWriter().write("success"); + return null; + } + private UserDTO getUser() { HttpSession ss = SessionManager.getSession(); return (UserDTO) ss.getAttribute(AttributeNames.USER); Index: lams_gradebook/web/gradebookMonitor.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_gradebook/web/gradebookMonitor.jsp,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_gradebook/web/gradebookMonitor.jsp 16 Apr 2009 06:46:25 -0000 1.1.2.3 +++ lams_gradebook/web/gradebookMonitor.jsp 17 Apr 2009 07:22:27 -0000 1.1.2.4 @@ -11,12 +11,56 @@ <fmt:message key="gradebook.title.window.lessonMonitor"/> + +