Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McOptionDTO.java =================================================================== diff -u -r289926a27bdbc9bd2519e3064a85f489fc1845ec -rb7defc33ba0b0ba908dfd546d8429d1ad3043893 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McOptionDTO.java (.../McOptionDTO.java) (revision 289926a27bdbc9bd2519e3064a85f489fc1845ec) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McOptionDTO.java (.../McOptionDTO.java) (revision b7defc33ba0b0ba908dfd546d8429d1ad3043893) @@ -34,6 +34,11 @@ private Long uid; private String candidateAnswer; private String correct; + + /** + * used for TBL monitoring + */ + private float percentage; public McOptionDTO() { @@ -95,6 +100,14 @@ public void setCorrect(String correct) { this.correct = correct; } + + public float getPercentage() { + return percentage; + } + + public void setPercentage(float percentage) { + this.percentage = percentage; + } @Override public int compareTo(Object o) { Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/TblMonitoringAction.java =================================================================== diff -u -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d -rb7defc33ba0b0ba908dfd546d8429d1ad3043893 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/TblMonitoringAction.java (.../TblMonitoringAction.java) (revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/TblMonitoringAction.java (.../TblMonitoringAction.java) (revision b7defc33ba0b0ba908dfd546d8429d1ad3043893) @@ -84,24 +84,19 @@ // build candidate dtos List optionDtos = new LinkedList(); - Long totalPercentage = 0L; for (McOptsContent option : (Set) question.getMcOptionsContents()) { int optionAttemptCount = mcService.getAttemptsCountPerOption(option.getUid()); - Long percentage = (long) ((optionAttemptCount * 100) / totalNumberOfUsers); - totalPercentage += percentage; + float percentage = (float)(optionAttemptCount * 100) / totalNumberOfUsers; McOptionDTO optionDTO = new McOptionDTO(option); -// optionDTO.setCandidateAnswer(StringEscapeUtils.escapeJavaScript(option.getMcQueOptionText())); - optionDTO.setUid(percentage); + optionDTO.setPercentage(percentage); optionDtos.add(optionDTO); } McQuestionDTO questionDto = new McQuestionDTO(); questionDto.setUid(question.getUid()); questionDto.setQuestion(question.getQuestion()); -// questionDto.setFeedback(StringEscapeUtils.escapeJavaScript(question.getQuestion())); - questionDto.setMark("" + (100 - totalPercentage)); questionDto.setOptionDtos(optionDtos); questionDtos.add(questionDto); Index: lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp =================================================================== diff -u -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d -rb7defc33ba0b0ba908dfd546d8429d1ad3043893 --- lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp (.../mcqStudentChoices.jsp) (revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d) +++ lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp (.../mcqStudentChoices.jsp) (revision b7defc33ba0b0ba908dfd546d8429d1ad3043893) @@ -56,9 +56,6 @@ ${ALPHABET_CAPITAL_LETTERS[i]} - - - @@ -73,15 +70,13 @@ success"> - ${optionDto.uid}% + % - - ${questionDto.mark}% @@ -119,23 +114,11 @@ - ${optionDto.uid}% + % - - - ${ALPHABET[fn:length(questionDto.optionDtos)]}. - - - - - - ${questionDto.mark}% - - -