Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieSessionDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieSessionDAO.java,v diff -u -r1.1 -r1.1.4.1 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieSessionDAO.java 19 Jul 2012 19:20:08 -0000 1.1 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieSessionDAO.java 22 Aug 2015 00:29:52 -0000 1.1.4.1 @@ -31,6 +31,12 @@ ScratchieSession getSessionBySessionId(Long sessionId); + /** + * Returns list of sessions sorted alphanumerically (that is taking into account Group 1, Group 2, Group 10 case). + * + * @param toolContentId + * @return + */ List getByContentId(Long toolContentId); void delete(ScratchieSession session); Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java,v diff -u -r1.2.2.2 -r1.2.2.3 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java 29 Nov 2014 21:42:16 -0000 1.2.2.2 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java 22 Aug 2015 00:29:52 -0000 1.2.2.3 @@ -23,11 +23,15 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.scratchie.dao.hibernate; +import java.util.ArrayList; import java.util.List; +import java.util.Set; +import java.util.TreeSet; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.scratchie.dao.ScratchieSessionDAO; import org.lamsfoundation.lams.tool.scratchie.model.ScratchieSession; +import org.lamsfoundation.lams.tool.scratchie.util.ScratchieSessionComparator; import org.springframework.stereotype.Repository; @Repository @@ -47,7 +51,12 @@ @SuppressWarnings("unchecked") public List getByContentId(Long toolContentId) { - return (List) doFind(FIND_BY_CONTENT_ID, toolContentId); + List sessions = (List) doFind(FIND_BY_CONTENT_ID, toolContentId); + + Set sortedSessions = new TreeSet(new ScratchieSessionComparator()); + sortedSessions.addAll(sessions); + + return new ArrayList(sortedSessions); } public void delete(ScratchieSession session) { Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java,v diff -u -r1.51.2.10 -r1.51.2.11 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java 14 Aug 2015 08:27:49 -0000 1.51.2.10 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java 22 Aug 2015 00:29:52 -0000 1.51.2.11 @@ -90,6 +90,7 @@ import org.lamsfoundation.lams.tool.scratchie.model.ScratchieUser; import org.lamsfoundation.lams.tool.scratchie.util.ScratchieAnswerComparator; import org.lamsfoundation.lams.tool.scratchie.util.ScratchieItemComparator; +import org.lamsfoundation.lams.tool.scratchie.util.ScratchieSessionComparator; import org.lamsfoundation.lams.tool.scratchie.util.ScratchieToolContentHandler; import org.lamsfoundation.lams.tool.scratchie.web.action.LearningAction; import org.lamsfoundation.lams.tool.service.ILamsToolService; @@ -527,9 +528,9 @@ @Override public List getMonitoringSummary(Long contentId, boolean isIncludeOnlyLeaders) { List groupSummaryList = new ArrayList(); - List sessionList = scratchieSessionDao.getByContentId(contentId); + List sessions = scratchieSessionDao.getByContentId(contentId); - for (ScratchieSession session : sessionList) { + for (ScratchieSession session : sessions) { Long sessionId = session.getSessionId(); // one new summary for one session. @@ -937,13 +938,12 @@ row[columnCount++] = new ExcelCell(getMessage("label.total") + " %", true); rowList.add(row); - int groupCount = 1; List summaryByTeam = getSummaryByTeam(scratchie, items); for (GroupSummary summary : summaryByTeam) { row = new ExcelCell[numberOfItems + 4]; columnCount = 1; - row[columnCount++] = new ExcelCell("T" + groupCount++, true); + row[columnCount++] = new ExcelCell(summary.getSessionName(), true); int numberOfFirstChoiceEvents = 0; for (ScratchieItem item : summary.getItems()) { @@ -1019,13 +1019,13 @@ row[0] = new ExcelCell(getMessage("monitoring.label.group"), false); rowList.add(row); - groupCount = 1; + int groupCount = 1; int[] percentages = new int[summaryByTeam.size()]; for (GroupSummary summary : summaryByTeam) { row = new ExcelCell[numberOfItems + 3]; columnCount = 0; - row[columnCount++] = new ExcelCell(groupCount, false); + row[columnCount++] = new ExcelCell(summary.getSessionName(), false); int numberOfFirstChoiceEvents = 0; for (ScratchieItem item : summary.getItems()) { Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/util/ScratchieSessionComparator.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_scratchie/web/pages/learning/results.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/learning/results.jsp,v diff -u -r1.13.2.2 -r1.13.2.3 --- lams_tool_scratchie/web/pages/learning/results.jsp 3 Jul 2015 15:39:33 -0000 1.13.2.2 +++ lams_tool_scratchie/web/pages/learning/results.jsp 22 Aug 2015 00:29:52 -0000 1.13.2.3 @@ -67,6 +67,8 @@ feedback:"" }); + + jQuery("#burningQuestions${burningQuestionDto.item.uid}").jqGrid('sortGrid','groupName', false, 'asc'); Index: lams_tool_scratchie/web/pages/monitoring/summary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/monitoring/summary.jsp,v diff -u -r1.14.2.2 -r1.14.2.3 --- lams_tool_scratchie/web/pages/monitoring/summary.jsp 3 Jul 2015 20:24:51 -0000 1.14.2.2 +++ lams_tool_scratchie/web/pages/monitoring/summary.jsp 22 Aug 2015 00:29:52 -0000 1.14.2.3 @@ -120,6 +120,8 @@ feedback:"" }); + + jQuery("#burningQuestions${burningQuestionDto.item.uid}").jqGrid('sortGrid','groupName', false, 'asc');