Index: lams_tool_task/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r8d57c651529651250826971a6f6013a4d21d4f52 -rbe42ba5063335619d4e04832ea235f96b82f0e53 --- lams_tool_task/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 8d57c651529651250826971a6f6013a4d21d4f52) +++ lams_tool_task/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision be42ba5063335619d4e04832ea235f96b82f0e53) @@ -107,6 +107,8 @@ label.monitoring.summary.overall.summary =Overall Summary label.monitoring.summary.user =User label.monitoring.summary.complete.activity =Complete Activity? +label.monitoring.summary.title.reflection =Reflection +label.monitoring.summary.reflection =Reflection label.monitoring.tasksummary.task.summary =Task Summary label.monitoring.tasksummary.task.required.to.finish =this task is required to finish this activity label.monitoring.tasksummary.parent.activity =Parent activity Index: lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r8d57c651529651250826971a6f6013a4d21d4f52 -rbe42ba5063335619d4e04832ea235f96b82f0e53 --- lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 8d57c651529651250826971a6f6013a4d21d4f52) +++ lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision be42ba5063335619d4e04832ea235f96b82f0e53) @@ -94,6 +94,8 @@ label.monitoring.summary.overall.summary =Overall Summary label.monitoring.summary.user =User label.monitoring.summary.complete.activity =Complete Activity? +label.monitoring.summary.title.reflection =Reflection +label.monitoring.summary.reflection =Reflection label.monitoring.tasksummary.task.summary =Task Summary label.monitoring.tasksummary.task.required.to.finish =this task is required to finish this activity label.monitoring.tasksummary.parent.activity =Parent activity Index: lams_tool_task/conf/language/rams/ApplicationResources.properties =================================================================== diff -u -r8d57c651529651250826971a6f6013a4d21d4f52 -rbe42ba5063335619d4e04832ea235f96b82f0e53 --- lams_tool_task/conf/language/rams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 8d57c651529651250826971a6f6013a4d21d4f52) +++ lams_tool_task/conf/language/rams/ApplicationResources.properties (.../ApplicationResources.properties) (revision be42ba5063335619d4e04832ea235f96b82f0e53) @@ -107,6 +107,8 @@ label.monitoring.summary.overall.summary =Overall Summary label.monitoring.summary.user =User label.monitoring.summary.complete.activity =Complete Activity? +label.monitoring.summary.title.reflection =Reflection +label.monitoring.summary.reflection =Reflection label.monitoring.tasksummary.task.summary =Task Summary label.monitoring.tasksummary.task.required.to.finish =this task is required to finish this activity label.monitoring.tasksummary.parent.activity =Parent activity Index: lams_tool_task/conf/language/rams/ApplicationResources_en_AU.properties =================================================================== diff -u -r8d57c651529651250826971a6f6013a4d21d4f52 -rbe42ba5063335619d4e04832ea235f96b82f0e53 --- lams_tool_task/conf/language/rams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 8d57c651529651250826971a6f6013a4d21d4f52) +++ lams_tool_task/conf/language/rams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision be42ba5063335619d4e04832ea235f96b82f0e53) @@ -107,6 +107,8 @@ label.monitoring.summary.overall.summary =Overall Summary label.monitoring.summary.user =User label.monitoring.summary.complete.activity =Complete Activity? +label.monitoring.summary.title.reflection =Reflection +label.monitoring.summary.reflection =Reflection label.monitoring.tasksummary.task.summary =Task Summary label.monitoring.tasksummary.task.required.to.finish =this task is required to finish this activity label.monitoring.tasksummary.parent.activity =Parent activity Index: lams_tool_task/conf/xdoclet/struts-actions.xml =================================================================== diff -u -r1ef27bf016b647ea0c2803d22f2bb4d4b3cde650 -rbe42ba5063335619d4e04832ea235f96b82f0e53 --- lams_tool_task/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision 1ef27bf016b647ea0c2803d22f2bb4d4b3cde650) +++ lams_tool_task/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision be42ba5063335619d4e04832ea235f96b82f0e53) @@ -276,6 +276,11 @@ + + + * *
  • session_id
    • - *
  • session_name
    • - *
  • TaskListItem.uid
    • - *
  • TaskListItem.create_by_author
    • - *
  • TaskListItem.is_hide
    • - *
  • TaskListItem.title
    • - *
  • User.login_name
    • - *
  • count(taskList_item_uid)
    • - * @author Steve.Ni + *
  • isMonitorVerificationRequired
    • + *
  • userNames
    • + *
  • taskListItems
    • + *
  • completeMap
    • + *
  • visitNumbers
    • * - * @version $Revision$ + * @author Andrey Balan */ public class Summary { @@ -58,11 +55,6 @@ /** * Contruction method for monitoring summary function. - * - * Don't set isInitGroup and viewNumber fields - * @param sessionName - * @param item - * @param isInitGroup */ public Summary(List taskListItems, List userNames, boolean[][] completeMap, int[] visitNumbers, boolean isMonitorVerificationRequired){ this.userNames = userNames; Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java =================================================================== diff -u -r721fa349b42e0b7e2ae19d60756fea47146bfdd4 -rbe42ba5063335619d4e04832ea235f96b82f0e53 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java (.../ITaskListService.java) (revision 721fa349b42e0b7e2ae19d60756fea47146bfdd4) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java (.../ITaskListService.java) (revision be42ba5063335619d4e04832ea235f96b82f0e53) @@ -313,15 +313,6 @@ */ public void updateEntry(NotebookEntry notebookEntry); - /** - * Get Reflect DTO list grouped by sessionID. - * - * @param contentId - * @return - */ - Map> getReflectList(Long contentId); - - //********** Export methods *********************** /** Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java =================================================================== diff -u -r46abbe5ec9077e67feccf43d71be330e5c2205e4 -rbe42ba5063335619d4e04832ea235f96b82f0e53 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision 46abbe5ec9077e67feccf43d71be330e5c2205e4) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision be42ba5063335619d4e04832ea235f96b82f0e53) @@ -700,30 +700,6 @@ coreNotebookService.updateEntry(notebookEntry); } - /** - * {@inheritDoc} - */ - public Map> getReflectList(Long contentId){ - Map> map = new HashMap>(); - - List sessionList = taskListSessionDao.getByContentId(contentId); - for(TaskListSession session:sessionList){ - Long sessionId = session.getSessionId(); - boolean hasRefection = session.getTaskList().isReflectOnActivity(); - Set list = new TreeSet(this.new ReflectDTOComparator()); - //get all users in this session - List users = taskListUserDao.getBySessionID(sessionId); - for(TaskListUser user : users){ - ReflectDTO ref = new ReflectDTO(user); - ref.setHasRefection(hasRefection); - list.add(ref); - } - map.put(sessionId, list); - } - - return map; - } - //***************************************************************************** // Set methods for Spring Bean //***************************************************************************** Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java =================================================================== diff -u -r6c72248f23c28bfb1413f1fba6aae48bc393d7b7 -rbe42ba5063335619d4e04832ea235f96b82f0e53 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 6c72248f23c28bfb1413f1fba6aae48bc393d7b7) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision be42ba5063335619d4e04832ea235f96b82f0e53) @@ -69,18 +69,18 @@ if (param.equals("summary")) { return summary(mapping, form, request, response); } - if (param.equals("summaryTask")) { return summaryTask(mapping, form, request, response); } - if(param.equals("setVerifiedByMonitor")){ return setVerifiedByMonitor(mapping, form, request, response); } - if (param.equals("listuser")) { return listuser(mapping, form, request, response); } + if (param.equals("viewReflection")) { + return viewReflection(mapping, form, request, response); + } return mapping.findForward(TaskListConstants.ERROR); } @@ -166,6 +166,33 @@ request.setAttribute(TaskListConstants.ATTR_USER_LIST, list); return mapping.findForward(TaskListConstants.SUCCESS); } + + private ActionForward viewReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { + + Long uid = WebUtil.readLongParam(request, TaskListConstants.ATTR_USER_UID); + + ITaskListService service = getTaskListService(); + 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.setReflectInstrctions(session.getTaskList().getReflectInstructions()); + + request.setAttribute("userDTO", refDTO); + return mapping.findForward("success"); + } // ************************************************************************************* // Private method Index: lams_tool_task/web/pages/export/reflection.jsp =================================================================== diff -u --- lams_tool_task/web/pages/export/reflection.jsp (revision 0) +++ lams_tool_task/web/pages/export/reflection.jsp (revision be42ba5063335619d4e04832ea235f96b82f0e53) @@ -0,0 +1,38 @@ +<%-- Reflection list --%> + + + + + + + + + + + + + + + + + + + + +
    +

    +
    + + + +
    + ${user.loginName} + + + + + + + +
    +     \ No newline at end of file Index: lams_tool_task/web/pages/learning/learning.jsp =================================================================== diff -u -r8d57c651529651250826971a6f6013a4d21d4f52 -rbe42ba5063335619d4e04832ea235f96b82f0e53 --- lams_tool_task/web/pages/learning/learning.jsp (.../learning.jsp) (revision 8d57c651529651250826971a6f6013a4d21d4f52) +++ lams_tool_task/web/pages/learning/learning.jsp (.../learning.jsp) (revision be42ba5063335619d4e04832ea235f96b82f0e53) @@ -237,9 +237,8 @@ - - + + Index: lams_tool_task/web/pages/monitoring/summary.jsp =================================================================== diff -u -ra370ee2f7fe049337ac7b342e0218bdde3f3ee68 -rbe42ba5063335619d4e04832ea235f96b82f0e53 --- lams_tool_task/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision a370ee2f7fe049337ac7b342e0218bdde3f3ee68) +++ lams_tool_task/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision be42ba5063335619d4e04832ea235f96b82f0e53) @@ -17,9 +17,11 @@ -

    - -

    + + + -
    +

    +
    @@ -80,6 +82,47 @@
    + + +<%-- Reflection list --%> + + + + + + + + + + + + + + + + + + + + +
    +

    +
    + + + +
    + ${user.loginName} + + + + + + + +
    +     + +