Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java =================================================================== diff -u -rbc65717cc947dfd5b941ab4ac8f31a59c8f68bf4 -r6b651e7c25c7baa6a942ea7348f59701bbb4e603 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java (.../ScratchieAnswerVisitDAO.java) (revision bc65717cc947dfd5b941ab4ac8f31a59c8f68bf4) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java (.../ScratchieAnswerVisitDAO.java) (revision 6b651e7c25c7baa6a942ea7348f59701bbb4e603) @@ -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 =================================================================== diff -u -rbc65717cc947dfd5b941ab4ac8f31a59c8f68bf4 -r6b651e7c25c7baa6a942ea7348f59701bbb4e603 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java (.../ScratchieAnswerVisitDAOHibernate.java) (revision bc65717cc947dfd5b941ab4ac8f31a59c8f68bf4) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java (.../ScratchieAnswerVisitDAOHibernate.java) (revision 6b651e7c25c7baa6a942ea7348f59701bbb4e603) @@ -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 =================================================================== diff -u -r6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18 -r6b651e7c25c7baa6a942ea7348f59701bbb4e603 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/ReflectDTO.java (.../ReflectDTO.java) (revision 6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/ReflectDTO.java (.../ReflectDTO.java) (revision 6b651e7c25c7baa6a942ea7348f59701bbb4e603) @@ -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 =================================================================== diff -u -r99545d1824fcf0b2ea23a6bdce46aab3b288bff5 -r6b651e7c25c7baa6a942ea7348f59701bbb4e603 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java (.../ScratchieAnswer.java) (revision 99545d1824fcf0b2ea23a6bdce46aab3b288bff5) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java (.../ScratchieAnswer.java) (revision 6b651e7c25c7baa6a942ea7348f59701bbb4e603) @@ -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 =================================================================== diff -u -rbc65717cc947dfd5b941ab4ac8f31a59c8f68bf4 -r6b651e7c25c7baa6a942ea7348f59701bbb4e603 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java (.../ScratchieUser.java) (revision bc65717cc947dfd5b941ab4ac8f31a59c8f68bf4) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java (.../ScratchieUser.java) (revision 6b651e7c25c7baa6a942ea7348f59701bbb4e603) @@ -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/ScratchieServiceImpl.java =================================================================== diff -u -r9ecffbf5351e9dbf37af3b94a83f8450b314bf62 -r6b651e7c25c7baa6a942ea7348f59701bbb4e603 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 9ecffbf5351e9dbf37af3b94a83f8450b314bf62) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 6b651e7c25c7baa6a942ea7348f59701bbb4e603) @@ -746,7 +746,7 @@ for (ScratchieUser user : users) { NotebookEntry notebookEntry = getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL, ScratchieConstants.TOOL_SIGNATURE, user.getUserId().intValue()); - if (notebookEntry != null) { + if ((notebookEntry != null) && StringUtils.isNotBlank(notebookEntry.getEntry())) { ReflectDTO reflectDTO = new ReflectDTO(notebookEntry.getUser()); reflectDTO.setReflection(notebookEntry.getEntry()); reflectDTO.setIsGroupLeader(user.isLeader()); Fisheye: Tag 6b651e7c25c7baa6a942ea7348f59701bbb4e603 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 =================================================================== diff -u -r8de4e6f48a6ad07b55ce8cc4a4eced6490838d0c -r6b651e7c25c7baa6a942ea7348f59701bbb4e603 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 8de4e6f48a6ad07b55ce8cc4a4eced6490838d0c) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 6b651e7c25c7baa6a942ea7348f59701bbb4e603) @@ -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 =================================================================== diff -u -r0ef117e7eca05b962210cb3b18eab1e39a6c57d1 -r6b651e7c25c7baa6a942ea7348f59701bbb4e603 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieItemForm.java (.../ScratchieItemForm.java) (revision 0ef117e7eca05b962210cb3b18eab1e39a6c57d1) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieItemForm.java (.../ScratchieItemForm.java) (revision 6b651e7c25c7baa6a942ea7348f59701bbb4e603) @@ -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 =================================================================== diff -u -r0ef117e7eca05b962210cb3b18eab1e39a6c57d1 -r6b651e7c25c7baa6a942ea7348f59701bbb4e603 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/ExportServlet.java (.../ExportServlet.java) (revision 0ef117e7eca05b962210cb3b18eab1e39a6c57d1) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/ExportServlet.java (.../ExportServlet.java) (revision 6b651e7c25c7baa6a942ea7348f59701bbb4e603) @@ -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 =================================================================== diff -u -r8de4e6f48a6ad07b55ce8cc4a4eced6490838d0c -r6b651e7c25c7baa6a942ea7348f59701bbb4e603 --- lams_tool_scratchie/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 8de4e6f48a6ad07b55ce8cc4a4eced6490838d0c) +++ lams_tool_scratchie/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 6b651e7c25c7baa6a942ea7348f59701bbb4e603) @@ -7,6 +7,7 @@