Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java
===================================================================
diff -u -ra3077b21311eada2fc8f2a67ce86e3326e0e367a -rf385194bf2584414427c60c9f0fe6c7ca5993bc6
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java (.../LearningAction.java) (revision a3077b21311eada2fc8f2a67ce86e3326e0e367a)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java (.../LearningAction.java) (revision f385194bf2584414427c60c9f0fe6c7ca5993bc6)
@@ -298,6 +298,19 @@
taskList.setMinimumNumberTasksErrorStr(MinimumNumberTasksStr);
}
+ //basic information
+ sessionMap.put(TaskListConstants.ATTR_TITLE, taskList.getTitle());
+ sessionMap.put(TaskListConstants.ATTR_FINISH_LOCK, lock);
+ sessionMap.put(TaskListConstants.ATTR_USER_FINISHED, taskListUser !=null && taskListUser.isSessionFinished());
+ sessionMap.put(TaskListConstants.ATTR_USER_VERIFIED_BY_MONITOR, taskListUser.isVerifiedByMonitor());
+ sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
+ sessionMap.put(AttributeNames.ATTR_MODE, mode);
+ sessionMap.put(TaskListConstants.ATTR_TASK_LIST_ITEM_DTOS, itemDTOs);
+ //reflection information
+ sessionMap.put(TaskListConstants.ATTR_REFLECTION_ON, taskList.isReflectOnActivity());
+ sessionMap.put(TaskListConstants.ATTR_REFLECTION_INSTRUCTION, taskList.getReflectInstructions());
+ sessionMap.put(TaskListConstants.ATTR_REFLECTION_ENTRY, entryText);
+
//add define later support
if(taskList.isDefineLater()){
return mapping.findForward("defineLater");
@@ -317,20 +330,6 @@
sessionMap.put(TaskListConstants.ATTR_RESOURCE,taskList);
- //basic information
- sessionMap.put(TaskListConstants.ATTR_TITLE, taskList.getTitle());
- sessionMap.put(TaskListConstants.ATTR_FINISH_LOCK, lock);
- sessionMap.put(TaskListConstants.ATTR_USER_FINISHED, taskListUser !=null && taskListUser.isSessionFinished());
- sessionMap.put(TaskListConstants.ATTR_USER_VERIFIED_BY_MONITOR, taskListUser.isVerifiedByMonitor());
- sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
- sessionMap.put(AttributeNames.ATTR_MODE, mode);
- sessionMap.put(TaskListConstants.ATTR_TASK_LIST_ITEM_DTOS, itemDTOs);
-
- //reflection information
- sessionMap.put(TaskListConstants.ATTR_REFLECTION_ON, taskList.isReflectOnActivity());
- sessionMap.put(TaskListConstants.ATTR_REFLECTION_INSTRUCTION, taskList.getReflectInstructions());
- sessionMap.put(TaskListConstants.ATTR_REFLECTION_ENTRY, entryText);
-
return mapping.findForward(TaskListConstants.SUCCESS);
}
Index: lams_tool_task/web/pages/export/exportportfolio.jsp
===================================================================
diff -u -reb556ddb82142fad802b26f79504f90d507f4fb3 -rf385194bf2584414427c60c9f0fe6c7ca5993bc6
--- lams_tool_task/web/pages/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision eb556ddb82142fad802b26f79504f90d507f4fb3)
+++ lams_tool_task/web/pages/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision f385194bf2584414427c60c9f0fe6c7ca5993bc6)
@@ -13,24 +13,14 @@