Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r244acde13eb03456c3749cc549a1e6a756c93ca1 -red828f338307e10d6efbea1533d6a4d0f9f08d74 --- lams_tool_assessment/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 244acde13eb03456c3749cc549a1e6a756c93ca1) +++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision ed828f338307e10d6efbea1533d6a4d0f9f08d74) @@ -178,7 +178,6 @@ output.desc.learner.total.score =Last total score output.desc.learner.time.taken =Time taken output.desc.learner.number.of.attempts =Number of attempts -output.desc.learner.no.score = No score output.user.score.for.question =Score for the question: error.form.validation.error =You have 1 error in a form. It has been highlighted error.form.validation.errors =You have {0} errors in a form. They have been highlighted @@ -293,7 +292,6 @@ label.tool.output.has.been.changed =Tool Output has been changed output.desc.first.score =First score output.desc.average.score =Average score -output.desc.no.score =No score label.waiting.for.leader.launch.time.limit =Leader has not started the activity. Please wait until he/she commences it. label.waiting.for.leader.finish =Time limit set by teacher is over. Please wait until a group leader submits all answers. warn.mark.hedging.wrong.justification =Justification cannot be left blank Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java =================================================================== diff -u -r244acde13eb03456c3749cc549a1e6a756c93ca1 -red828f338307e10d6efbea1533d6a4d0f9f08d74 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java (.../AssessmentConstants.java) (revision 244acde13eb03456c3749cc549a1e6a756c93ca1) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java (.../AssessmentConstants.java) (revision ed828f338307e10d6efbea1533d6a4d0f9f08d74) @@ -253,12 +253,11 @@ public static final String OUTPUT_NAME_LEARNER_TOTAL_SCORE = "learner.total.score"; public static final String OUTPUT_NAME_LEARNER_TIME_TAKEN = "learner.time.taken"; public static final String OUTPUT_NAME_LEARNER_NUMBER_ATTEMPTS = "learner.number.of.attempts"; - public static final String OUTPUT_NAME_NO_SCORE = "learner.no.score"; - + public static final String OUTPUT_NAME_BEST_SCORE = "best.score"; public static final String OUTPUT_NAME_FIRST_SCORE = "first.score"; public static final String OUTPUT_NAME_AVERAGE_SCORE = "average.score"; - public static final String OUTPUT_NAME_BLANK = "no.score"; + // error message keys public static final String ERROR_MSG_QUESTION_NAME_BLANK = "error.question.name.blank"; Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java =================================================================== diff -u -r244acde13eb03456c3749cc549a1e6a756c93ca1 -red828f338307e10d6efbea1533d6a4d0f9f08d74 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java (.../AssessmentResultDAO.java) (revision 244acde13eb03456c3749cc549a1e6a756c93ca1) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java (.../AssessmentResultDAO.java) (revision ed828f338307e10d6efbea1533d6a4d0f9f08d74) @@ -52,10 +52,6 @@ Float getLastTotalScoreByUser(Long assessmentUid, Long userId); List getLastTotalScoresByContentId(Long assessmentUid); - - Float getNoScoreByUser(Long sessionId, Long userId); - - List getNoScoresByContentId(Long assessmentUid); Float getBestTotalScoreByUser(Long sessionId, Long userId); Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java =================================================================== diff -u -r244acde13eb03456c3749cc549a1e6a756c93ca1 -red828f338307e10d6efbea1533d6a4d0f9f08d74 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java (.../AssessmentResultDAOHibernate.java) (revision 244acde13eb03456c3749cc549a1e6a756c93ca1) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java (.../AssessmentResultDAOHibernate.java) (revision ed828f338307e10d6efbea1533d6a4d0f9f08d74) @@ -93,14 +93,6 @@ private static final String AVERAGE_SCORES_BY_CONTENT_ID = "SELECT r.user.userId, AVG(r.grade) FROM " + AssessmentResult.class.getName() + " AS r WHERE r.assessment.contentId=? AND (r.finishDate != null) GROUP BY r.user.userId"; - - private static final String NO_SCORE_BY_SESSION_AND_USER = "SELECT '-' FROM " - + AssessmentResult.class.getName() - + " AS r WHERE r.user.userId = ? AND r.sessionId=? AND (r.finishDate != null) AND r.latest=1"; - - private static final String NO_SCORES_BY_CONTENT_ID = "SELECT r.user.userId, '-' FROM " - + AssessmentResult.class.getName() - + " AS r WHERE r.assessment.contentId=? AND (r.finishDate != null) GROUP BY r.user.userId"; private static final String FIND_LAST_ASSESSMENT_RESULT_TIME_TAKEN = "select UNIX_TIMESTAMP(r.finishDate) - UNIX_TIMESTAMP(r.startDate) FROM " + AssessmentResult.class.getName() @@ -178,24 +170,8 @@ q.setParameter(1, sessionId); return ((Float) q.uniqueResult()); } - - @Override - public Float getNoScoreByUser(Long sessionId, Long userId){ - Query q = getSession().createQuery(NO_SCORE_BY_SESSION_AND_USER); - q.setParameter(0, userId); - q.setParameter(1, sessionId); - Object result = q.uniqueResult(); - return result == null ? null : 0f; - } - @Override - public List getNoScoresByContentId(Long toolContentId) { - List list = (List) doFind(NO_SCORES_BY_CONTENT_ID, new Object[] { toolContentId }); - return convertBlankResultsToAssessmentUserDTOList(list); - } - - @Override public List getBestTotalScoresByContentId(Long toolContentId) { List list = (List) doFind(BEST_SCORES_BY_CONTENT_ID, new Object[] { toolContentId }); return convertResultsToAssessmentUserDTOList(list); @@ -340,22 +316,4 @@ return lastTotalScores; } - - // LDEV_NTU-12 Need to be able to change tool output to blank - private List convertBlankResultsToAssessmentUserDTOList(List list) { - - List lastTotalScores = new ArrayList(); - if (list != null && list.size() > 0) { - for (Object[] element : list) { - - Long userId = ((Number) element[0]).longValue(); - AssessmentUserDTO userDto = new AssessmentUserDTO(); - userDto.setUserId(userId); - lastTotalScores.add(userDto); - } - - } - - return lastTotalScores; - } } Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java =================================================================== diff -u -r244acde13eb03456c3749cc549a1e6a756c93ca1 -red828f338307e10d6efbea1533d6a4d0f9f08d74 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java (.../AssessmentOutputFactory.java) (revision 244acde13eb03456c3749cc549a1e6a756c93ca1) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java (.../AssessmentOutputFactory.java) (revision ed828f338307e10d6efbea1533d6a4d0f9f08d74) @@ -57,9 +57,7 @@ definition = buildRangeDefinition(AssessmentConstants.OUTPUT_NAME_LEARNER_TIME_TAKEN, new Long(0), null); definitionMap.put(AssessmentConstants.OUTPUT_NAME_LEARNER_TIME_TAKEN, definition); - definition = buildRangeDefinition(AssessmentConstants.OUTPUT_NAME_NO_SCORE, new Long(0), null); - definitionMap.put(AssessmentConstants.OUTPUT_NAME_NO_SCORE, definition); - + if (toolContentObject != null) { Assessment assessment = (Assessment) toolContentObject; Set questionReferences = new TreeSet(new SequencableComparator()); @@ -187,9 +185,7 @@ } else if (name.equals(AssessmentConstants.OUTPUT_NAME_LEARNER_NUMBER_ATTEMPTS)) { return getNumberAttempts(assessmentService, learnerId, assessment); - } else if (name.equals(AssessmentConstants.OUTPUT_NAME_NO_SCORE)) { - return getNoScore(assessmentService, toolSessionId, learnerId); - } else { + } else { Set questions = assessment.getQuestions(); for (AssessmentQuestion question : questions) { if (name.equals(String.valueOf(question.getSequenceId()))) { @@ -208,10 +204,6 @@ if (name.equals(AssessmentConstants.OUTPUT_NAME_LEARNER_TOTAL_SCORE)) { List results = assessmentService.getLastTotalScoresByContentId(toolContentId); return convertToToolOutputs(results); - - }else if (name.equals(AssessmentConstants.OUTPUT_NAME_BLANK)) { - List results = assessmentService.getNoScoresByContentId(toolContentId); - return convertToToolOutputs(results); } else if (name.equals(AssessmentConstants.OUTPUT_NAME_BEST_SCORE)) { List results = assessmentService.getBestTotalScoresByContentId(toolContentId); @@ -308,20 +300,7 @@ return new ToolOutput(AssessmentConstants.OUTPUT_NAME_AVERAGE_SCORE, getI18NText(AssessmentConstants.OUTPUT_NAME_AVERAGE_SCORE, true), averageTotalScoreFloat); } - - /** - * Get the average score for a user. Will always return a ToolOutput object. - * LDEV_NTU-12 Need to be able to change tool output to blank - * - */ - private ToolOutput getNoScore(IAssessmentService assessmentService, Long sessionId, Long userId) { - Float noScore = assessmentService.getNoScoreByUser(sessionId, userId); - float noScoreFloat = (noScore == null) ? 0 : noScore; - return new ToolOutput(AssessmentConstants.OUTPUT_NAME_BLANK, - getI18NText(AssessmentConstants.OUTPUT_NAME_BLANK, true), noScoreFloat); - } - /** * Get time taken for a specific user to accomplish this assessment. Will always return a ToolOutput object. */ Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java =================================================================== diff -u -r244acde13eb03456c3749cc549a1e6a756c93ca1 -red828f338307e10d6efbea1533d6a4d0f9f08d74 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 244acde13eb03456c3749cc549a1e6a756c93ca1) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision ed828f338307e10d6efbea1533d6a4d0f9f08d74) @@ -900,16 +900,6 @@ public List getLastTotalScoresByContentId(Long toolContentId) { return assessmentResultDao.getLastTotalScoresByContentId(toolContentId); } - - @Override - public Float getNoScoreByUser(Long sessionId, Long userId) { - return assessmentResultDao.getNoScoreByUser(sessionId, userId); - } - - @Override - public List getNoScoresByContentId(Long toolContentId) { - return assessmentResultDao.getNoScoresByContentId(toolContentId); - } @Override public Float getBestTotalScoreByUser(Long sessionId, Long userId) { Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java =================================================================== diff -u -r244acde13eb03456c3749cc549a1e6a756c93ca1 -red828f338307e10d6efbea1533d6a4d0f9f08d74 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java (.../IAssessmentService.java) (revision 244acde13eb03456c3749cc549a1e6a756c93ca1) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java (.../IAssessmentService.java) (revision ed828f338307e10d6efbea1533d6a4d0f9f08d74) @@ -286,18 +286,7 @@ Float getLastTotalScoreByUser(Long assessmentUid, Long userId); List getLastTotalScoresByContentId(Long toolContentId); - - /** - * Return the best *finished* result grade. - * - * @param sessionId - * @param userId - * @return - */ - Float getNoScoreByUser(Long sessionId, Long userId); - List getNoScoresByContentId(Long toolContentId); - /** * Return the best *finished* result grade. * Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java =================================================================== diff -u -r244acde13eb03456c3749cc549a1e6a756c93ca1 -red828f338307e10d6efbea1533d6a4d0f9f08d74 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 244acde13eb03456c3749cc549a1e6a756c93ca1) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision ed828f338307e10d6efbea1533d6a4d0f9f08d74) @@ -185,7 +185,6 @@ //prepare toolOutputDefinitions and activityEvaluation List toolOutputDefinitions = new ArrayList(); - toolOutputDefinitions.add(AssessmentConstants.OUTPUT_NAME_BLANK); toolOutputDefinitions.add(AssessmentConstants.OUTPUT_NAME_LEARNER_TOTAL_SCORE); toolOutputDefinitions.add(AssessmentConstants.OUTPUT_NAME_BEST_SCORE); toolOutputDefinitions.add(AssessmentConstants.OUTPUT_NAME_FIRST_SCORE);