Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java =================================================================== diff -u -rf0ff6bc30e8fa7e5d4201b7b9571194845ad3a83 -r948dbcd765de9641ee116c7a4b2424b9607dc172 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java (.../QuestionDTO.java) (revision f0ff6bc30e8fa7e5d4201b7b9571194845ad3a83) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java (.../QuestionDTO.java) (revision 948dbcd765de9641ee116c7a4b2424b9607dc172) @@ -5,6 +5,7 @@ import java.util.Set; import java.util.TreeSet; +import org.apache.commons.lang.StringUtils; import org.lamsfoundation.lams.qb.model.QbOption; import org.lamsfoundation.lams.qb.model.QbQuestion; import org.lamsfoundation.lams.qb.model.QbQuestionUnit; @@ -507,4 +508,21 @@ public void setTitleEscaped(String titleEscaped) { this.titleEscaped = titleEscaped; } -} + + public boolean isQuestionAnswered() { + if (isResponseSubmitted() || (getMark() != null && getMark() != 0) || StringUtils.isNotBlank(getAnswer())) { + return true; + } + boolean isMatchingPairs = getType().equals(QbQuestion.TYPE_MATCHING_PAIRS); + boolean isMarkHedging = getType().equals(QbQuestion.TYPE_MARK_HEDGING); + for (OptionDTO optionDto : optionDtos) { + if (optionDto.getAnswerBoolean() || (isMarkHedging && optionDto.getAnswerInt() > 0)) { + return true; + } + if (isMatchingPairs && optionDto.getAnswerInt() <= 0) { + return false; + } + } + return isMatchingPairs; + } +} \ No newline at end of file Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java =================================================================== diff -u -r9e11e9cec20735adb7ec1e13a2f78a086c7e63e3 -r948dbcd765de9641ee116c7a4b2424b9607dc172 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 9e11e9cec20735adb7ec1e13a2f78a086c7e63e3) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 948dbcd765de9641ee116c7a4b2424b9607dc172) @@ -2123,7 +2123,7 @@ : questionResult.getMarkedBy().getFullName()); userResultRow.addCell(questionResult.getMarkerComment()); } - + boolean addAnsweredDateColumn = QbQuestion.TYPE_MULTIPLE_CHOICE == question.getType() || QbQuestion.TYPE_TRUE_FALSE == question.getType(); if (addAnsweredDateColumn) { Index: lams_tool_assessment/web/pages/learning/parts/paging.jsp =================================================================== diff -u -r2282297dcd80ed30e79ec409bf5925b2e9417179 -r948dbcd765de9641ee116c7a4b2424b9607dc172 --- lams_tool_assessment/web/pages/learning/parts/paging.jsp (.../paging.jsp) (revision 2282297dcd80ed30e79ec409bf5925b2e9417179) +++ lams_tool_assessment/web/pages/learning/parts/paging.jsp (.../paging.jsp) (revision 948dbcd765de9641ee116c7a4b2424b9607dc172) @@ -5,8 +5,7 @@
-