Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McOptsContent.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rc2ad516e6b1fa68cf9828f1b6664344c99b980fc --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McOptsContent.java (.../McOptsContent.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McOptsContent.java (.../McOptsContent.java) (revision c2ad516e6b1fa68cf9828f1b6664344c99b980fc) @@ -166,4 +166,8 @@ public void setEscapedOptionText(String escapedOptionText) { this.escapedOptionText = escapedOptionText; } + + public String formatPrefixLetter(int index) { + return new String(Character.toChars(97 + index)) + ")"; + } } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java =================================================================== diff -u -rb4f6a6c35d72f0cf2d10144f3700f0e29a527edc -rc2ad516e6b1fa68cf9828f1b6664344c99b980fc --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java (.../McLearningAction.java) (revision b4f6a6c35d72f0cf2d10144f3700f0e29a527edc) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java (.../McLearningAction.java) (revision c2ad516e6b1fa68cf9828f1b6664344c99b980fc) @@ -418,13 +418,13 @@ List listQuestionOptions = mcService.findOptionsByQuestionUid(new Long(currentQuestionUid)); //builds a questions map from questions list - Map mapOptsContent = new TreeMap(new McComparator()); + Map mapOptsContent = new TreeMap(); Iterator iter = listQuestionOptions.iterator(); - Long mapIndex2 = new Long(1); + int mapIndex2 = 0; while (iter.hasNext()) { McOptsContent option = iter.next(); - mapOptsContent.put(mapIndex2.toString(), option.getMcQueOptionText()); - mapIndex2 = new Long(mapIndex2.longValue() + 1); + String stringIndex = mcContent.isPrefixAnswersWithLetters() ? option.formatPrefixLetter(mapIndex2++) : Integer.toString(++mapIndex2); + mapOptsContent.put(stringIndex, option.getMcQueOptionText()); } mapStartupGeneralOptionsContent.put(mapIndex.toString(), mapOptsContent); Index: lams_tool_lamc/web/learning/ViewAnswers.jsp =================================================================== diff -u -rb4f6a6c35d72f0cf2d10144f3700f0e29a527edc -rc2ad516e6b1fa68cf9828f1b6664344c99b980fc --- lams_tool_lamc/web/learning/ViewAnswers.jsp (.../ViewAnswers.jsp) (revision b4f6a6c35d72f0cf2d10144f3700f0e29a527edc) +++ lams_tool_lamc/web/learning/ViewAnswers.jsp (.../ViewAnswers.jsp) (revision c2ad516e6b1fa68cf9828f1b6664344c99b980fc) @@ -6,7 +6,9 @@ + + <fmt:message key="activity.title" /> @@ -23,6 +25,9 @@ table .bg-success, table .bg-danger { width: 32px; } + .table-top>tbody>tr>td { + vertical-align: top; + } @@ -112,11 +117,25 @@ + + + + + + + + +
${subEntry.key} +
+
+
+
+
Index: lams_tool_lamc/web/monitoring/parts/advanceQuestions.jsp =================================================================== diff -u -r463f7b3dbb88ee41210f7170dc19dc25360cd26f -rc2ad516e6b1fa68cf9828f1b6664344c99b980fc --- lams_tool_lamc/web/monitoring/parts/advanceQuestions.jsp (.../advanceQuestions.jsp) (revision 463f7b3dbb88ee41210f7170dc19dc25360cd26f) +++ lams_tool_lamc/web/monitoring/parts/advanceQuestions.jsp (.../advanceQuestions.jsp) (revision c2ad516e6b1fa68cf9828f1b6664344c99b980fc) @@ -21,8 +21,13 @@ - + + + +
+ ${option.formatPrefixLetter(optionStatus.index)} + ()