Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -raff1ef425c76fe6a2051694c0fdf833265459710 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java (.../TaskListConstants.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java (.../TaskListConstants.java) (revision aff1ef425c76fe6a2051694c0fdf833265459710) @@ -50,7 +50,6 @@ public static final String ATTR_DELETED_TASKLIST_ITEM_LIST = "deleteTaskListList"; public static final String ATTR_DELETED_CONDITION_LIST = "deleteConditionList"; public static final String ATTR_TASKLIST = "taskList"; - public static final String ATTR_RUN_AUTO = "runAuto"; public static final String ATTR_ITEM_UID = "itemUid"; public static final String ATTR_NEXT_ACTIVITY_URL = "nextActivityUrl"; public static final String ATTR_MONITOR_VERIFICATION_REQUIRED = "monitorVerificationRequired"; Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/TasListItemDTO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raff1ef425c76fe6a2051694c0fdf833265459710 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/TasListItemDTO.java (.../TasListItemDTO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/TasListItemDTO.java (.../TasListItemDTO.java) (revision aff1ef425c76fe6a2051694c0fdf833265459710) @@ -47,14 +47,14 @@ private boolean isDisplayedOpen; //Set of comments posted by the members of the group to which user belong to - private Set comments; + private Set comments; //Set of files uploaded by the members of the group to which user belong to - private Set attachments; + private Set attachments; public TasListItemDTO(TaskListItem taskListItem) { this.taskListItem = taskListItem; - comments = new HashSet(); - attachments = new HashSet(); + this.comments = new HashSet<>(); + this.attachments = new HashSet<>(); } // ********************************************************** @@ -179,7 +179,7 @@ * * @return set of comments posted by the members of the group to which user belong to */ - public Set getComments() { + public Set getComments() { return comments; } @@ -189,7 +189,7 @@ * @param comments * set of comments posted by the members of the group to which user belong to */ - public void setComments(Set comments) { + public void setComments(Set comments) { this.comments = comments; } @@ -198,7 +198,7 @@ * * @return set of files uploaded by the members of the group to which user belong to */ - public Set getAttachments() { + public Set getAttachments() { return attachments; } @@ -208,7 +208,7 @@ * @param attachments * set of files uploaded by the members of the group to which user belong to */ - public void setAttachments(Set attachments) { + public void setAttachments(Set attachments) { this.attachments = attachments; } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/LearningController.java =================================================================== diff -u -r3ee06bc1b00b1673399c1871a73cfa1d8ec2c0db -raff1ef425c76fe6a2051694c0fdf833265459710 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/LearningController.java (.../LearningController.java) (revision 3ee06bc1b00b1673399c1871a73cfa1d8ec2c0db) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/LearningController.java (.../LearningController.java) (revision aff1ef425c76fe6a2051694c0fdf833265459710) @@ -97,20 +97,17 @@ * method run successfully. * * This method will avoid read database again and lost un-saved resouce item lost when user "refresh page", - * */ @RequestMapping("/start") public String start(@ModelAttribute TaskListItemForm taskListItemForm, HttpServletRequest request) { - // initial Session Map SessionMap sessionMap = new SessionMap<>(); request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap); // save toolContentID into HTTPSession ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true); + Long sessionId = WebUtil.readLongParam(request, TaskListConstants.PARAM_TOOL_SESSION_ID); - Long sessionId = new Long(request.getParameter(TaskListConstants.PARAM_TOOL_SESSION_ID)); - request.setAttribute(TaskListConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); request.setAttribute(AttributeNames.ATTR_MODE, mode); request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId); @@ -231,8 +228,8 @@ isPreviousTaskCompleted = item.isComplete(); // filter out comments and attachments which belong to another group - Set filteredComments = new TreeSet<>(new TaskListItemCommentComparator()); - Set filteredAttachments = new TreeSet<>(new TaskListItemAttachmentComparator()); + Set filteredComments = new TreeSet<>(new TaskListItemCommentComparator()); + Set filteredAttachments = new TreeSet<>(new TaskListItemAttachmentComparator()); if (mode.isLearner()) { List grouppedUsers = taskListService.getUserListBySessionId(sessionId); @@ -265,7 +262,6 @@ } // construct taskList dto field - Integer numberCompletedTasks = taskListService.getNumTasksCompletedByUser(sessionId, taskListUser.getUserId()); Integer minimumNumberTasks = taskList.getMinimumNumberTasks(); if ((minimumNumberTasks - numberCompletedTasks) > 0) { @@ -277,6 +273,7 @@ // basic information sessionMap.put(TaskListConstants.ATTR_TITLE, taskList.getTitle()); sessionMap.put(TaskListConstants.ATTR_FINISH_LOCK, lock); + sessionMap.put(TaskListConstants.ATTR_USER_LOGIN, taskListUser.getLoginName()); 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); @@ -317,7 +314,6 @@ } sessionMap.put(TaskListConstants.ATTR_TASKLIST, taskList); - return "pages/learning/learning"; } @@ -327,9 +323,7 @@ @RequestMapping("/completeItem") public String complete(HttpServletRequest request, HttpServletResponse response) { String mode = request.getParameter(AttributeNames.ATTR_MODE); - String sessionMapID = request.getParameter(TaskListConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession() - .getAttribute(sessionMapID); + SessionMap sessionMap = getSessionMap(request); Long sessionId = (Long) sessionMap.get(TaskListConstants.ATTR_TOOL_SESSION_ID); doComplete(request); @@ -347,38 +341,25 @@ @RequestMapping("/finish") public String finish(@ModelAttribute ReflectionForm reflectionForm, HttpServletRequest request, HttpServletResponse response) { - - // get back SessionMap - String sessionMapID = request.getParameter(TaskListConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession() - .getAttribute(sessionMapID); - - Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); - - // auto run mode, when use finish the only one taskList item, mark it as complete then finish this activity as - // well. + // auto run mode, when use finish the only one taskList item, mark it as complete then finish this activity as well String taskListItemUid = request.getParameter(TaskListConstants.PARAM_ITEM_UID); if (taskListItemUid != null) { doComplete(request); - // NOTE:So far this flag is useless(31/08/2006). - // set flag, then finish page can know redir target is parent(AUTO_RUN) or self(normal) - request.setAttribute(TaskListConstants.ATTR_RUN_AUTO, true); - } else { - request.setAttribute(TaskListConstants.ATTR_RUN_AUTO, false); } + String sessionMapID = request.getParameter(TaskListConstants.ATTR_SESSION_MAP_ID); if (!validateBeforeFinish(request, sessionMapID)) { return "pages/learning/learning"; } - // get sessionId from HttpServletRequest - String nextActivityUrl = null; try { HttpSession ss = SessionManager.getSession(); UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - Long userID = new Long(user.getUserID().longValue()); + Long userID = user.getUserID().longValue(); - nextActivityUrl = taskListService.finishToolSession(sessionId, userID); + SessionMap sessionMap = getSessionMap(request); + Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); + String nextActivityUrl = taskListService.finishToolSession(sessionId, userID); request.setAttribute(TaskListConstants.ATTR_NEXT_ACTIVITY_URL, nextActivityUrl); } catch (TaskListException e) { log.error("Failed get next activity url:" + e.getMessage()); @@ -392,7 +373,6 @@ */ @RequestMapping("/addtask") public String addTask(@ModelAttribute TaskListItemForm taskListItemForm, HttpServletRequest request) { - taskListItemForm.setMode(WebUtil.readStrParam(request, AttributeNames.ATTR_MODE)); taskListItemForm.setSessionMapID(WebUtil.readStrParam(request, TaskListConstants.ATTR_SESSION_MAP_ID)); return "pages/learning/parts/addtask"; @@ -401,19 +381,13 @@ /** * Save new user task into database. */ - @RequestMapping(path = "/saveNewTask", method = RequestMethod.POST) public String saveNewTask(@ModelAttribute TaskListItemForm taskListItemForm, HttpServletRequest request) { - // get back SessionMap - String sessionMapID = request.getParameter(TaskListConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession() - .getAttribute(sessionMapID); + SessionMap sessionMap = getSessionMap(request); MultiValueMap errorMap = validateTaskListItem(taskListItemForm); - if (!errorMap.isEmpty()) { request.setAttribute("errorMap", errorMap); - request.setAttribute(TaskListConstants.ATTR_SESSION_MAP_ID, sessionMapID); return "pages/learning/parts/addtask"; } @@ -452,46 +426,42 @@ * Adds new user commment. */ @RequestMapping(path = "/addNewComment", method = RequestMethod.POST) - public String addNewComment(@ModelAttribute TaskListItemForm taskListItemForm, HttpServletRequest request) { - - String mode = request.getParameter(AttributeNames.ATTR_MODE); - SessionMap sessionMap = (SessionMap) request.getSession() - .getAttribute(taskListItemForm.getSessionMapID()); - request.setAttribute(TaskListConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); + public String addNewComment(HttpServletRequest request) { + SessionMap sessionMap = getSessionMap(request); Long sessionId = (Long) sessionMap.get(TaskListConstants.ATTR_TOOL_SESSION_ID); - boolean isTestHarness = Boolean.valueOf(request.getParameter("testHarness")); - String commentMessage = isTestHarness ? request.getParameter("comment__textarea") - : taskListItemForm.getComment(); - if (StringUtils.isBlank(commentMessage)) { - return "pages/learning/learning"; - } - TaskListItemComment comment = new TaskListItemComment(); + String commentMessage = request.getParameter("comment"); comment.setComment(commentMessage); UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); - TaskListUser taskListUser = taskListService.getUserByIDAndSession(new Long(user.getUserID().intValue()), - sessionId); + TaskListUser taskListUser = taskListService.getUserByIDAndSession(user.getUserID().longValue(), sessionId); comment.setCreateBy(taskListUser); comment.setCreateDate(new Timestamp(new Date().getTime())); // persist TaskListItem changes in DB - Long itemUid = new Long(request.getParameter(TaskListConstants.PARAM_ITEM_UID)); + Long itemUid = WebUtil.readLongParam(request, TaskListConstants.PARAM_ITEM_UID); TaskListItem dbItem = taskListService.getTaskListItemByUid(itemUid); Set dbComments = dbItem.getComments(); dbComments.add(comment); taskListService.saveOrUpdateTaskListItem(dbItem); + + TasListItemDTO itemDTO = new TasListItemDTO(dbItem); + itemDTO.setCommentRequirementsMet(true); + request.setAttribute("itemDTO", itemDTO); - // to make available new changes be visible in jsp page - sessionMap.put(TaskListConstants.ATTR_TASK_LIST_ITEM, dbItem); + // filter out comments and attachments which belong to another group + Set commentsPostedByUser = new TreeSet<>(new TaskListItemCommentComparator()); + List grouppedUsers = taskListService.getUserListBySessionId(sessionId); + for (TaskListItemComment commentIter : dbComments) { + for (TaskListUser grouppedUser : grouppedUsers) { + if (grouppedUser.getUserId().equals(commentIter.getCreateBy().getUserId())) { + commentsPostedByUser.add(commentIter); + } + } + } + itemDTO.setComments(commentsPostedByUser); - // form.reset(mapping, request); - String redirectURL = "redirect:/learning/start.do"; - redirectURL = WebUtil.appendParameterToURL(redirectURL, AttributeNames.ATTR_MODE, mode); - redirectURL = WebUtil.appendParameterToURL(redirectURL, AttributeNames.PARAM_TOOL_SESSION_ID, - sessionId.toString()); - - return redirectURL; + return "pages/learning/parts/commentlist"; } /** @@ -500,7 +470,6 @@ @RequestMapping(path = "/uploadFile", method = RequestMethod.POST) public String uploadFile(@ModelAttribute TaskListItemForm taskListItemForm, HttpServletRequest request) throws UploadTaskListFileException { - String mode = request.getParameter(AttributeNames.ATTR_MODE); SessionMap sessionMap = (SessionMap) request.getSession() .getAttribute(taskListItemForm.getSessionMapID()); @@ -528,12 +497,11 @@ // upload to repository UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); - TaskListUser taskListUser = taskListService.getUserByIDAndSession(new Long(user.getUserID().intValue()), - sessionId); + TaskListUser taskListUser = taskListService.getUserByIDAndSession(user.getUserID().longValue(), sessionId); TaskListItemAttachment att = taskListService.uploadTaskListItemFile(file, taskListUser); // persist TaskListItem changes in DB - Long itemUid = new Long(request.getParameter(TaskListConstants.PARAM_ITEM_UID)); + Long itemUid = WebUtil.readLongParam(request, TaskListConstants.PARAM_ITEM_UID); TaskListItem dbItem = taskListService.getTaskListItemByUid(itemUid); Set dbAttachments = dbItem.getAttachments(); dbAttachments.add(att); @@ -558,10 +526,8 @@ @RequestMapping("/newReflection") public String newReflection(@ModelAttribute ReflectionForm reflectionForm, HttpServletRequest request, HttpServletResponse response) { - // get session value String sessionMapID = WebUtil.readStrParam(request, TaskListConstants.ATTR_SESSION_MAP_ID); - if (!validateBeforeFinish(request, sessionMapID)) { return "pages/learning/learning"; } @@ -574,8 +540,8 @@ // get the existing reflection entry - SessionMap map = (SessionMap) request.getSession().getAttribute(sessionMapID); - Long toolSessionID = (Long) map.get(AttributeNames.PARAM_TOOL_SESSION_ID); + SessionMap sessionMap = getSessionMap(request);; + Long toolSessionID = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); NotebookEntry entry = taskListService.getEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL, TaskListConstants.TOOL_SIGNATURE, user.getUserID()); @@ -592,12 +558,9 @@ @RequestMapping(path = "/submitReflection", method = RequestMethod.POST) public String submitReflection(@ModelAttribute ReflectionForm reflectionForm, HttpServletRequest request, HttpServletResponse response) { - Integer userId = reflectionForm.getUserID(); - String sessionMapID = WebUtil.readStrParam(request, TaskListConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession() - .getAttribute(sessionMapID); + SessionMap sessionMap = getSessionMap(request); Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); // check for existing notebook entry @@ -627,7 +590,7 @@ HttpSession ss = SessionManager.getSession(); // get back login user DTO UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - TaskListUser taskListUser = service.getUserByIDAndSession(new Long(user.getUserID().intValue()), sessionId); + TaskListUser taskListUser = service.getUserByIDAndSession(user.getUserID().longValue(), sessionId); if (taskListUser == null) { TaskListSession session = service.getSessionBySessionId(sessionId); @@ -638,16 +601,15 @@ } private TaskListUser getSpecifiedUser(ITaskListService service, Long sessionId, Integer userId) { - TaskListUser taskListUser = service.getUserByIDAndSession(new Long(userId.intValue()), sessionId); + TaskListUser taskListUser = service.getUserByIDAndSession(userId.longValue(), sessionId); if (taskListUser == null) { log.error("Unable to find specified user for taskList activity. Screens are likely to fail. SessionId=" + sessionId + " UserId=" + userId); } return taskListUser; } - private MultiValueMap validateTaskListItem(TaskListItemForm itemForm) { - + private MultiValueMap validateTaskListItem(TaskListItemForm itemForm) { MultiValueMap errorMap = new LinkedMultiValueMap<>(); if (StringUtils.isBlank(itemForm.getTitle())) { errorMap.add("GLOBAL", messageService.getMessage("error.resource.item.title.blank")); @@ -656,13 +618,12 @@ } private boolean validateBeforeFinish(HttpServletRequest request, String sessionMapID) { - SessionMap sessionMap = (SessionMap) request.getSession() - .getAttribute(sessionMapID); + SessionMap sessionMap = getSessionMap(request); Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); HttpSession ss = SessionManager.getSession(); UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - Long userID = new Long(user.getUserID().longValue()); + Long userID = user.getUserID().longValue(); int numberCompletedTasks = taskListService.getNumTasksCompletedByUser(sessionId, userID); int minimumNumberTasks = taskListService.getTaskListBySessionId(sessionId).getMinimumNumberTasks(); @@ -681,18 +642,22 @@ * Set complete flag for given taskList item. */ private void doComplete(HttpServletRequest request) { - // get back sessionMap - String sessionMapID = request.getParameter(TaskListConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); + SessionMap sessionMap = getSessionMap(request); - Long taskListItemUid = new Long(request.getParameter(TaskListConstants.PARAM_ITEM_UID)); + Long taskListItemUid = WebUtil.readLongParam(request, TaskListConstants.PARAM_ITEM_UID); HttpSession ss = SessionManager.getSession(); // get back login user DTO UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); Long sessionId = (Long) sessionMap.get(TaskListConstants.ATTR_TOOL_SESSION_ID); - taskListService.setItemComplete(taskListItemUid, new Long(user.getUserID().intValue()), sessionId); - sessionMapID = "4"; + taskListService.setItemComplete(taskListItemUid, user.getUserID().longValue(), sessionId); } + + @SuppressWarnings("unchecked") + private SessionMap getSessionMap(HttpServletRequest request) { + String sessionMapID = WebUtil.readStrParam(request, TaskListConstants.ATTR_SESSION_MAP_ID); + request.setAttribute(TaskListConstants.ATTR_SESSION_MAP_ID, sessionMapID); + return (SessionMap) request.getSession().getAttribute(sessionMapID); + } } \ No newline at end of file Index: lams_tool_task/web/pages/authoring/parts/itemlist.jsp =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raff1ef425c76fe6a2051694c0fdf833265459710 --- lams_tool_task/web/pages/authoring/parts/itemlist.jsp (.../itemlist.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_task/web/pages/authoring/parts/itemlist.jsp (.../itemlist.jsp) (revision aff1ef425c76fe6a2051694c0fdf833265459710) @@ -11,9 +11,6 @@ - - - Index: lams_tool_task/web/pages/learning/learning.jsp =================================================================== diff -u -r3bb7e0141ae1cc15ccd737c95d90b5762a34ad61 -raff1ef425c76fe6a2051694c0fdf833265459710 --- lams_tool_task/web/pages/learning/learning.jsp (.../learning.jsp) (revision 3bb7e0141ae1cc15ccd737c95d90b5762a34ad61) +++ lams_tool_task/web/pages/learning/learning.jsp (.../learning.jsp) (revision aff1ef425c76fe6a2051694c0fdf833265459710) @@ -22,6 +22,9 @@ <fmt:message key="label.learning.title" /> <%@ include file="/common/header.jsp"%> + + + Index: lams_tool_task/web/pages/learning/parts/addtask.jsp =================================================================== diff -u -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 -raff1ef425c76fe6a2051694c0fdf833265459710 --- lams_tool_task/web/pages/learning/parts/addtask.jsp (.../addtask.jsp) (revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194) +++ lams_tool_task/web/pages/learning/parts/addtask.jsp (.../addtask.jsp) (revision aff1ef425c76fe6a2051694c0fdf833265459710) @@ -8,7 +8,6 @@ <%@ include file="/common/header.jsp"%> - Index: lams_tool_task/web/pages/learning/parts/commentlist.jsp =================================================================== diff -u -r3b9eccb4b8def4d56a62641a0fe4038a60b3afe6 -raff1ef425c76fe6a2051694c0fdf833265459710 --- lams_tool_task/web/pages/learning/parts/commentlist.jsp (.../commentlist.jsp) (revision 3b9eccb4b8def4d56a62641a0fe4038a60b3afe6) +++ lams_tool_task/web/pages/learning/parts/commentlist.jsp (.../commentlist.jsp) (revision aff1ef425c76fe6a2051694c0fdf833265459710) @@ -1,17 +1,18 @@ +<%@ include file="/common/taglibs.jsp"%> + + - - +
- - +
@@ -20,28 +21,48 @@   + - - - - - - + + + + + + + -
+
- + + +
+ + + + +
+ +
+ + + +
+ Index: lams_tool_task/web/pages/learning/parts/itemdetails.jsp =================================================================== diff -u -r3b9eccb4b8def4d56a62641a0fe4038a60b3afe6 -raff1ef425c76fe6a2051694c0fdf833265459710 --- lams_tool_task/web/pages/learning/parts/itemdetails.jsp (.../itemdetails.jsp) (revision 3b9eccb4b8def4d56a62641a0fe4038a60b3afe6) +++ lams_tool_task/web/pages/learning/parts/itemdetails.jsp (.../itemdetails.jsp) (revision aff1ef425c76fe6a2051694c0fdf833265459710) @@ -1,40 +1,21 @@ +<%@ include file="/common/taglibs.jsp"%> +
${item.description}
- -
+ - - +
+
<%@ include file="commentlist.jsp"%> - - - -
- - - - -
- -
- - - -
- - - +
-
+
+ Index: lams_tool_task/web/pages/learning/parts/itemlist.jsp =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -raff1ef425c76fe6a2051694c0fdf833265459710 --- lams_tool_task/web/pages/learning/parts/itemlist.jsp (.../itemlist.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_task/web/pages/learning/parts/itemlist.jsp (.../itemlist.jsp) (revision aff1ef425c76fe6a2051694c0fdf833265459710) @@ -1,16 +1,10 @@ <%@ include file="/common/taglibs.jsp"%> - - - -

- - @@ -51,18 +45,14 @@
in">
- - <%@ include file="/pages/learning/parts/itemdetails.jsp"%> - + + <%@ include file="/pages/learning/parts/itemdetails.jsp"%>
- - -