Index: lams_tool_larsrc/conf/language/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/conf/language/Attic/ApplicationResources.properties,v diff -u -r1.14 -r1.15 --- lams_tool_larsrc/conf/language/ApplicationResources.properties 4 May 2006 06:01:09 -0000 1.14 +++ lams_tool_larsrc/conf/language/ApplicationResources.properties 5 May 2006 04:34:56 -0000 1.15 @@ -115,6 +115,8 @@ #---------------------------------Monitoring ----------------------------------# monitoring.tab.summary=Summary monitoring.tab.statistics=Statistic +monitoring.tab.instructions=Instruction +monitoring.tab.edit.activity=Edit Activity monitoring.label.group=Group monitoring.summary.note=Note: number of learners is the number of learners who have viewed the resource. @@ -128,6 +130,10 @@ monitoring.label.user.name=Name monitoring.label.hidden=Hidden +label.monitoring.edit.activity.cancel =Cancel +label.monitoring.edit.activity.update =Update +label.monitoring.edit.activity.edit =Edit + message.monitoring.edit.activity.not.editable=This Activity is no longer editable #------------------------------End Monitoring ----------------------------------# export.label.resource=Resource Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java,v diff -u -r1.17 -r1.18 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java 5 May 2006 03:31:18 -0000 1.17 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java 5 May 2006 04:34:56 -0000 1.18 @@ -75,7 +75,6 @@ public static final String ERROR_MSG_UPLOAD_FAILED = "error.upload.failed"; - + public static final String PAGE_EDITABLE = "isPageEditable"; - } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java,v diff -u -r1.5 -r1.6 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java 5 May 2006 03:31:18 -0000 1.5 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java 5 May 2006 04:34:56 -0000 1.6 @@ -25,27 +25,33 @@ package org.lamsfoundation.lams.tool.rsrc.web.action; import java.io.IOException; -import java.util.ArrayList; import java.util.List; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.log4j.Logger; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.rsrc.ResourceConstants; import org.lamsfoundation.lams.tool.rsrc.dto.Summary; +import org.lamsfoundation.lams.tool.rsrc.model.Resource; import org.lamsfoundation.lams.tool.rsrc.service.IResourceService; +import org.lamsfoundation.lams.tool.rsrc.service.ResourceApplicationException; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; +import sun.util.logging.resources.logging; + public class MonitoringAction extends Action { + private static Logger log = Logger.getLogger(MonitoringAction.class); + public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { String param = mapping.getParameter(); @@ -121,6 +127,11 @@ //put it into HTTPSession request.getSession().setAttribute(ResourceConstants.ATTR_SUMMARY_LIST, groupList); + + Resource resource = service.getResourceByContentId(contentId); + request.getSession().setAttribute(ResourceConstants.PAGE_EDITABLE, new Boolean(isResourceEditable(resource))); + request.getSession().setAttribute(ResourceConstants.ATTR_RESOURCE, resource); + request.getSession().setAttribute(ResourceConstants.ATTR_TOOL_CONTENT_ID, contentId); return mapping.findForward(ResourceConstants.SUCCESS); } @@ -146,4 +157,19 @@ .getServletContext()); return (IResourceService) wac.getBean(ResourceConstants.RESOURCE_SERVICE); } + + private boolean isResourceEditable(Resource resource) { + if ( (resource.isDefineLater() == true) && (resource.isContentInUse()==true) ) + { +// throw new ResourceApplicationException("An exception has occurred: There is a bug in this tool, conflicting flags are set"); + log.error("An exception has occurred: There is a bug in this tool, conflicting flags are set"); + return false; + } + else if ( (resource.isDefineLater() == true) && (resource.isContentInUse() == false)) + return true; + else if ( (resource.isDefineLater() == false) && (resource.isContentInUse() == false)) + return true; + else // (content.isContentInUse()==true && content.isDefineLater() == false) + return false; + } } Index: lams_tool_larsrc/web/pages/monitoring/editactivity.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/editactivity.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_larsrc/web/pages/monitoring/editactivity.jsp 5 May 2006 04:34:56 -0000 1.1 @@ -0,0 +1,46 @@ +<%@ include file="/common/taglibs.jsp"%> + +
+ + + + + + + + + + + + + + +
+ + : + + +
+ + : + + +
+ + + + + + + + + + + + + + + + +
+
Index: lams_tool_larsrc/web/pages/monitoring/instructions.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/Attic/instructions.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_larsrc/web/pages/monitoring/instructions.jsp 5 May 2006 04:34:56 -0000 1.1 @@ -0,0 +1,107 @@ +<%@ include file="/common/taglibs.jsp"%> + +
+ + + + + + + + + <%-- + + --%> + + + + + + + + + + <%-- + + --%> + + <%-- + + + + --%> +
+ + : + + +
+   + + +
+ +
  • + + + + + + + +   + + + + + + +   + + + + + + +
    • +     +
    +
    + + : + + +
    +   + +
    + +
  • + + + + + + + + + + + + + + + + + + + +
    • +     +
    +
    + +
    +
    + + Index: lams_tool_larsrc/web/pages/monitoring/monitoring.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/monitoring.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_larsrc/web/pages/monitoring/monitoring.jsp 2 May 2006 02:23:29 -0000 1.2 +++ lams_tool_larsrc/web/pages/monitoring/monitoring.jsp 5 May 2006 04:34:56 -0000 1.3 @@ -10,7 +10,7 @@ function init(){ - initTabSize(2); + initTabSize(4); selectTab(1); //select the default tab; } @@ -26,13 +26,17 @@ - + + +
    - + + +
    Index: lams_tool_larsrc/web/pages/monitoring/statistic.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/statistic.jsp,v diff -u -r1.5 -r1.6 --- lams_tool_larsrc/web/pages/monitoring/statistic.jsp 4 May 2006 04:24:10 -0000 1.5 +++ lams_tool_larsrc/web/pages/monitoring/statistic.jsp 5 May 2006 04:34:56 -0000 1.6 @@ -1,7 +1,7 @@ <%@ include file="/common/taglibs.jsp"%> - + <%-- display group name on first row--%> @@ -10,6 +10,11 @@
    ${item.sessionName} + + + + +