Index: lams_tool_larsrc/.externalToolBuilders/SASS_lams_tool_larsrc.launch =================================================================== diff -u --- lams_tool_larsrc/.externalToolBuilders/SASS_lams_tool_larsrc.launch (revision 0) +++ lams_tool_larsrc/.externalToolBuilders/SASS_lams_tool_larsrc.launch (revision 6f2ada697a81118661a72a78b711e86542ed3dad) @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + Index: lams_tool_larsrc/.gitignore =================================================================== diff -u -ra83b0eec89979dce7415b02afdda324b14018dbb -r6f2ada697a81118661a72a78b711e86542ed3dad --- lams_tool_larsrc/.gitignore (.../.gitignore) (revision a83b0eec89979dce7415b02afdda324b14018dbb) +++ lams_tool_larsrc/.gitignore (.../.gitignore) (revision 6f2ada697a81118661a72a78b711e86542ed3dad) @@ -1,3 +1,4 @@ /bin/ /build/ /.sass-cache/ +/web/css/*.css Index: lams_tool_larsrc/.project =================================================================== diff -u -r65ae437b8b63c7e70b6c63380e3d25086d6ca101 -r6f2ada697a81118661a72a78b711e86542ed3dad --- lams_tool_larsrc/.project (.../.project) (revision 65ae437b8b63c7e70b6c63380e3d25086d6ca101) +++ lams_tool_larsrc/.project (.../.project) (revision 6f2ada697a81118661a72a78b711e86542ed3dad) @@ -10,6 +10,15 @@ + + org.eclipse.ui.externaltools.ExternalToolBuilder + + + LaunchConfigHandle + <project>/.externalToolBuilders/SASS_lams_tool_larsrc.launch + + + com.genuitec.eclipse.j2eedt.core.webnature Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java =================================================================== diff -u -r045ebfd1d11d9ed0a1f81a00abb1a2ea373e8d93 -r6f2ada697a81118661a72a78b711e86542ed3dad --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java (.../IResourceService.java) (revision 045ebfd1d11d9ed0a1f81a00abb1a2ea373e8d93) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java (.../IResourceService.java) (revision 6f2ada697a81118661a72a78b711e86542ed3dad) @@ -214,7 +214,7 @@ * @param visible * true, item is visible. False, item is invisible. */ - void setItemVisible(Long itemUid, Long sessionId, boolean visible); + void setItemVisible(Long itemUid, Long sessionId, Long contentId, boolean visible); /** * Create refection entry into notebook tool. Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java =================================================================== diff -u -r045ebfd1d11d9ed0a1f81a00abb1a2ea373e8d93 -r6f2ada697a81118661a72a78b711e86542ed3dad --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision 045ebfd1d11d9ed0a1f81a00abb1a2ea373e8d93) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision 6f2ada697a81118661a72a78b711e86542ed3dad) @@ -492,9 +492,37 @@ groupList.add(group); } + if ( groupList.size() == 0) { + // no sessions but we still need to be able to view the resources in monitoring + groupList.add(createAuthoredItemsGroupList(contentId, resource)); + } return groupList; } + private SessionDTO createAuthoredItemsGroupList(Long contentId, Resource resource) { + SessionDTO group = new SessionDTO(); + group.setSessionId(0L); + group.setSessionName(""); + + Set items = new TreeSet(new ResourceItemComparator()); + // get the authored items + items.addAll(resource.getResourceItems()); + + // get all item which is accessed by users in this session + for (ResourceItem item : items) { + ResourceItemDTO resourceItemDTO = new ResourceItemDTO(item); + group.getItems().add(resourceItemDTO); + if ( item.isAllowRating() ) { + group.setAllowRating(true); + } + if ( item.isAllowComments() ) { + group.setAllowComments(true); + } + } + + return group; + } + @Override public List getReflectList(Long contentId) { List reflections = new LinkedList(); @@ -553,7 +581,7 @@ } @Override - public void setItemVisible(Long itemUid, Long sessionId, boolean visible) { + public void setItemVisible(Long itemUid, Long sessionId, Long contentId, boolean visible) { ResourceItem item = resourceItemDao.getByUid(itemUid); if (item != null) { // createBy should be null for system default value. @@ -563,12 +591,15 @@ userId = item.getCreateBy().getUserId(); loginName = item.getCreateBy().getLoginName(); } - Long toolContentId = null; - ResourceSession session = resourceSessionDao.getSessionBySessionId(sessionId); - if (session != null) { - toolContentId = session.getResource().getContentId(); - } else { - ResourceServiceImpl.log.error("setItemVisible: Failed get ResourceSession by ID [" + sessionId + "]. Audit log entry will be created but will be missing tool content id"); + Long toolContentId = contentId; + if (toolContentId == null) { + ResourceSession session = resourceSessionDao.getSessionBySessionId(sessionId); + if (session != null) { + toolContentId = session.getResource().getContentId(); + } else { + ResourceServiceImpl.log.error("setItemVisible: Failed get ResourceSession by ID [" + sessionId + + "]. Audit log entry will be created but will be missing tool content id"); + } } if (visible) { logEventService.logShowLearnerContent(userId, loginName, toolContentId, item.toString()); Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java =================================================================== diff -u -r045ebfd1d11d9ed0a1f81a00abb1a2ea373e8d93 -r6f2ada697a81118661a72a78b711e86542ed3dad --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java (.../LearningAction.java) (revision 045ebfd1d11d9ed0a1f81a00abb1a2ea373e8d93) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java (.../LearningAction.java) (revision 6f2ada697a81118661a72a78b711e86542ed3dad) @@ -713,12 +713,12 @@ String sessionMapID = request.getParameter(ResourceConstants.ATTR_SESSION_MAP_ID); SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); Long sessionId = (Long) sessionMap.get(ResourceConstants.ATTR_TOOL_SESSION_ID); - + Long contentId = (Long) sessionMap.get(ResourceConstants.ATTR_TOOL_CONTENT_ID); IResourceService service = getResourceService(); ResourceItem resourceItem = service.getResourceItemByUid(itemUid); if (!resourceItem.isCreateByAuthor() && user.getUserID().longValue() == resourceItem.getCreateBy().getUserId()) { - service.setItemVisible(itemUid, sessionId, false); + service.setItemVisible(itemUid, sessionId, contentId, false); //open session Map } else { response.sendError(HttpServletResponse.SC_FORBIDDEN, "You are not allowed to hide this item"); Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java =================================================================== diff -u -reeb8faaea5372ccf5445d7172f726931e9f26098 -r6f2ada697a81118661a72a78b711e86542ed3dad --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision eeb8faaea5372ccf5445d7172f726931e9f26098) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 6f2ada697a81118661a72a78b711e86542ed3dad) @@ -215,8 +215,9 @@ Long itemUid = WebUtil.readLongParam(request, ResourceConstants.PARAM_RESOURCE_ITEM_UID); boolean isHideItem = WebUtil.readBooleanParam(request, ResourceConstants.PARAM_IS_HIDE_ITEM); Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); + Long contentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); IResourceService service = getResourceService(); - service.setItemVisible(itemUid, sessionId, !isHideItem); + service.setItemVisible(itemUid, sessionId, contentId, !isHideItem); return null; } Index: lams_tool_larsrc/web/css/monitor.scss =================================================================== diff -u --- lams_tool_larsrc/web/css/monitor.scss (revision 0) +++ lams_tool_larsrc/web/css/monitor.scss (revision 6f2ada697a81118661a72a78b711e86542ed3dad) @@ -0,0 +1,27 @@ +@import "_lams_variables.scss"; + +.ui-jqgrid { + border-left-style: none !important; + border-right-style: none !important; + border-bottom-style: none !important; +} + +.ui-jqgrid tr { + border-left-style: none !important; +} + +.ui-jqgrid td { + border-style: none !important; +} + +.ui-jqgrid a { + color: $a-link-default !important; +} + +.ui-jqgrid a:hover { + color: $a-link-default-hover !important; +} + +.ui-jqgrid a:focus { + color: $a-link-default-focus !important; +} Index: lams_tool_larsrc/web/pages/monitoring/summary.jsp =================================================================== diff -u -r045ebfd1d11d9ed0a1f81a00abb1a2ea373e8d93 -r6f2ada697a81118661a72a78b711e86542ed3dad --- lams_tool_larsrc/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 045ebfd1d11d9ed0a1f81a00abb1a2ea373e8d93) +++ lams_tool_larsrc/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 6f2ada697a81118661a72a78b711e86542ed3dad) @@ -6,21 +6,7 @@ - +