Index: lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r8de4e6f48a6ad07b55ce8cc4a4eced6490838d0c -r9ecffbf5351e9dbf37af3b94a83f8450b314bf62 --- lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 8de4e6f48a6ad07b55ce8cc4a4eced6490838d0c) +++ lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 9ecffbf5351e9dbf37af3b94a83f8450b314bf62) @@ -173,4 +173,6 @@ label.time.of.selection.9 =Time of selection for 9th choice label.time.of.selection.10 =Time of selection for 10th choice label.none =None +label.learners.feedback =Learner's feedback +label.monitoring.team.leader =team leader Index: lams_tool_scratchie/conf/xdoclet/struts-actions.xml =================================================================== diff -u -r8de4e6f48a6ad07b55ce8cc4a4eced6490838d0c -r9ecffbf5351e9dbf37af3b94a83f8450b314bf62 --- lams_tool_scratchie/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision 8de4e6f48a6ad07b55ce8cc4a4eced6490838d0c) +++ lams_tool_scratchie/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision 9ecffbf5351e9dbf37af3b94a83f8450b314bf62) @@ -252,11 +252,6 @@ type="org.lamsfoundation.lams.tool.scratchie.web.action.MonitoringAction" parameter="saveLeaders" > - - - Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java =================================================================== diff -u -rbc65717cc947dfd5b941ab4ac8f31a59c8f68bf4 -r9ecffbf5351e9dbf37af3b94a83f8450b314bf62 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java (.../ScratchieConstants.java) (revision bc65717cc947dfd5b941ab4ac8f31a59c8f68bf4) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java (.../ScratchieConstants.java) (revision 9ecffbf5351e9dbf37af3b94a83f8450b314bf62) @@ -140,9 +140,9 @@ public static final String ATTR_REFLECTION_INSTRUCTION = "reflectInstructions"; public static final String ATTR_REFLECTION_ENTRY = "reflectEntry"; + + public static final String ATTR_REFLECTIONS = "reflections"; - public static final String ATTR_REFLECT_LIST = "reflectList"; - public static final String ATTR_USER_UID = "userUid"; public static final String ATTR_USER_ID = "userId"; Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java =================================================================== diff -u -r8de4e6f48a6ad07b55ce8cc4a4eced6490838d0c -r9ecffbf5351e9dbf37af3b94a83f8450b314bf62 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java (.../IScratchieService.java) (revision 8de4e6f48a6ad07b55ce8cc4a4eced6490838d0c) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java (.../IScratchieService.java) (revision 9ecffbf5351e9dbf37af3b94a83f8450b314bf62) @@ -23,6 +23,7 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.scratchie.service; +import java.util.ArrayList; import java.util.Collection; import java.util.LinkedHashMap; import java.util.List; @@ -38,9 +39,8 @@ import org.lamsfoundation.lams.tool.scratchie.dto.Summary; import org.lamsfoundation.lams.tool.scratchie.model.Scratchie; import org.lamsfoundation.lams.tool.scratchie.model.ScratchieAnswer; -import org.lamsfoundation.lams.tool.scratchie.model.ScratchieItem; -import org.lamsfoundation.lams.tool.scratchie.model.ScratchieAnswerVisitLog; import org.lamsfoundation.lams.tool.scratchie.model.ScratchieAttachment; +import org.lamsfoundation.lams.tool.scratchie.model.ScratchieItem; import org.lamsfoundation.lams.tool.scratchie.model.ScratchieSession; import org.lamsfoundation.lams.tool.scratchie.model.ScratchieUser; import org.lamsfoundation.lams.usermanagement.User; @@ -264,9 +264,9 @@ * scratchie item * @return */ - public List exportBySessionId(Long sessionId); + List exportBySessionId(Long sessionId); - public List> exportByContentId(Long contentId); + List> exportByContentId(Long contentId); /** * Create refection entry into notebook tool. @@ -277,7 +277,7 @@ * @param userId * @param entryText */ - public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId, + Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId, String entryText); /** @@ -289,20 +289,20 @@ * @param userID * @return */ - public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID); + NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID); /** * @param notebookEntry */ - public void updateEntry(NotebookEntry notebookEntry); + void updateEntry(NotebookEntry notebookEntry); /** - * Get Reflect DTO list grouped by sessionID. + * Get Reflection list grouped by sessionID. * * @param contentId * @return */ - Map> getReflectList(Long contentId, boolean setEntry); + List getReflectionList(Long contentId); /** * Get user by UID @@ -312,7 +312,7 @@ */ ScratchieUser getUser(Long uid); - public IEventNotificationService getEventNotificationService(); + IEventNotificationService getEventNotificationService(); /** * Gets a message from scratchie bundle. Same as in JSP pages. @@ -330,7 +330,7 @@ * tool session ID * @return list of teachers that monitor the lesson which contains the tool with given session ID */ - public List getMonitorsByToolSessionId(Long sessionId); + List getMonitorsByToolSessionId(Long sessionId); /** * Returns whether activity is grouped and therefore it is expected more than one tool session. Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== diff -u -r8de4e6f48a6ad07b55ce8cc4a4eced6490838d0c -r9ecffbf5351e9dbf37af3b94a83f8450b314bf62 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 8de4e6f48a6ad07b55ce8cc4a4eced6490838d0c) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 9ecffbf5351e9dbf37af3b94a83f8450b314bf62) @@ -90,7 +90,6 @@ import org.lamsfoundation.lams.tool.scratchie.model.ScratchieItem; import org.lamsfoundation.lams.tool.scratchie.model.ScratchieSession; import org.lamsfoundation.lams.tool.scratchie.model.ScratchieUser; -import org.lamsfoundation.lams.tool.scratchie.util.ReflectDTOComparator; import org.lamsfoundation.lams.tool.scratchie.util.ScratchieAnswerComparator; import org.lamsfoundation.lams.tool.scratchie.util.ScratchieItemComparator; import org.lamsfoundation.lams.tool.scratchie.util.ScratchieToolContentHandler; @@ -734,34 +733,31 @@ } @Override - public Map> getReflectList(Long contentId, boolean setEntry) { - Map> map = new HashMap>(); + public List getReflectionList(Long contentId) { + + ArrayList reflections = new ArrayList(); List sessionList = scratchieSessionDao.getByContentId(contentId); for (ScratchieSession session : sessionList) { Long sessionId = session.getSessionId(); - boolean hasRefection = session.getScratchie().isReflectOnActivity(); - Set list = new TreeSet(new ReflectDTOComparator()); - // get all users in this session + List users = scratchieUserDao.getBySessionID(sessionId); + for (ScratchieUser user : users) { - ReflectDTO ref = new ReflectDTO(user); + NotebookEntry notebookEntry = getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL, + ScratchieConstants.TOOL_SIGNATURE, user.getUserId().intValue()); + if (notebookEntry != null) { + ReflectDTO reflectDTO = new ReflectDTO(notebookEntry.getUser()); + reflectDTO.setReflection(notebookEntry.getEntry()); + reflectDTO.setIsGroupLeader(user.isLeader()); - if (setEntry) { - NotebookEntry entry = getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL, - ScratchieConstants.TOOL_SIGNATURE, user.getUserId().intValue()); - if (entry != null) { - ref.setReflect(entry.getEntry()); - } + reflections.add(reflectDTO); } - - ref.setHasRefection(hasRefection); - list.add(ref); } - map.put(sessionId, list); + } - return map; + return reflections; } @Override