Index: lams_tool_task/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r2cefe12c8a8c520572f32ccbb784acf55b76a6fd -r39444d1719a438cb33f7201ba98d4b3292ee9fc2 --- lams_tool_task/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 2cefe12c8a8c520572f32ccbb784acf55b76a6fd) +++ lams_tool_task/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 39444d1719a438cb33f7201ba98d4b3292ee9fc2) @@ -132,6 +132,7 @@ label.monitoring.instructions.attachments =Attachments message.monitoring.edit.activity.not.editable =This Activity is no longer editable export.title =Export portfolio of Task List +label.export.reflection =Notebook Entries label.download =Download label.view =View label.edit =Edit Index: lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r2cefe12c8a8c520572f32ccbb784acf55b76a6fd -r39444d1719a438cb33f7201ba98d4b3292ee9fc2 --- lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 2cefe12c8a8c520572f32ccbb784acf55b76a6fd) +++ lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 39444d1719a438cb33f7201ba98d4b3292ee9fc2) @@ -121,6 +121,7 @@ message.monitoring.summary.no.session =No Session Available message.monitoring.summary.no.resource.for.group =No resource available for this group. export.title =Export portfolio of Task List +label.export.reflection =Notebook Entries label.download =Download label.view =View label.edit =Edit Index: lams_tool_task/conf/language/rams/ApplicationResources.properties =================================================================== diff -u -r2cefe12c8a8c520572f32ccbb784acf55b76a6fd -r39444d1719a438cb33f7201ba98d4b3292ee9fc2 --- lams_tool_task/conf/language/rams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 2cefe12c8a8c520572f32ccbb784acf55b76a6fd) +++ lams_tool_task/conf/language/rams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 39444d1719a438cb33f7201ba98d4b3292ee9fc2) @@ -132,6 +132,7 @@ label.monitoring.instructions.attachments =Attachments message.monitoring.edit.activity.not.editable =This Activity is no longer editable export.title =Export portfolio of Task List +label.export.reflection =Notebook Entries label.download =Download label.view =View label.edit =Edit Index: lams_tool_task/conf/language/rams/ApplicationResources_en_AU.properties =================================================================== diff -u -r2cefe12c8a8c520572f32ccbb784acf55b76a6fd -r39444d1719a438cb33f7201ba98d4b3292ee9fc2 --- lams_tool_task/conf/language/rams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 2cefe12c8a8c520572f32ccbb784acf55b76a6fd) +++ lams_tool_task/conf/language/rams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 39444d1719a438cb33f7201ba98d4b3292ee9fc2) @@ -132,6 +132,7 @@ label.monitoring.instructions.attachments =Attachments message.monitoring.edit.activity.not.editable =This Activity is no longer editable export.title =Export portfolio of Task List +label.export.reflection =Notebook Entries label.download =Download label.view =View label.edit =Edit Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/ItemSummary.java =================================================================== diff -u -reb556ddb82142fad802b26f79504f90d507f4fb3 -r39444d1719a438cb33f7201ba98d4b3292ee9fc2 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/ItemSummary.java (.../ItemSummary.java) (revision eb556ddb82142fad802b26f79504f90d507f4fb3) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/ItemSummary.java (.../ItemSummary.java) (revision 39444d1719a438cb33f7201ba98d4b3292ee9fc2) @@ -47,6 +47,9 @@ private List comments; private List attachments; + //using only during export + private ReflectDTO reflectDTO; + public ItemSummary() { comments = new ArrayList(); attachments = new ArrayList(); @@ -141,5 +144,22 @@ this.attachments = attachments; } + /** + * Returns ReflectDTO. + * + * @return ReflectDTO + */ + public ReflectDTO getReflectDTO() { + return reflectDTO; + } + /** + * Sets ReflectDTO. + * + * @param reflectDTO ReflectDTO + */ + public void setReflectDTO(ReflectDTO reflectDTO) { + this.reflectDTO = reflectDTO; + } + } \ No newline at end of file Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java =================================================================== diff -u -rac170eba5ee70135e473b3a5525d1743d0098bc8 -r39444d1719a438cb33f7201ba98d4b3292ee9fc2 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java (.../ITaskListService.java) (revision ac170eba5ee70135e473b3a5525d1743d0098bc8) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java (.../ITaskListService.java) (revision 39444d1719a438cb33f7201ba98d4b3292ee9fc2) @@ -355,9 +355,10 @@ * * @param contentId toolContenId * @param taskListItemUid specified TaskListItem uid + * @param isExportProcessing true if this method called for export, false otherwise * @return */ - List getItemSummary(Long contentId, Long taskListItemUid); + List getItemSummary(Long contentId, Long taskListItemUid, boolean isExportProcessing); } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java =================================================================== diff -u -rac170eba5ee70135e473b3a5525d1743d0098bc8 -r39444d1719a438cb33f7201ba98d4b3292ee9fc2 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision ac170eba5ee70135e473b3a5525d1743d0098bc8) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision 39444d1719a438cb33f7201ba98d4b3292ee9fc2) @@ -62,6 +62,7 @@ import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; import org.lamsfoundation.lams.notebook.model.NotebookEntry; +import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.tool.ToolContentImport102Manager; import org.lamsfoundation.lams.tool.ToolContentManager; @@ -467,7 +468,7 @@ /** * {@inheritDoc} */ - public List getItemSummary(Long contentId, Long taskListItemUid) { + public List getItemSummary(Long contentId, Long taskListItemUid, boolean isExportProcessing) { TaskListItem taskListItem = taskListItemDao.getByUid(taskListItemUid); @@ -507,6 +508,25 @@ userItemSummary.setCompleted(false); } + //if we're doing export then fill up all the itemSummaries with reflection information + if (isExportProcessing) { + + NotebookEntry notebookEntry = getEntry(session.getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, + TaskListConstants.TOOL_SIGNATURE, user.getUserId().intValue()); + + ReflectDTO reflectDTO = new ReflectDTO(user); + if(notebookEntry == null){ + reflectDTO.setFinishReflection(false); + reflectDTO.setReflect(null); + }else{ + reflectDTO.setFinishReflection(true); + reflectDTO.setReflect(notebookEntry.getEntry()); + } + reflectDTO.setReflectInstructions(session.getTaskList().getReflectInstructions()); + + userItemSummary.setReflectDTO(reflectDTO); + } + groupSummary.getItemSummaries().add(userItemSummary); } groupSummaries.add(groupSummary); @@ -536,7 +556,7 @@ List> taskSummaries = new ArrayList>(); for(TaskListItem item:itemList) { - taskSummaries.add(getItemSummary(contentId, item.getUid())); + taskSummaries.add(getItemSummary(contentId, item.getUid(), true)); } return taskSummaries; @@ -564,7 +584,7 @@ List> eachItemOverallSummaries = new ArrayList>(); for(TaskListItem item:itemList) { - eachItemOverallSummaries.add(getItemSummary(contentId, item.getUid())); + eachItemOverallSummaries.add(getItemSummary(contentId, item.getUid(), true)); } //get rid of information that doesn't belong to the current user Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java =================================================================== diff -u -r5d4c7c430b9dd0fc2247d9e5fa5babbac5fb4571 -r39444d1719a438cb33f7201ba98d4b3292ee9fc2 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 5d4c7c430b9dd0fc2247d9e5fa5babbac5fb4571) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 39444d1719a438cb33f7201ba98d4b3292ee9fc2) @@ -80,20 +80,17 @@ } private ActionForward summary(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { - ITaskListService service = getTaskListService(); - Long contentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); - request.setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID, contentId); - //initial Session Map SessionMap sessionMap = new SessionMap(); request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap); + request.setAttribute(TaskListConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); - //save contentFolderID into session - sessionMap.put(AttributeNames.PARAM_CONTENT_FOLDER_ID,WebUtil.readStrParam(request,AttributeNames.PARAM_CONTENT_FOLDER_ID)); - request.setAttribute("initialTabId",WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB,true)); + Long contentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); + request.setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID, contentId); + ITaskListService service = getTaskListService(); TaskList taskList = service.getTaskListByContentId(contentId); taskList.toDTO(); @@ -104,6 +101,7 @@ sessionMap.put(TaskListConstants.PAGE_EDITABLE, taskList.isContentInUse()); sessionMap.put(TaskListConstants.ATTR_RESOURCE, taskList); sessionMap.put(TaskListConstants.ATTR_TOOL_CONTENT_ID, contentId); + sessionMap.put(AttributeNames.PARAM_CONTENT_FOLDER_ID,WebUtil.readStrParam(request,AttributeNames.PARAM_CONTENT_FOLDER_ID)); return mapping.findForward(TaskListConstants.SUCCESS); } @@ -115,7 +113,7 @@ Long taskListItemId = WebUtil.readLongParam(request, TaskListConstants.ATTR_TASK_LIST_ITEM_UID); request.setAttribute(TaskListConstants.ATTR_TASK_LIST_ITEM, service.getTaskListItemByUid(taskListItemId)); - List groupSummaryList = service.getItemSummary(contentId, taskListItemId); + List groupSummaryList = service.getItemSummary(contentId, taskListItemId, false); request.setAttribute(TaskListConstants.ATTR_GROUP_SUMMARY_LIST, groupSummaryList); return mapping.findForward(TaskListConstants.SUCCESS); Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/servlet/ExportServlet.java =================================================================== diff -u -r5d4c7c430b9dd0fc2247d9e5fa5babbac5fb4571 -r39444d1719a438cb33f7201ba98d4b3292ee9fc2 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/servlet/ExportServlet.java (.../ExportServlet.java) (revision 5d4c7c430b9dd0fc2247d9e5fa5babbac5fb4571) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/servlet/ExportServlet.java (.../ExportServlet.java) (revision 39444d1719a438cb33f7201ba98d4b3292ee9fc2) @@ -178,6 +178,7 @@ sessionMap.put(TaskListConstants.ATTR_TITLE, content.getTitle()); sessionMap.put(TaskListConstants.ATTR_ITEM_SUMMARY_LIST, itemSummaries); + sessionMap.put(TaskListConstants.ATTR_REFLECTION_ON, content.isReflectOnActivity()); } /** @@ -218,6 +219,7 @@ // put it into HTTPSession sessionMap.put(TaskListConstants.ATTR_TITLE, content.getTitle()); sessionMap.put(TaskListConstants.ATTR_ITEM_SUMMARY_LIST, itemSummaries); + sessionMap.put(TaskListConstants.ATTR_REFLECTION_ON, content.isReflectOnActivity()); } /** @@ -271,31 +273,5 @@ } return handler; } - - private ActionForward viewReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { - - Long uid = WebUtil.readLongParam(request, TaskListConstants.ATTR_USER_UID); - - ITaskListService service = TaskListServiceProxy.getTaskListService(getServletContext()); - TaskListUser user = service.getUser(uid); - Long sessionID = user.getSession().getSessionId(); - NotebookEntry notebookEntry = service.getEntry(sessionID, - CoreNotebookConstants.NOTEBOOK_TOOL, - TaskListConstants.TOOL_SIGNATURE, user.getUserId().intValue()); - - TaskListSession session = service.getTaskListSessionBySessionId(sessionID); - - ReflectDTO refDTO = new ReflectDTO(user); - if(notebookEntry == null){ - refDTO.setFinishReflection(false); - refDTO.setReflect(null); - }else{ - refDTO.setFinishReflection(true); - refDTO.setReflect(notebookEntry.getEntry()); - } - refDTO.setReflectInstructions(session.getTaskList().getReflectInstructions()); - - request.setAttribute("userDTO", refDTO); - return mapping.findForward("success"); - } + } Index: lams_tool_task/web/pages/export/itemsummary.jsp =================================================================== diff -u -rac170eba5ee70135e473b3a5525d1743d0098bc8 -r39444d1719a438cb33f7201ba98d4b3292ee9fc2 --- lams_tool_task/web/pages/export/itemsummary.jsp (.../itemsummary.jsp) (revision ac170eba5ee70135e473b3a5525d1743d0098bc8) +++ lams_tool_task/web/pages/export/itemsummary.jsp (.../itemsummary.jsp) (revision 39444d1719a438cb33f7201ba98d4b3292ee9fc2) @@ -1,143 +1,148 @@ - + -
-

