Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml =================================================================== diff -u -r53be6f88884b380ccb963eb05c985a57f580b5d4 -rec160e8c6dc2160cae9be746014c90a1239b5e0b --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml (.../assessmentApplicationContext.xml) (revision 53be6f88884b380ccb963eb05c985a57f580b5d4) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml (.../assessmentApplicationContext.xml) (revision ec160e8c6dc2160cae9be746014c90a1239b5e0b) @@ -105,20 +105,10 @@ - - - - + - - - - - - - Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java =================================================================== diff -u -r822c99a38640cc4b77403c28a5fbff8e431e3fd6 -rec160e8c6dc2160cae9be746014c90a1239b5e0b --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 822c99a38640cc4b77403c28a5fbff8e431e3fd6) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision ec160e8c6dc2160cae9be746014c90a1239b5e0b) @@ -156,12 +156,6 @@ private IEventNotificationService eventNotificationService; - private ILessonService lessonService; - - private IActivityDAO activityDAO; - - private IUserManagementService userService; - // ******************************************************************************* // Service method // ******************************************************************************* @@ -1864,99 +1858,6 @@ } @Override - public void recalculateMarkForLesson(UserDTO requestUserDTO, Long lessonId) { - - User requestUser = userService.getUserByLogin(requestUserDTO.getLogin()); - Lesson lesson = lessonService.getLesson(lessonId); - Organisation organisation = lesson.getOrganisation(); - - // skip doing anything if the user doesn't have permission - Integer organisationToCheckPermission = (organisation.getOrganisationType().getOrganisationTypeId() - .equals(OrganisationType.COURSE_TYPE)) ? organisation.getOrganisationId() - : organisation.getParentOrganisation().getOrganisationId(); - boolean isGroupManager = userService.isUserInRole(requestUser.getUserId(), organisationToCheckPermission, - Role.GROUP_MANAGER); - if (!(lesson.getLessonClass().isStaffMember(requestUser) || isGroupManager)) { - return; - } - - // get all lesson activities - Set lessonActivities = new TreeSet(); - /* - * Hibernate CGLIB is failing to load the first activity in the sequence as a ToolActivity for some mysterious - * reason Causes a ClassCastException when you try to cast it, even if it is a ToolActivity. - * - * THIS IS A HACK to retrieve the first tool activity manually so it can be cast as a ToolActivity - if it is - * one - */ - Activity firstActivity = activityDAO - .getActivityByActivityId(lesson.getLearningDesign().getFirstActivity().getActivityId()); - lessonActivities.add(firstActivity); - lessonActivities.addAll(lesson.getLearningDesign().getActivities()); - - // iterate through all assessment activities in the lesson - for (Activity activity : lessonActivities) { - - // check if it's assessment activity - if ((activity instanceof ToolActivity) && ((ToolActivity) activity).getTool().getToolSignature() - .equals(AssessmentConstants.TOOL_SIGNATURE)) { - ToolActivity assessmentActivity = (ToolActivity) activity; - - for (ToolSession toolSession : (Set) assessmentActivity.getToolSessions()) { - Long toolSessionId = toolSession.getToolSessionId(); - AssessmentSession assessmentSession = getAssessmentSessionBySessionId(toolSessionId); - Assessment assessment = assessmentSession.getAssessment(); - - if (assessment.isUseSelectLeaderToolOuput()) { - - AssessmentUser leader = assessmentSession.getGroupLeader(); - if (leader == null) { - continue; - } - - AssessmentResult leaderLastResult = getLastFinishedAssessmentResult(assessment.getUid(), - leader.getUserId()); - if (leaderLastResult == null) { - continue; - } - Double mark = new Double(leaderLastResult.getGrade()); - - // update marks for all learners in a group - List users = getUsersBySession(toolSessionId); - for (AssessmentUser user : users) { - copyAnswersFromLeader(user, leader); - - // propagade total mark to Gradebook - gradebookService.updateActivityMark(mark, null, user.getUserId().intValue(), toolSessionId, - false); - } - } else { - - // update marks for all learners in a group - List users = getUsersBySession(toolSessionId); - for (AssessmentUser user : users) { - AssessmentResult userLastResult = getLastFinishedAssessmentResult(assessment.getUid(), - user.getUserId()); - if (userLastResult == null) { - continue; - } - Double mark = new Double(userLastResult.getGrade()); - - // propagade total mark to Gradebook - gradebookService.updateActivityMark(mark, null, user.getUserId().intValue(), toolSessionId, - false); - System.out.println("aaa USER" + user.getUserId()); - } - } - System.out.println("aaa" + toolSessionId); - - } - } - } - - } - - @Override public String getMessage(String key) { return messageService.getMessage(key); } @@ -2420,10 +2321,6 @@ this.assessmentOutputFactory = assessmentOutputFactory; } - public void setLessonService(ILessonService lessonService) { - this.lessonService = lessonService; - } - @Override public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) { return getAssessmentOutputFactory().getSupportedDefinitionClasses(definitionType); @@ -2434,14 +2331,6 @@ return getAssessmentByContentId(toolContentId).getTitle(); } - public void setActivityDAO(IActivityDAO activityDAO) { - this.activityDAO = activityDAO; - } - - public void setUserService(IUserManagementService userService) { - this.userService = userService; - } - // ****************** REST methods ************************* /** Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java =================================================================== diff -u -r822c99a38640cc4b77403c28a5fbff8e431e3fd6 -rec160e8c6dc2160cae9be746014c90a1239b5e0b --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java (.../IAssessmentService.java) (revision 822c99a38640cc4b77403c28a5fbff8e431e3fd6) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java (.../IAssessmentService.java) (revision ec160e8c6dc2160cae9be746014c90a1239b5e0b) @@ -436,14 +436,5 @@ Set oldReferences, Set newReferences, List deletedReferences); - /** - * Recalculate mark for leader and sets it to all members of a group. Authentication check: user must be either - * lesson stuff or group manager. - * - * @param requestUserDTO - * @param lessonId - */ - void recalculateMarkForLesson(UserDTO requestUserDTO, Long lessonId); - void releaseQuestionsAndReferencesFromCache(Assessment assessment); } Fisheye: Tag ec160e8c6dc2160cae9be746014c90a1239b5e0b refers to a dead (removed) revision in file `lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/servlet/PopulateMarksServlet.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_assessment/web/WEB-INF/web.xml =================================================================== diff -u -r5e39743e8bd500d0e121cf4c95b9c9fc77eb80fc -rec160e8c6dc2160cae9be746014c90a1239b5e0b --- lams_tool_assessment/web/WEB-INF/web.xml (.../web.xml) (revision 5e39743e8bd500d0e121cf4c95b9c9fc77eb80fc) +++ lams_tool_assessment/web/WEB-INF/web.xml (.../web.xml) (revision ec160e8c6dc2160cae9be746014c90a1239b5e0b) @@ -92,11 +92,6 @@ - populateMarks - org.lamsfoundation.lams.tool.assessment.web.servlet.PopulateMarksServlet - - - action org.apache.struts.action.ActionServlet @@ -165,11 +160,6 @@ /exportPortfolio - - populateMarks - /populateMarks - - Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml =================================================================== diff -u -r8a907fb13d71011aa7faf97c4a4ca8aedda0a00b -rec160e8c6dc2160cae9be746014c90a1239b5e0b --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml (.../mcApplicationContext.xml) (revision 8a907fb13d71011aa7faf97c4a4ca8aedda0a00b) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml (.../mcApplicationContext.xml) (revision ec160e8c6dc2160cae9be746014c90a1239b5e0b) @@ -85,8 +85,6 @@ - - Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java =================================================================== diff -u -rc3a5c8f5a2521c37b0484e5aac67ff5ae716fefc -rec160e8c6dc2160cae9be746014c90a1239b5e0b --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java (.../IMcService.java) (revision c3a5c8f5a2521c37b0484e5aac67ff5ae716fefc) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java (.../IMcService.java) (revision ec160e8c6dc2160cae9be746014c90a1239b5e0b) @@ -221,16 +221,7 @@ List deletedQuestions); /** - * Recalculate mark for leader and sets it to all members of a group. Authentication check: user must be either - * lesson stuff or group manager. * - * @param requestUserDTO - * @param lessonId - */ - void recalculateMarkForLesson(UserDTO requestUserDTO, Long lessonId); - - /** - * * returns reflection data for all sessions * * @param mcContent Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java =================================================================== diff -u -rc3a5c8f5a2521c37b0484e5aac67ff5ae716fefc -rec160e8c6dc2160cae9be746014c90a1239b5e0b --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision c3a5c8f5a2521c37b0484e5aac67ff5ae716fefc) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision ec160e8c6dc2160cae9be746014c90a1239b5e0b) @@ -143,8 +143,6 @@ private IAuditService auditService; private IUserManagementService userManagementService; - private ILessonService lessonService; - private IActivityDAO activityDAO; private ILearnerService learnerService; private ILamsToolService toolService; private IToolContentHandler mcToolContentHandler = null; @@ -945,94 +943,6 @@ } @Override - public void recalculateMarkForLesson(UserDTO requestUserDTO, Long lessonId) { - - User requestUser = userManagementService.getUserByLogin(requestUserDTO.getLogin()); - Lesson lesson = lessonService.getLesson(lessonId); - Organisation organisation = lesson.getOrganisation(); - - // skip doing anything if the user doesn't have permission - Integer organisationToCheckPermission = (organisation.getOrganisationType().getOrganisationTypeId() - .equals(OrganisationType.COURSE_TYPE)) ? organisation.getOrganisationId() - : organisation.getParentOrganisation().getOrganisationId(); - boolean isGroupManager = userManagementService.isUserInRole(requestUser.getUserId(), - organisationToCheckPermission, Role.GROUP_MANAGER); - if (!(lesson.getLessonClass().isStaffMember(requestUser) || isGroupManager)) { - return; - } - - // get all lesson activities - Set lessonActivities = new TreeSet(); - /* - * Hibernate CGLIB is failing to load the first activity in the sequence as a ToolActivity for some mysterious - * reason Causes a ClassCastException when you try to cast it, even if it is a ToolActivity. - * - * THIS IS A HACK to retrieve the first tool activity manually so it can be cast as a ToolActivity - if it is - * one - */ - Activity firstActivity = activityDAO - .getActivityByActivityId(lesson.getLearningDesign().getFirstActivity().getActivityId()); - lessonActivities.add(firstActivity); - lessonActivities.addAll(lesson.getLearningDesign().getActivities()); - - // iterate through all assessment activities in the lesson - for (Activity activity : lessonActivities) { - - // check if it's assessment activity - if ((activity instanceof ToolActivity) - && ((ToolActivity) activity).getTool().getToolSignature().equals(McAppConstants.MY_SIGNATURE)) { - ToolActivity mcqActivity = (ToolActivity) activity; - - for (ToolSession toolSession : (Set) mcqActivity.getToolSessions()) { - Long toolSessionId = toolSession.getToolSessionId(); - McSession mcSession = getMcSessionById(toolSessionId); - McContent mcContent = mcSession.getMcContent(); - - if (mcContent.isUseSelectLeaderToolOuput()) { - - McQueUsr leader = mcSession.getGroupLeader(); - //if there is no leader yet or leader hasn't submitted any attempts - no point in updating gradebook marks - if (leader == null || (leader.getNumberOfAttempts() == 0)) { - continue; - } - - final Double leaderMark = new Double(leader.getLastAttemptTotalMark()); - - // update marks for all learners in a group - Set users = mcSession.getMcQueUsers(); - for (McQueUsr user : users) { - copyAnswersFromLeader(user, leader); - - // propagade total mark to Gradebook - gradebookService.updateActivityMark(leaderMark, null, user.getQueUsrId().intValue(), - toolSessionId, false); - } - } else { - - // update marks for all learners in a group - Set users = mcSession.getMcQueUsers(); - for (McQueUsr user : users) { - - // if leader hasn't submitted any attempts - no point in updating gradebook marks - if (user.getNumberOfAttempts() == 0) { - continue; - } - - final Double userMark = new Double(user.getLastAttemptTotalMark()); - - // propagade total mark to Gradebook - gradebookService.updateActivityMark(userMark, null, user.getQueUsrId().intValue(), - toolSessionId, false); - } - } - - } - } - } - - } - - @Override public byte[] prepareSessionDataSpreadsheet(McContent mcContent) throws IOException { Set questions = mcContent.getMcQueContents(); @@ -1740,14 +1650,6 @@ this.userManagementService = userManagementService; } - public void setLessonService(ILessonService lessonService) { - this.lessonService = lessonService; - } - - public void setActivityDAO(IActivityDAO activityDAO) { - this.activityDAO = activityDAO; - } - public void setToolService(ILamsToolService toolService) { this.toolService = toolService; } Fisheye: Tag ec160e8c6dc2160cae9be746014c90a1239b5e0b refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/PopulateMarksServlet.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/web/WEB-INF/web.xml =================================================================== diff -u -r3446506b8acd4257a342ac698bede2317c3fcdda -rec160e8c6dc2160cae9be746014c90a1239b5e0b --- lams_tool_lamc/web/WEB-INF/web.xml (.../web.xml) (revision 3446506b8acd4257a342ac698bede2317c3fcdda) +++ lams_tool_lamc/web/WEB-INF/web.xml (.../web.xml) (revision ec160e8c6dc2160cae9be746014c90a1239b5e0b) @@ -123,13 +123,8 @@ exportPortfolio org.lamsfoundation.lams.tool.mc.web.ExportServlet - - - populateMarks - org.lamsfoundation.lams.tool.mc.web.PopulateMarksServlet - - + Connector net.fckeditor.connector.ConnectorServlet @@ -158,11 +153,6 @@ exportPortfolio /exportPortfolio/* - - - populateMarks - /populateMarks - Connector