Index: lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.11 -r1.12 --- lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties 14 Dec 2012 15:59:51 -0000 1.11 +++ lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties 16 Dec 2012 08:46:41 -0000 1.12 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/conf/xdoclet/struts-actions.xml,v diff -u -r1.8 -r1.9 --- lams_tool_scratchie/conf/xdoclet/struts-actions.xml 14 Dec 2012 15:59:51 -0000 1.8 +++ lams_tool_scratchie/conf/xdoclet/struts-actions.xml 16 Dec 2012 08:46:40 -0000 1.9 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java,v diff -u -r1.7 -r1.8 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java 16 Oct 2012 13:56:20 -0000 1.7 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java 16 Dec 2012 08:46:40 -0000 1.8 @@ -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/dao/ScratchieAnswerVisitDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java,v diff -u -r1.6 -r1.7 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java 16 Oct 2012 13:56:20 -0000 1.6 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java 16 Dec 2012 08:46:41 -0000 1.7 @@ -24,7 +24,6 @@ package org.lamsfoundation.lams.tool.scratchie.dao; import java.util.List; -import java.util.Map; import org.lamsfoundation.lams.tool.scratchie.model.ScratchieAnswerVisitLog; Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java,v diff -u -r1.6 -r1.7 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java 16 Oct 2012 13:56:21 -0000 1.6 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java 16 Dec 2012 08:46:41 -0000 1.7 @@ -23,15 +23,10 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.scratchie.dao.hibernate; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.lamsfoundation.lams.tool.scratchie.dao.ScratchieAnswerVisitDAO; -import org.lamsfoundation.lams.tool.scratchie.model.Scratchie; import org.lamsfoundation.lams.tool.scratchie.model.ScratchieAnswerVisitLog; -import org.lamsfoundation.lams.tool.scratchie.model.ScratchieItem; -import org.lamsfoundation.lams.tool.scratchie.model.ScratchieSession; public class ScratchieAnswerVisitDAOHibernate extends BaseDAOHibernate implements ScratchieAnswerVisitDAO { Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/ReflectDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/ReflectDTO.java,v diff -u -r1.1 -r1.2 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/ReflectDTO.java 19 Jul 2012 19:20:09 -0000 1.1 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/ReflectDTO.java 16 Dec 2012 08:46:41 -0000 1.2 @@ -1,79 +1,42 @@ package org.lamsfoundation.lams.tool.scratchie.dto; -import org.lamsfoundation.lams.tool.scratchie.model.ScratchieUser; +import org.lamsfoundation.lams.usermanagement.User; /** * * @author Andrey Balan */ public class ReflectDTO { - private Long userUid; private String fullName; - private String loginName; - private boolean hasRefection; - private String reflectInstrctions; - private boolean finishReflection; - private String reflect; + private boolean isGroupLeader; + + private String reflection; - public ReflectDTO(ScratchieUser user) { - this.setLoginName(user.getLoginName()); + public ReflectDTO(User user) { this.setFullName(user.getFirstName() + " " + user.getLastName()); - this.setUserUid(user.getUid()); } - public boolean isFinishReflection() { - return finishReflection; - } - - public void setFinishReflection(boolean finishReflection) { - this.finishReflection = finishReflection; - } - public String getFullName() { return fullName; } public void setFullName(String fullName) { this.fullName = fullName; } - - public boolean isHasRefection() { - return hasRefection; + + public boolean isGroupLeader() { + return isGroupLeader; } - public void setHasRefection(boolean hasRefection) { - this.hasRefection = hasRefection; + public void setIsGroupLeader(boolean isGroupLeader) { + this.isGroupLeader = isGroupLeader; } - - public String getLoginName() { - return loginName; + + public String getReflection() { + return reflection; } - public void setLoginName(String loginName) { - this.loginName = loginName; + public void setReflection(String reflection) { + this.reflection = reflection; } - - public String getReflect() { - return reflect; - } - - public void setReflect(String reflect) { - this.reflect = reflect; - } - - public String getReflectInstrctions() { - return reflectInstrctions; - } - - public void setReflectInstrctions(String reflectInstrctions) { - this.reflectInstrctions = reflectInstrctions; - } - - public Long getUserUid() { - return userUid; - } - - public void setUserUid(Long userUid) { - this.userUid = userUid; - } } Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java,v diff -u -r1.4 -r1.5 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java 3 Oct 2012 13:07:44 -0000 1.4 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java 16 Dec 2012 08:46:41 -0000 1.5 @@ -23,8 +23,6 @@ /* $Id$ */ package org.lamsfoundation.lams.tool.scratchie.model; -import java.util.Date; - import org.apache.log4j.Logger; /** Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java,v diff -u -r1.4 -r1.5 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java 16 Oct 2012 13:56:21 -0000 1.4 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java 16 Dec 2012 08:46:41 -0000 1.5 @@ -26,7 +26,6 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; /** Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java,v diff -u -r1.10 -r1.11 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java 14 Dec 2012 15:59:51 -0000 1.10 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java 16 Dec 2012 08:46:40 -0000 1.11 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java,v diff -u -r1.13 -r1.14 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java 14 Dec 2012 15:59:51 -0000 1.13 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java 16 Dec 2012 08:46:40 -0000 1.14 @@ -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 Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/util/ReflectDTOComparator.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java,v diff -u -r1.6 -r1.7 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java 14 Dec 2012 15:59:51 -0000 1.6 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java 16 Dec 2012 08:46:41 -0000 1.7 @@ -27,6 +27,7 @@ import java.io.IOException; import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; import java.util.Set; import javax.servlet.ServletException; @@ -80,9 +81,6 @@ if (param.equals("saveLeaders")) { return saveLeaders(mapping, form, request, response); } - if (param.equals("viewReflection")) { - return viewReflection(mapping, form, request, response); - } if (param.equals("exportExcel")) { return exportExcel(mapping, form, request, response); } @@ -115,7 +113,15 @@ sessionMap.put(ScratchieConstants.ATTR_TOOL_CONTENT_ID, contentId); sessionMap.put(AttributeNames.PARAM_CONTENT_FOLDER_ID, WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID)); + sessionMap.put(ScratchieConstants.ATTR_REFLECTION_ON, scratchie.isReflectOnActivity()); + // Create reflectList if reflection is enabled. + if (scratchie.isReflectOnActivity()) { + + List reflections = service.getReflectionList(contentId); + sessionMap.put(ScratchieConstants.ATTR_REFLECTIONS, reflections); + } + return mapping.findForward(ScratchieConstants.SUCCESS); } @@ -192,17 +198,6 @@ ScratchieSession session = service.getScratchieSessionBySessionId(sessionID); - ReflectDTO refDTO = new ReflectDTO(user); - if (notebookEntry == null) { - refDTO.setFinishReflection(false); - refDTO.setReflect(null); - } else { - refDTO.setFinishReflection(true); - refDTO.setReflect(notebookEntry.getEntry()); - } - refDTO.setReflectInstrctions(session.getScratchie().getReflectInstructions()); - - request.setAttribute("userDTO", refDTO); return mapping.findForward("success"); } Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieItemForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieItemForm.java,v diff -u -r1.1 -r1.2 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieItemForm.java 9 Aug 2012 21:55:37 -0000 1.1 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieItemForm.java 16 Dec 2012 08:46:41 -0000 1.2 @@ -23,14 +23,7 @@ /* $Id$ */ package org.lamsfoundation.lams.tool.scratchie.web.form; -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.upload.FormFile; -import org.lamsfoundation.lams.tool.scratchie.model.Scratchie; /** * Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/ExportServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/ExportServlet.java,v diff -u -r1.2 -r1.3 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/ExportServlet.java 9 Aug 2012 21:55:37 -0000 1.2 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/ExportServlet.java 16 Dec 2012 08:46:41 -0000 1.3 @@ -28,7 +28,6 @@ import java.util.Collection; import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Set; import java.util.TreeSet; @@ -39,28 +38,22 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.scratchie.ScratchieConstants; import org.lamsfoundation.lams.tool.scratchie.dto.GroupSummary; -import org.lamsfoundation.lams.tool.scratchie.dto.ReflectDTO; import org.lamsfoundation.lams.tool.scratchie.model.Scratchie; 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.service.IScratchieService; import org.lamsfoundation.lams.tool.scratchie.service.ScratchieApplicationException; import org.lamsfoundation.lams.tool.scratchie.service.ScratchieServiceProxy; -import org.lamsfoundation.lams.tool.scratchie.util.ReflectDTOComparator; import org.lamsfoundation.lams.tool.scratchie.util.ScratchieBundler; import org.lamsfoundation.lams.tool.scratchie.util.ScratchieItemComparator; import org.lamsfoundation.lams.tool.scratchie.util.ScratchieToolContentHandler; import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet; import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.SessionMap; -import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.context.support.WebApplicationContextUtils; /** * Export portfolio servlet to export all scratchie into offline HTML package. @@ -179,19 +172,6 @@ // Add flag to indicate whether to render user notebook entries sessionMap.put(ScratchieConstants.ATTR_REFLECTION_ON, content.isReflectOnActivity()); sessionMap.put(ScratchieConstants.ATTR_SCRATCHIE, content); - - // Create reflectList if reflection is enabled. - if (content.isReflectOnActivity()) { - // Create reflectList, need to follow same structure used in teacher - // see service.getReflectList(); - Map> map = new HashMap>(); - Set reflectDTOSet = new TreeSet(new ReflectDTOComparator()); - reflectDTOSet.add(getReflectionEntry(learner)); - map.put(toolSessionID, reflectDTOSet); - - // Add reflectList to sessionMap - sessionMap.put(ScratchieConstants.ATTR_REFLECT_LIST, map); - } } public void teacher(HttpServletRequest request, HttpServletResponse response, String directoryName, @@ -223,38 +203,5 @@ sessionMap.put(ScratchieConstants.PAGE_EDITABLE, content.isContentInUse()); sessionMap.put(ScratchieConstants.ATTR_SCRATCHIE, content); sessionMap.put(ScratchieConstants.ATTR_TOOL_CONTENT_ID, toolContentID); - - // Add flag to indicate whether to render user notebook entries - sessionMap.put(ScratchieConstants.ATTR_REFLECTION_ON, content.isReflectOnActivity()); - - // Create reflectList if reflection is enabled. - if (content.isReflectOnActivity()) { - Map> reflectList = service.getReflectList(content.getContentId(), true); - // Add reflectList to sessionMap - sessionMap.put(ScratchieConstants.ATTR_REFLECT_LIST, reflectList); - } } - - private ScratchieToolContentHandler getToolContentHandler() { - if (handler == null) { - WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(this - .getServletContext()); - handler = (ScratchieToolContentHandler) wac.getBean(ScratchieConstants.TOOL_CONTENT_HANDLER_NAME); - } - return handler; - } - - private ReflectDTO getReflectionEntry(ScratchieUser scratchieUser) { - ReflectDTO reflectDTO = new ReflectDTO(scratchieUser); - NotebookEntry notebookEntry = service.getEntry(scratchieUser.getSession().getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, ScratchieConstants.TOOL_SIGNATURE, scratchieUser.getUserId() - .intValue()); - - // check notebookEntry is not null - if (notebookEntry != null) { - reflectDTO.setReflect(notebookEntry.getEntry()); - logger.debug("Could not find notebookEntry for ScratchieUser: " + scratchieUser.getUid()); - } - return reflectDTO; - } } 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.4 -r1.5 --- lams_tool_scratchie/web/pages/monitoring/summary.jsp 14 Dec 2012 15:59:51 -0000 1.4 +++ lams_tool_scratchie/web/pages/monitoring/summary.jsp 16 Dec 2012 08:46:41 -0000 1.5 @@ -7,6 +7,7 @@