- -

+
+

+ +

- - () - -
-
+ + () + +
+
- -
    - -
  • - (: ${item.parentTaskName}) -
  • -
    + +
      + +
    • + (: ${item.parentTaskName}) +
    • +
      - -
    • - -
    • -
      + +
    • + +
    • +
      - -
        -
      • - -
      • -
      -
      + +
        +
      • + +
      • +
      +
      - -
    • - -
    • -
      + +
    • + +
    • +
      - -
        -
      • - -
      • -
      -
      -
    -
    -
    -
    + +
      +
    • + +
    • +
    +
    +
+
+
+
- -

${groupSummary.sessionName}

+ +

${groupSummary.sessionName}

- - - - - - +
- - - ? - - -
+ + + + - - - - + + + + - - + - - + + - + + + + + - + - - + - - - - - - - + - - -
+ + + ? + + + - -
+ +
- ${itemSummary.user.loginName} -
+ ${itemSummary.user.loginName} + - - - - + + + + + - - - - - - - + + - -
    - -
  • - -
  • -
    + +
+
    + +
  • + +
  • +
    - -
  • - - - - - - -
  • -
    - -
+ +
  • + + + + +
  • +
    + +
    -

    + + + <%-- Display reflection entries --%> + +

    + +

    + + + +

    + ${reflectDTO.fullName} +

    + +
    +
    + +

    +
    Fisheye: Tag 39444d1719a438cb33f7201ba98d4b3292ee9fc2 refers to a dead (removed) revision in file `lams_tool_task/web/pages/export/reflection.jsp'. Fisheye: No comparison available. Pass `N' to diff?