Index: lams_monitoring/conf/language/ApplicationResources.properties =================================================================== diff -u -r580e9bb194e76263d8a5ff2132d20dc1876010e8 -r6b2751bb0a75d2d7d73b3297262dffd574d6b313 --- lams_monitoring/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 580e9bb194e76263d8a5ff2132d20dc1876010e8) +++ lams_monitoring/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 6b2751bb0a75d2d7d73b3297262dffd574d6b313) @@ -40,12 +40,14 @@ preview.deleted.title=Preview Data Deleted #Deleted Preview Message Screen Message (Debugging screen) preview.deleted.message=Preview data for {0} lesson(s) has been deleted. +# General error message if the system tries to display a screen that isn't supported by an activity. +not.supported=This option is not supported for this activity. + # Message for monitoring client (Flash) - No Such Lesson NO.SUCH.LESSON=No such Lesson with a lessonID of : {0} exists. # Message for monitoring client (Flash) - Invalid Activity ID INVALID.ACTIVITYID=Invalid activityID :{0}. # Message for monitoring client (Flash) - Invalid User for this activity -INVALID.ACTIVITYID.USER=Invalid activityID/User : {0} : {1}. # Message for monitoring client (Flash) - Invalid type of activity INVALID.ACTIVITYID.TYPE=Invalid Activity type: {0}. Only ToolActivity allowed. # Message for monitoring client (Flash) - Invalid Lesson ID Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java =================================================================== diff -u -r580e9bb194e76263d8a5ff2132d20dc1876010e8 -r6b2751bb0a75d2d7d73b3297262dffd574d6b313 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java (.../IMonitoringService.java) (revision 580e9bb194e76263d8a5ff2132d20dc1876010e8) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java (.../IMonitoringService.java) (revision 6b2751bb0a75d2d7d73b3297262dffd574d6b313) @@ -306,12 +306,12 @@ public String getLearnerActivityURL(Long lessonID, Long activityID,Integer userID)throws IOException,LamsToolServiceException; /** - * This method returns the define later url for the given activity + * This method returns the define later url for the given activity. * * @param lessonID The lesson_id of the Lesson for which the information has * to be fetched. * @param activityID The activity_id of the Activity whose URL will be returned - * @return String The required information in WDDX format + * @return String the url * @throws IOException */ public String getActivityDefineLaterURL(Long lessonID, Long activityID)throws IOException, LamsToolServiceException; Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== diff -u -r580e9bb194e76263d8a5ff2132d20dc1876010e8 -r6b2751bb0a75d2d7d73b3297262dffd574d6b313 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision 580e9bb194e76263d8a5ff2132d20dc1876010e8) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision 6b2751bb0a75d2d7d73b3297262dffd574d6b313) @@ -609,10 +609,8 @@ public void startLesson(long lessonId, Integer userId) { // System.out.println(messageService.getMessage("NO.SUCH.LESSON",new Object[]{new Long(lessonId)})); -// System.out.println(messageService.getMessage("INVALID.ACTIVITYID.USER", new Object[]{ "activityID","userID" })); // System.out.println(messageService.getMessage("INVALID.ACTIVITYID.TYPE", new Object[]{ "activityID"})); // System.out.println(messageService.getMessage("INVALID.ACTIVITYID.LESSONID",new Object[]{ "activityID","lessonID"})); -// System.out.println(messageService.getMessage("INVALID.ACTIVITYID",new Object[]{ "activityID"})); if(log.isDebugEnabled()) log.debug("=============Starting Lesson "+lessonId+"=============="); @@ -1004,70 +1002,45 @@ public String getLearnerActivityURL(Long lessonID, Long activityID,Integer userID)throws IOException, LamsToolServiceException{ Activity activity = activityDAO.getActivityByActivityId(activityID); User user = userManagementService.getUserById(userID); - FlashMessage flashMessage=null; + if(activity==null || user==null){ - flashMessage = new FlashMessage("getLearnerActivityURL", - messageService.getMessage("INVALID.ACTIVITYID.USER", new Object[]{ activityID,userID }), - FlashMessage.ERROR); + log.error("getLearnerActivityURL activity or user missing. Activity ID "+activityID+" activity " +activity+" userID "+userID+" user "+user); + } else if ( activity.isToolActivity() || activity.isSystemToolActivity() ){ - String toolURL = lamsCoreToolService.getToolLearnerProgressURL(lessonID, activity,user); - flashMessage = new FlashMessage("getLearnerActivityURL",new ProgressActivityDTO(activityID,toolURL)); - } - if ( flashMessage == null ) { - flashMessage = new FlashMessage("getLearnerActivityURL", - messageService.getMessage("INVALID.ACTIVITYID.TYPE", new Object[]{ activity.getActivityId()}), - FlashMessage.ERROR); - } - - return flashMessage.serializeMessage(); + return lamsCoreToolService.getToolLearnerProgressURL(lessonID, activity,user); + } + return null; } /** * (non-Javadoc) * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#getActivityDefineLaterURL(java.lang.Long) */ public String getActivityDefineLaterURL(Long lessonID, Long activityID)throws IOException, LamsToolServiceException{ Activity activity = activityDAO.getActivityByActivityId(activityID); - FlashMessage flashMessage = null; - if(activity!=null){ - if ( activity.isToolActivity() ) { - ToolActivity toolActivity = (ToolActivity) activity; - String url = lamsCoreToolService.getToolDefineLaterURL(toolActivity); - flashMessage = new FlashMessage("getActivityDefineLaterURL",new ProgressActivityDTO(activityID, url)); - } else { - flashMessage = new FlashMessage("getLearnerActivityURL", - messageService.getMessage("INVALID.ACTIVITYID.TYPE", new Object[]{ activity.getActivityId()}), - FlashMessage.ERROR); - } - }else - flashMessage = FlashMessage.getNoSuchActivityExists("getActivityDefineLaterURL",activityID); - - return flashMessage.serializeMessage(); + if(activity==null){ + log.error("getActivityMonitorURL activity missing. Activity ID "+activityID+" activity " +activity); + + } else if ( activity.isToolActivity() ){ + ToolActivity toolActivity = (ToolActivity) activity; + return lamsCoreToolService.getToolDefineLaterURL(toolActivity); + + } + return null; } /** * (non-Javadoc) * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#getActivityMonitorURL(java.lang.Long) */ public String getActivityMonitorURL(Long lessonID, Long activityID)throws IOException, LamsToolServiceException{ Activity activity = activityDAO.getActivityByActivityId(activityID); - FlashMessage flashMessage = null; - if(activity!=null){ - - String toolURL = lamsCoreToolService.getToolMonitoringURL(lessonID, activity); - if ( toolURL != null ) { - flashMessage = new FlashMessage("getActivityMonitorURL",new ProgressActivityDTO(activityID, toolURL)); - } - - if ( flashMessage == null ) { - flashMessage = new FlashMessage("getActivityMonitorURL", - messageService.getMessage("INVALID.ACTIVITYID.TYPE", new Object[]{ activity.getActivityId()}), - FlashMessage.ERROR); - } - }else { - flashMessage = FlashMessage.getNoSuchActivityExists("getActivityMonitorURL",activityID); - } - - return flashMessage.serializeMessage(); + if(activity==null){ + log.error("getActivityMonitorURL activity missing. Activity ID "+activityID+" activity " +activity); + + } else if ( activity.isToolActivity() || activity.isSystemToolActivity() ){ + return lamsCoreToolService.getToolMonitoringURL(lessonID, activity); + } + return null; } /** Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java =================================================================== diff -u -rdf403b3f55f75d3ed5a4e53b8ac259343120ae5f -r6b2751bb0a75d2d7d73b3297262dffd574d6b313 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java (.../DummyMonitoringAction.java) (revision df403b3f55f75d3ed5a4e53b8ac259343120ae5f) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java (.../DummyMonitoringAction.java) (revision 6b2751bb0a75d2d7d73b3297262dffd574d6b313) @@ -352,166 +352,5 @@ UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); return user != null ? user.getUserID() : null; } - - public ActionForward gotoLearnerActivityURL(ActionMapping mapping, - ActionForm form, - HttpServletRequest request, - HttpServletResponse response)throws IOException,LamsToolServiceException{ - this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); - Integer userID = new Integer(WebUtil.readIntParam(request,AttributeNames.PARAM_USER_ID)); - Long activityID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_ACTIVITY_ID)); - Long lessonID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID)); - String wddxPacket = monitoringService.getLearnerActivityURL(lessonID,activityID,userID); - String url = extractURL(wddxPacket); - response.sendRedirect(response.encodeRedirectURL(url)); - return null; - } - public ActionForward gotoMonitoringActivityURL(ActionMapping mapping, - ActionForm form, - HttpServletRequest request, - HttpServletResponse response)throws IOException,LamsToolServiceException{ - this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); - Long activityID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_ACTIVITY_ID)); - Long lessonID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID)); - String wddxPacket = monitoringService.getActivityMonitorURL(lessonID,activityID); - String url = extractURL(wddxPacket); - response.sendRedirect(response.encodeRedirectURL(url)); - return null; - } - public ActionForward gotoDefineLaterActivityURL(ActionMapping mapping, - ActionForm form, - HttpServletRequest request, - HttpServletResponse response)throws IOException,LamsToolServiceException{ - this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); - Long activityID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_ACTIVITY_ID)); - Long lessonID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID)); - String wddxPacket = monitoringService.getActivityDefineLaterURL(lessonID,activityID); - String url = extractURL(wddxPacket); - response.sendRedirect(response.encodeRedirectURL(url)); - return null; - } - - /** - * @param wddxPacket - * @return - */ - private String extractURL(String wddxPacket) { - String url = null; - String previousString = ""; - int index = wddxPacket.indexOf(previousString); - if ( index > -1 && index+previousString.length() < wddxPacket.length() ) { - url = wddxPacket.substring(index+previousString.length()); - index = url.indexOf(""); - url = url.substring(0,index); - } - // replace any &amp; (which is the special wddx & escaping) with & - url = url.replace("&amp;","&"); - url = WebUtil.convertToFullURL(url); - - return url; - } - - /* public ActionForward getLessonDetails(ActionMapping mapping, - ActionForm form, - HttpServletRequest request, - HttpServletResponse response)throws IOException{ - this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); - Long lessonID = new Long(WebUtil.readLongParam(request,"lessonID")); - String wddxPacket = monitoringService.getLessonDetails(lessonID); - return outputPacket(mapping, request, response, wddxPacket, "details"); - } - public ActionForward getLessonLearners(ActionMapping mapping, - ActionForm form, - HttpServletRequest request, - HttpServletResponse response)throws IOException{ - this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); - Long lessonID = new Long(WebUtil.readLongParam(request,"lessonID")); - String wddxPacket = monitoringService.getLessonLearners(lessonID); - return outputPacket(mapping, request, response, wddxPacket, "details"); - } - public ActionForward getLearningDesignDetails(ActionMapping mapping, - ActionForm form, - HttpServletRequest request, - HttpServletResponse response)throws IOException{ - this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); - Long lessonID = new Long(WebUtil.readLongParam(request,"lessonID")); - String wddxPacket = monitoringService.getLearningDesignDetails(lessonID); - return outputPacket(mapping, request, response, wddxPacket, "details"); - } - public ActionForward getAllLearnersProgress(ActionMapping mapping, - ActionForm form, - HttpServletRequest request, - HttpServletResponse response)throws IOException{ - this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); - Long lessonID = new Long(WebUtil.readLongParam(request,"lessonID")); - String wddxPacket = monitoringService.getAllLearnersProgress(lessonID); - return outputPacket(mapping, request, response, wddxPacket, "details"); - } - public ActionForward getAllContributeActivities(ActionMapping mapping, - ActionForm form, - HttpServletRequest request, - HttpServletResponse response)throws IOException{ - this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); - Long lessonID = new Long(WebUtil.readLongParam(request,"lessonID")); - String wddxPacket = monitoringService.getAllContributeActivities(lessonID); - return outputPacket(mapping, request, response, wddxPacket, "details"); - } - public ActionForward getActivityContributionURL(ActionMapping mapping, - ActionForm form, - HttpServletRequest request, - HttpServletResponse response)throws IOException{ - this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); - Long activityID = new Long(WebUtil.readLongParam(request,"activityID")); - String wddxPacket = monitoringService.getActivityContributionURL(activityID); - return outputPacket(mapping, request, response, wddxPacket, "details"); - } - public ActionForward moveLesson(ActionMapping mapping, - ActionForm form, - HttpServletRequest request, - HttpServletResponse response)throws IOException{ - this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); - Long lessonID = new Long(WebUtil.readLongParam(request,"lessonID")); - Integer userID = new Integer(WebUtil.readIntParam(request,"userID")); - Integer targetWorkspaceFolderID = new Integer(WebUtil.readIntParam(request,"folderID")); - String wddxPacket = monitoringService.moveLesson(lessonID,targetWorkspaceFolderID,userID); - return outputPacket(mapping, request, response, wddxPacket, "details"); - } - public ActionForward renameLesson(ActionMapping mapping, - ActionForm form, - HttpServletRequest request, - HttpServletResponse response)throws IOException{ - this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); - Long lessonID = new Long(WebUtil.readLongParam(request,"lessonID")); - Integer userID = new Integer(WebUtil.readIntParam(request,"userID")); - String name = WebUtil.readStrParam(request,"name"); - String wddxPacket = monitoringService.renameLesson(lessonID,name,userID); - return outputPacket(mapping, request, response, wddxPacket, "details"); - } - - public ActionForward checkGateStatus(ActionMapping mapping, - ActionForm form, - HttpServletRequest request, - HttpServletResponse response) throws IOException { - - this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); - Long activityID = new Long(WebUtil.readLongParam(request, "activityID")); - Long lessonID = new Long(WebUtil.readLongParam(request, "lessonID")); - String wddxPacket = monitoringService.checkGateStatus(activityID, lessonID); - // request.setAttribute(USE_JSP_OUTPUT, "1"); - return outputPacket(mapping, request, response, wddxPacket, "details"); - - } - - public ActionForward releaseGate(ActionMapping mapping, - ActionForm form, - HttpServletRequest request, - HttpServletResponse response) throws IOException { - this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); - Long activityID = new Long(WebUtil.readLongParam(request, "activityID")); - String wddxPacket = monitoringService.releaseGate(activityID); - // request.setAttribute(USE_JSP_OUTPUT, "1"); - return outputPacket(mapping, request, response, wddxPacket, "details"); - } -*/ } Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java =================================================================== diff -u -rabe8b6d5222e4efc0e5bb332066d481f50d38e8c -r6b2751bb0a75d2d7d73b3297262dffd574d6b313 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision abe8b6d5222e4efc0e5bb332066d481f50d38e8c) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision 6b2751bb0a75d2d7d73b3297262dffd574d6b313) @@ -69,6 +69,7 @@ * path=".systemError" * handler="org.lamsfoundation.lams.web.util.CustomStrutsExceptionHandler" * @struts.action-forward name = "previewdeleted" path = "/previewdeleted.jsp" + * @struts.action-forward name = "notsupported" path = ".notsupported" * * ----------------XDoclet Tags-------------------- */ @@ -84,7 +85,8 @@ // Class level constants - Struts forward //--------------------------------------------------------------------- private static final String PREVIEW_DELETED_REPORT_SCREEN = "previewdeleted"; - + private static final String NOT_SUPPORTED_SCREEN = "notsupported"; + /** See deleteOldPreviewLessons */ public static final String NUM_DELETED = "numDeleted"; @@ -96,27 +98,7 @@ */ } - /** - * @param wddxPacket - * @return - */ - private String extractURL(String wddxPacket) { - String url = null; - String previousString = ""; - int index = wddxPacket.indexOf(previousString); - if ( index > -1 && index+previousString.length() < wddxPacket.length() ) { - url = wddxPacket.substring(index+previousString.length()); - index = url.indexOf(""); - url = url.substring(0,index); - } - // replace any & with & - url = url.replace("&","&"); - url = WebUtil.convertToFullURL(url); - - return url; - } - - private FlashMessage handleException(Exception e, String methodKey, IMonitoringService monitoringService) { + private FlashMessage handleException(Exception e, String methodKey, IMonitoringService monitoringService) { log.error("Exception thrown "+methodKey,e); if ( e instanceof UserAccessDeniedException ) { return new FlashMessage(methodKey, @@ -139,7 +121,17 @@ FlashMessage.CRITICAL_ERROR); } - //--------------------------------------------------------------------- + private ActionForward redirectToURL(ActionMapping mapping, HttpServletResponse response, String url) throws IOException { + if ( url != null ) { + String fullURL = WebUtil.convertToFullURL(url); + response.sendRedirect(response.encodeRedirectURL(fullURL)); + return null; + } else { + return mapping.findForward(PREVIEW_DELETED_REPORT_SCREEN); + } + } + + //--------------------------------------------------------------------- // Struts Dispatch Method //--------------------------------------------------------------------- /** @@ -600,6 +592,7 @@ return null; } + /** Calls the server to bring up the learner progress page. Assumes destination is a new window */ public ActionForward getLearnerActivityURL(ActionMapping mapping, ActionForm form, HttpServletRequest request, @@ -608,13 +601,35 @@ Integer userID = new Integer(WebUtil.readIntParam(request,"userID")); Long activityID = new Long(WebUtil.readLongParam(request,"activityID")); Long lessonID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID)); - //Show learner in monitor in a single call: extract URL and redirect it rather than returning the WDDX packet - String wddxPacket = monitoringService.getLearnerActivityURL(lessonID,activityID,userID); - String url = extractURL(wddxPacket); - response.sendRedirect(response.encodeRedirectURL(url)); - return null; + String url = monitoringService.getLearnerActivityURL(lessonID,activityID,userID); + return redirectToURL(mapping, response, url); } + /** Calls the server to bring up the activity's monitoring page. Assumes destination is a new window */ + public ActionForward getActivityMonitorURL(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response)throws IOException,LamsToolServiceException{ + IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); + Long activityID = new Long(WebUtil.readLongParam(request,"activityID")); + Long lessonID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID)); + + String url = monitoringService.getActivityMonitorURL(lessonID,activityID); + return redirectToURL(mapping, response, url); + } + /** Calls the server to bring up the activity's define later page. Assumes destination is a new window */ + public ActionForward getActivityDefineLaterURL(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response)throws IOException,LamsToolServiceException{ + IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); + Long activityID = new Long(WebUtil.readLongParam(request,"activityID")); + Long lessonID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID)); + + String url = monitoringService.getActivityDefineLaterURL(lessonID,activityID); + return redirectToURL(mapping, response, url); + } + public ActionForward moveLesson(ActionMapping mapping, ActionForm form, HttpServletRequest request, Index: lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java =================================================================== diff -u -rc132bb7d3199254229dac8c10845eabea365c7e3 -r6b2751bb0a75d2d7d73b3297262dffd574d6b313 --- lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java (.../TestMonitoringService.java) (revision c132bb7d3199254229dac8c10845eabea365c7e3) +++ lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java (.../TestMonitoringService.java) (revision 6b2751bb0a75d2d7d73b3297262dffd574d6b313) @@ -257,8 +257,8 @@ System.out.println(packet); } public void testGetLearnerActivityURL() throws Exception{ - String packet = monitoringService.getLearnerActivityURL(TEST_LESSION_ID, new Long(29),TEST_LEARNER_ID); - System.out.println(packet); + String url = monitoringService.getLearnerActivityURL(TEST_LESSION_ID, new Long(29),TEST_LEARNER_ID); + System.out.println(url); } public void testGellAllContributeActivities()throws IOException, LearningDesignProcessorException{ String packet = monitoringService.getAllContributeActivities(TEST_LESSION_ID); Index: lams_monitoring/web/WEB-INF/struts/struts-config.xml =================================================================== diff -u -r580e9bb194e76263d8a5ff2132d20dc1876010e8 -r6b2751bb0a75d2d7d73b3297262dffd574d6b313 --- lams_monitoring/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 580e9bb194e76263d8a5ff2132d20dc1876010e8) +++ lams_monitoring/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 6b2751bb0a75d2d7d73b3297262dffd574d6b313) @@ -92,6 +92,11 @@ path="/previewdeleted.jsp" redirect="false" /> + - - - + - - + + + - - - - - - - - - - \ No newline at end of file Index: lams_monitoring/web/dummyDetail.jsp =================================================================== diff -u -r0d064806d262c256111bd37392a61e856d83caee -r6b2751bb0a75d2d7d73b3297262dffd574d6b313 --- lams_monitoring/web/dummyDetail.jsp (.../dummyDetail.jsp) (revision 0d064806d262c256111bd37392a61e856d83caee) +++ lams_monitoring/web/dummyDetail.jsp (.../dummyDetail.jsp) (revision 6b2751bb0a75d2d7d73b3297262dffd574d6b313) @@ -106,11 +106,11 @@ --> Activity : - &activityID=');"> + &activityID=');"> Monitor - &activityID=');"> + &activityID=');"> Define Later
@@ -128,11 +128,11 @@ Activity : - &activityID=');"> + &activityID=');"> Monitor - &activityID=');"> + &activityID=');"> Define Later
@@ -152,15 +152,15 @@ Current Activity: - &userID=&activityID=');">View + &userID=&activityID=');">View Completed Activities: - &userID=&activityID=');">View
+ &userID=&activityID=');">View
 Index: lams_monitoring/web/grouping/chosenGrouping.jsp =================================================================== diff -u -r580e9bb194e76263d8a5ff2132d20dc1876010e8 -r6b2751bb0a75d2d7d73b3297262dffd574d6b313 --- lams_monitoring/web/grouping/chosenGrouping.jsp (.../chosenGrouping.jsp) (revision 580e9bb194e76263d8a5ff2132d20dc1876010e8) +++ lams_monitoring/web/grouping/chosenGrouping.jsp (.../chosenGrouping.jsp) (revision 6b2751bb0a75d2d7d73b3297262dffd574d6b313) @@ -36,13 +36,16 @@ + + + +