Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java =================================================================== diff -u -ra207bdecc16a704428826dbf402a97de2e35458b -r351836c805d1e36ba77baf154d72e7e934975341 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision a207bdecc16a704428826dbf402a97de2e35458b) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 351836c805d1e36ba77baf154d72e7e934975341) @@ -1027,18 +1027,16 @@ cell = row.createCell(count++); cell.setCellValue(messageService.getMessage("label.learner")); - int groupCount = 0; ArrayList totalPercentList = new ArrayList(); int[] numberOfCorrectAnswersPerQuestion = new int[questions.size()]; for (McSessionMarkDTO sessionMarkDTO : sessionMarkDTOs) { Map usersMarksMap = sessionMarkDTO.getUserMarks(); - groupCount++; for (McUserMarkDTO userMark : usersMarksMap.values()) { row = sheet.createRow(rowCount++); count = 0; cell = row.createCell(count++); - cell.setCellValue(groupCount); + cell.setCellValue(sessionMarkDTO.getSessionName()); cell = row.createCell(count++); cell.setCellValue(userMark.getFullName()); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/McSessionComparator.java =================================================================== diff -u -re03e356e3615a5e9100c8dbaf08e8272d9c69c2b -r351836c805d1e36ba77baf154d72e7e934975341 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/McSessionComparator.java (.../McSessionComparator.java) (revision e03e356e3615a5e9100c8dbaf08e8272d9c69c2b) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/McSessionComparator.java (.../McSessionComparator.java) (revision 351836c805d1e36ba77baf154d72e7e934975341) @@ -3,19 +3,21 @@ import java.util.Comparator; import org.lamsfoundation.lams.tool.mc.pojos.McSession; +import org.lamsfoundation.lams.util.AlphanumComparator; /** * McSessionComparator. */ public class McSessionComparator implements Comparator { + + private static AlphanumComparator alphanumComparator = new AlphanumComparator(); - public int compare(McSession o1, McSession o2) { - if (o1 != null && o2 != null) { - return o1.getSession_name().compareTo(o2.getSession_name()); - } else if (o1 != null) - return 1; - else - return -1; + public int compare(McSession session1, McSession session2) { + + String session1Name = session1 != null ? session1.getSession_name() : ""; + String session2Name = session2 != null ? session2.getSession_name() : ""; + + return alphanumComparator.compare(session1Name, session2Name); } }