Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java,v diff -u -r1.128.2.4 -r1.128.2.5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java 3 Jul 2015 20:35:36 -0000 1.128.2.4 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java 22 Aug 2015 00:10:07 -0000 1.128.2.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/McSessionComparator.java,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/McSessionComparator.java 12 Nov 2013 19:21:24 -0000 1.1 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/McSessionComparator.java 22 Aug 2015 00:10:07 -0000 1.1.2.1 @@ -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); } }