Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java =================================================================== diff -u -rdb0095c7ccb1a6c3bdbce14f3ca019ac106bc1e5 -r3ef9ae27663556230437c96a76b34599ca104a18 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java (.../TblMonitoringController.java) (revision db0095c7ccb1a6c3bdbce14f3ca019ac106bc1e5) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java (.../TblMonitoringController.java) (revision 3ef9ae27663556230437c96a76b34599ca104a18) @@ -79,21 +79,6 @@ private ICommonScratchieService commonScratchieService; /** - * Displays addStudent page. - */ - @RequestMapping("/start") - public String unspecified(HttpServletRequest request) { - long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID); - Lesson lesson = lessonService.getLesson(lessonId); - request.setAttribute("lesson", lesson); - request.setAttribute("totalLearnersNumber", lesson.getAllLearners().size()); - - List lessonActivities = getLessonActivities(lesson); - TblMonitoringController.setupAvailableActivityTypes(request, lessonActivities); - return "tblmonitor/tblmonitor"; - } - - /** * Shows Teams page */ @RequestMapping("/teams") @@ -105,8 +90,8 @@ TblMonitoringController.setupAvailableActivityTypes(request, lessonActivities); boolean isTraAvailable = (request.getAttribute("isScratchieAvailable") != null) && ((Boolean) request.getAttribute("isScratchieAvailable")); - boolean isIraAvailable = request.getAttribute("isIraAssessmentAvailable") != null - && ((Boolean) request.getAttribute("isIraAssessmentAvailable")); + boolean isIraAvailable = request.getAttribute("isIraAvailable") != null + && ((Boolean) request.getAttribute("isIraAvailable")); Long iraToolActivityId = request.getAttribute("iraToolActivityId") == null ? null : (Long) request.getAttribute("iraToolActivityId"); Long traToolActivityId = request.getAttribute("traToolActivityId") == null ? null @@ -508,7 +493,7 @@ if (!iraPassed && isScratchieAvailable && CommonConstants.TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature)) { iraPassed = true; - request.setAttribute("isIraAssessmentAvailable", true); + request.setAttribute("isIraAvailable", true); request.setAttribute("iraToolContentId", toolContentId); request.setAttribute("iraToolActivityId", toolActivityId); Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java =================================================================== diff -u -rb8e5c281efce81034ea2675a610ba3ea8faa41fb -r3ef9ae27663556230437c96a76b34599ca104a18 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java (.../AssessmentResultDAO.java) (revision b8e5c281efce81034ea2675a610ba3ea8faa41fb) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java (.../AssessmentResultDAO.java) (revision 3ef9ae27663556230437c96a76b34599ca104a18) @@ -105,7 +105,7 @@ /** * Count how many last attempts selected specified option. */ - int countAttemptsPerOption(Long toolContentId, Long optionUid, boolean finishedAttemptsOnly); + int countAttemptsPerOption(Long toolContentId, Long optionUid); Map> getAnsweredQuestionsByUsers(long toolContentId); } \ No newline at end of file Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java =================================================================== diff -u -rf0ff6bc30e8fa7e5d4201b7b9571194845ad3a83 -r3ef9ae27663556230437c96a76b34599ca104a18 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java (.../AssessmentResultDAOHibernate.java) (revision f0ff6bc30e8fa7e5d4201b7b9571194845ad3a83) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java (.../AssessmentResultDAOHibernate.java) (revision 3ef9ae27663556230437c96a76b34599ca104a18) @@ -378,14 +378,13 @@ } @Override - public int countAttemptsPerOption(Long toolContentId, Long optionUid, boolean finishedAttemptsOnly) { + public int countAttemptsPerOption(Long toolContentId, Long optionUid) { String COUNT_ATTEMPTS_BY_OPTION_UID = "SELECT count(*) " + "FROM tl_laasse10_assessment_result AS result " + "JOIN tl_laasse10_assessment AS assessment ON assessment.uid = result.assessment_uid " + "JOIN tl_laasse10_question_result AS questionResult ON questionResult.result_uid = result.uid " + "JOIN lams_qb_tool_answer AS qbToolAnswer ON qbToolAnswer.answer_uid = questionResult.uid " + "JOIN tl_laasse10_option_answer AS optionAnswer ON questionResult.uid = optionAnswer.question_result_uid " - + "WHERE " + (finishedAttemptsOnly ? "(result.finish_date IS NOT NULL) AND " : "") - + "result.latest=1 && assessment.content_id = :toolContentId AND optionAnswer.question_option_uid = :optionUid " + + "WHERE result.latest=1 && assessment.content_id = :toolContentId AND optionAnswer.question_option_uid = :optionUid " + "AND (optionAnswer.answer_boolean=1 OR qbToolAnswer.qb_option_uid = :optionUid) "; NativeQuery query = getSession().createNativeQuery(COUNT_ATTEMPTS_BY_OPTION_UID); Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java =================================================================== diff -u -rc4c29fd5db10de898ba8f9892236d6d537efba0f -r3ef9ae27663556230437c96a76b34599ca104a18 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision c4c29fd5db10de898ba8f9892236d6d537efba0f) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 3ef9ae27663556230437c96a76b34599ca104a18) @@ -1177,8 +1177,8 @@ } @Override - public int countAttemptsPerOption(Long toolContentId, Long optionUid, boolean finishedAttemptsOnly) { - return assessmentResultDao.countAttemptsPerOption(toolContentId, optionUid, finishedAttemptsOnly); + public int countAttemptsPerOption(Long toolContentId, Long optionUid) { + return assessmentResultDao.countAttemptsPerOption(toolContentId, optionUid); } @Override @@ -3445,7 +3445,7 @@ } AssessmentResult assessmentResult = getLastAssessmentResult(assessment.getUid(), Integer.valueOf(userId).longValue()); - return countCorrectAnswers(assessment.getUid(), user.getUid(), assessmentResult); + return countCorrectAnswers(assessment.getUid(), assessmentResult); } @Override @@ -3456,16 +3456,19 @@ Collection assessmentResults = assessmentResultDao.getLastAssessmentResults(assessmentUid); for (AssessmentResult assessmentResult : assessmentResults) { AssessmentUser user = assessmentResult.getUser(); - int count = countCorrectAnswers(assessmentUid, user.getUid(), assessmentResult); + int count = countCorrectAnswers(assessmentUid, assessmentResult); counts.put(user.getUserId().intValue(), count); } return counts; } - private int countCorrectAnswers(long assessmentUid, long userUid, AssessmentResult assessmentResult) { + private int countCorrectAnswers(long assessmentUid, AssessmentResult assessmentResult) { if (assessmentResult == null) { return 0; } + + AssessmentUser user = assessmentResult.getUser(); + long userUid = user.getUid(); int count = 0; for (AssessmentQuestionResult questionResult : assessmentResult.getQuestionResults()) { Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java =================================================================== diff -u -r5694a8e26e12cfd208ef7f26d736f02dc6749f23 -r3ef9ae27663556230437c96a76b34599ca104a18 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java (.../IAssessmentService.java) (revision 5694a8e26e12cfd208ef7f26d736f02dc6749f23) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java (.../IAssessmentService.java) (revision 3ef9ae27663556230437c96a76b34599ca104a18) @@ -327,7 +327,7 @@ /** * Count how many last attempts selected specified option. */ - int countAttemptsPerOption(Long toolContentId, Long optionUid, boolean finishedAttemptsOnly); + int countAttemptsPerOption(Long toolContentId, Long optionUid); /** * Return number of finished results. I.e. don't count the last not-yet-finished result (it can be autosave one). Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java =================================================================== diff -u -r976df526805398d7daa7d49e4e11b81272ec3cb5 -r3ef9ae27663556230437c96a76b34599ca104a18 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 976df526805398d7daa7d49e4e11b81272ec3cb5) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 3ef9ae27663556230437c96a76b34599ca104a18) @@ -241,7 +241,7 @@ // build candidate dtos for (OptionDTO optionDto : questionDto.getOptionDtos()) { - int optionAttemptCount = service.countAttemptsPerOption(contentId, optionDto.getUid(), false); + int optionAttemptCount = service.countAttemptsPerOption(contentId, optionDto.getUid()); float percentage = (float) (optionAttemptCount * 100) / totalNumberOfUsers; optionDto.setPercentage(percentage); Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java =================================================================== diff -u -r35dd47046a83ab2f9e80f76dc22d1521412219b5 -r3ef9ae27663556230437c96a76b34599ca104a18 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java (.../TblMonitoringController.java) (revision 35dd47046a83ab2f9e80f76dc22d1521412219b5) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java (.../TblMonitoringController.java) (revision 3ef9ae27663556230437c96a76b34599ca104a18) @@ -119,8 +119,8 @@ // build candidate dtos for (OptionDTO optionDto : questionDto.getOptionDtos()) { - int optionAttemptCount = assessmentService.countAttemptsPerOption(toolContentId, optionDto.getUid(), - false); + int optionAttemptCount = assessmentService.countAttemptsPerOption(toolContentId, + optionDto.getUid()); float percentage = (float) (optionAttemptCount * 100) / totalNumberOfUsers; optionDto.setPercentage(percentage);