Index: lams_tool_larsrc/conf/language/ApplicationResources.properties =================================================================== diff -u -r4cf31b82e939a11c1f054a96ff07a650300b289f -r229b7cbba0b3121880c4dc69818e46d6589fd31e --- lams_tool_larsrc/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 4cf31b82e939a11c1f054a96ff07a650300b289f) +++ lams_tool_larsrc/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 229b7cbba0b3121880c4dc69818e46d6589fd31e) @@ -126,6 +126,7 @@ monitoring.label.show=Show monitoring.label.user.loginname=Login name monitoring.label.user.name=Name +monitoring.label.hidden=Hidden message.monitoring.edit.activity.not.editable=This Activity is no longer editable #------------------------------End Monitoring ----------------------------------# Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java =================================================================== diff -u -r6f9ce8030c9939df344a3aa7f5894116491a90d8 -r229b7cbba0b3121880c4dc69818e46d6589fd31e --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java (.../IResourceService.java) (revision 6f9ce8030c9939df344a3aa7f5894116491a90d8) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java (.../IResourceService.java) (revision 229b7cbba0b3121880c4dc69818e46d6589fd31e) @@ -109,8 +109,15 @@ */ void setItemVisible(Long itemUid, boolean visible); - - public List exportBySessionId(Long sessionId); + /** + * Get resource item Summary list according to sessionId and skipHide flag. + * + * @param sessionId + * @param skipHide true, don't get resource item if its isHide flag is true. + * Otherwise, get all resource item + * @return + */ + public List exportBySessionId(Long sessionId, boolean skipHide); public List exportByContentId(Long contentId); } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java =================================================================== diff -u -r6f9ce8030c9939df344a3aa7f5894116491a90d8 -r229b7cbba0b3121880c4dc69818e46d6589fd31e --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision 6f9ce8030c9939df344a3aa7f5894116491a90d8) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision 229b7cbba0b3121880c4dc69818e46d6589fd31e) @@ -295,7 +295,7 @@ return items; } - public List exportBySessionId(Long sessionId) { + public List exportBySessionId(Long sessionId, boolean skipHide) { ResourceSession session = resourceSessionDao.getSessionBySessionId(sessionId); if(session == null){ log.error("Failed get ResourceSession by ID [" +sessionId + "]"); @@ -305,6 +305,9 @@ List itemList = new ArrayList(); Set resList = session.getResource().getResourceItems(); for(ResourceItem item:resList){ + if(skipHide && item.isHide()) + continue; + //if item is ha if(item.isCreateByAuthor()){ Summary sum = new Summary(session.getSessionName(),item,false); itemList.add(sum); @@ -314,6 +317,9 @@ //get this session's all resource items Set sessList =session.getResourceItems(); for(ResourceItem item:sessList){ + if(skipHide && item.isHide()) + continue; + //to skip all item create by author if(!item.isCreateByAuthor()){ Summary sum = new Summary(session.getSessionName(),item,false); @@ -341,7 +347,16 @@ //session by session List sessionList = resourceSessionDao.getByContentId(contentId); for(ResourceSession session:sessionList){ - List group = exportBySessionId(session.getSessionId()); + List group = new ArrayList(); + //get this session's all resource items + Set sessList =session.getResourceItems(); + for(ResourceItem item:sessList){ + //to skip all item create by author + if(!item.isCreateByAuthor()){ + Summary sum = new Summary(session.getSessionName(),item,false); + group.add(sum); + } + } groupList.add(group); } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/ExportServlet.java =================================================================== diff -u -ra7fe4acafd3937e08142a8066b573d4fc9752a0b -r229b7cbba0b3121880c4dc69818e46d6589fd31e --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/ExportServlet.java (.../ExportServlet.java) (revision a7fe4acafd3937e08142a8066b573d4fc9752a0b) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/ExportServlet.java (.../ExportServlet.java) (revision 229b7cbba0b3121880c4dc69818e46d6589fd31e) @@ -43,6 +43,7 @@ import org.lamsfoundation.lams.tool.rsrc.service.ResourceApplicationException; import org.lamsfoundation.lams.tool.rsrc.service.ResourceServiceProxy; import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet; +import org.lamsfoundation.lams.web.util.AttributeNames; /** * Export portfolio servlet to export all shared resource into offline HTML @@ -62,8 +63,10 @@ public String doExport(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies) { try { if (StringUtils.equals(mode, ToolAccessMode.LEARNER.toString())) { + request.getSession().setAttribute(AttributeNames.ATTR_MODE,ToolAccessMode.LEARNER); learner(request, response, directoryName, cookies); } else if (StringUtils.equals(mode, ToolAccessMode.TEACHER.toString())) { + request.getSession().setAttribute(AttributeNames.ATTR_MODE,ToolAccessMode.TEACHER); teacher(request, response, directoryName, cookies); } } catch (ResourceApplicationException e) { @@ -103,7 +106,7 @@ logger.error(error); throw new ResourceApplicationException(error); } - List group = service.exportBySessionId(toolSessionID); + List group = service.exportBySessionId(toolSessionID,true); List groupList = new ArrayList(); groupList.add(group); request.getSession().setAttribute(ResourceConstants.ATTR_SUMMARY_LIST, groupList); Index: lams_tool_larsrc/web/pages/export/exportportfolio.jsp =================================================================== diff -u -ra7fe4acafd3937e08142a8066b573d4fc9752a0b -r229b7cbba0b3121880c4dc69818e46d6589fd31e --- lams_tool_larsrc/web/pages/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision a7fe4acafd3937e08142a8066b573d4fc9752a0b) +++ lams_tool_larsrc/web/pages/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 229b7cbba0b3121880c4dc69818e46d6589fd31e) @@ -55,6 +55,11 @@ + + + + + @@ -102,6 +107,15 @@ + + + + + + + + +