Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java =================================================================== diff -u -r24cbd649c978f88f34f4e80b5d8ab8ab2faefdcc -r8640cefdf8862cb87ca9847afbf05b1e388f5ff7 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java (.../QaAppConstants.java) (revision 24cbd649c978f88f34f4e80b5d8ab8ab2faefdcc) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java (.../QaAppConstants.java) (revision 8640cefdf8862cb87ca9847afbf05b1e388f5ff7) @@ -83,6 +83,7 @@ public static final String REFLECTIONS_CONTAINER_DTO ="reflectionsContainerDTO"; public static final String LEARNER_NOTEBOOK ="learnerNotebook"; public static final String NOTEBOOK_ENTRIES_EXIST ="notebookEntriesExist"; + public static final String NO_SESSIONS_NOTEBOOK_ENTRIES_EXIST ="noSessionsNotebookEntriesExist"; public static final String QA_STATS_DTO ="qaStatsDTO"; public static final String LIST_ALL_GROUPS_DTO ="listAllGroupsDTO"; public static final String CURRENT_SESSION_NAME ="currentSessionName"; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java =================================================================== diff -u -r24cbd649c978f88f34f4e80b5d8ab8ab2faefdcc -r8640cefdf8862cb87ca9847afbf05b1e388f5ff7 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java (.../QaMonitoringAction.java) (revision 24cbd649c978f88f34f4e80b5d8ab8ab2faefdcc) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java (.../QaMonitoringAction.java) (revision 8640cefdf8862cb87ca9847afbf05b1e388f5ff7) @@ -810,6 +810,15 @@ if (notebookEntriesExist) { request.setAttribute(NOTEBOOK_ENTRIES_EXIST, new Boolean(true).toString()); + + String userExceptionNoToolSessions=(String)generalMonitoringDTO.getUserExceptionNoToolSessions(); + logger.debug("userExceptionNoToolSessions : " + userExceptionNoToolSessions); + + if (userExceptionNoToolSessions.equals("true")) + { + logger.debug("there are no online student activity but there are reflections : "); + request.setAttribute(NO_SESSIONS_NOTEBOOK_ENTRIES_EXIST, new Boolean(true).toString()); + } } else { @@ -2245,9 +2254,7 @@ return (mapping.findForward(LOAD_MONITORING)); } - - public ActionForward hideGroupResponse(ActionMapping mapping, ActionForm form, HttpServletRequest request, @@ -2415,9 +2422,25 @@ List attachmentList = qaService.retrieveQaUploadedFiles(qaContent); logger.debug("attachmentList: " + attachmentList); generalMonitoringDTO.setAttachmentList(attachmentList); + + + + if (qaService.studentActivityOccurredGlobal(qaContent)) + { + logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to false"); + generalMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(false).toString()); + } + else + { + logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to true"); + generalMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString()); + } + + logger.debug("final generalMonitoringDTO: " + generalMonitoringDTO ); request.setAttribute(QA_GENERAL_MONITORING_DTO, generalMonitoringDTO); + /*find out if there are any reflection entries, from here*/ boolean notebookEntriesExist=MonitoringUtil.notebookEntriesExist(qaService, qaContent); @@ -2426,6 +2449,15 @@ if (notebookEntriesExist) { request.setAttribute(NOTEBOOK_ENTRIES_EXIST, new Boolean(true).toString()); + + String userExceptionNoToolSessions=(String)generalMonitoringDTO.getUserExceptionNoToolSessions(); + logger.debug("userExceptionNoToolSessions : " + userExceptionNoToolSessions); + + if (userExceptionNoToolSessions.equals("true")) + { + logger.debug("there are no online student activity but there are reflections : "); + request.setAttribute(NO_SESSIONS_NOTEBOOK_ENTRIES_EXIST, new Boolean(true).toString()); + } } else { @@ -2677,6 +2709,15 @@ if (notebookEntriesExist) { request.setAttribute(NOTEBOOK_ENTRIES_EXIST, new Boolean(true).toString()); + + String userExceptionNoToolSessions=(String)qaGeneralMonitoringDTO.getUserExceptionNoToolSessions(); + logger.debug("userExceptionNoToolSessions : " + userExceptionNoToolSessions); + + if (userExceptionNoToolSessions.equals("true")) + { + logger.debug("there are no online student activity but there are reflections : "); + request.setAttribute(NO_SESSIONS_NOTEBOOK_ENTRIES_EXIST, new Boolean(true).toString()); + } } else { @@ -2934,6 +2975,15 @@ if (notebookEntriesExist) { request.setAttribute(NOTEBOOK_ENTRIES_EXIST, new Boolean(true).toString()); + + String userExceptionNoToolSessions=(String)qaGeneralMonitoringDTO.getUserExceptionNoToolSessions(); + logger.debug("userExceptionNoToolSessions : " + userExceptionNoToolSessions); + + if (userExceptionNoToolSessions.equals("true")) + { + logger.debug("there are no online student activity but there are reflections : "); + request.setAttribute(NO_SESSIONS_NOTEBOOK_ENTRIES_EXIST, new Boolean(true).toString()); + } } else { @@ -3123,6 +3173,15 @@ if (notebookEntriesExist) { request.setAttribute(NOTEBOOK_ENTRIES_EXIST, new Boolean(true).toString()); + + String userExceptionNoToolSessions=(String)qaGeneralMonitoringDTO.getUserExceptionNoToolSessions(); + logger.debug("userExceptionNoToolSessions : " + userExceptionNoToolSessions); + + if (userExceptionNoToolSessions.equals("true")) + { + logger.debug("there are no online student activity but there are reflections : "); + request.setAttribute(NO_SESSIONS_NOTEBOOK_ENTRIES_EXIST, new Boolean(true).toString()); + } } else { @@ -3240,6 +3299,15 @@ if (notebookEntriesExist) { request.setAttribute(NOTEBOOK_ENTRIES_EXIST, new Boolean(true).toString()); + + String userExceptionNoToolSessions=(String)qaGeneralMonitoringDTO.getUserExceptionNoToolSessions(); + logger.debug("userExceptionNoToolSessions : " + userExceptionNoToolSessions); + + if (userExceptionNoToolSessions.equals("true")) + { + logger.debug("there are no online student activity but there are reflections : "); + request.setAttribute(NO_SESSIONS_NOTEBOOK_ENTRIES_EXIST, new Boolean(true).toString()); + } } else { @@ -3398,6 +3466,16 @@ if (notebookEntriesExist) { request.setAttribute(NOTEBOOK_ENTRIES_EXIST, new Boolean(true).toString()); + + String userExceptionNoToolSessions=(String)qaGeneralMonitoringDTO.getUserExceptionNoToolSessions(); + logger.debug("userExceptionNoToolSessions : " + userExceptionNoToolSessions); + + if (userExceptionNoToolSessions.equals("true")) + { + logger.debug("there are no online student activity but there are reflections : "); + request.setAttribute(NO_SESSIONS_NOTEBOOK_ENTRIES_EXIST, new Boolean(true).toString()); + } + } else { @@ -3584,6 +3662,16 @@ if (notebookEntriesExist) { request.setAttribute(NOTEBOOK_ENTRIES_EXIST, new Boolean(true).toString()); + + String userExceptionNoToolSessions=(String)qaGeneralMonitoringDTO.getUserExceptionNoToolSessions(); + logger.debug("userExceptionNoToolSessions : " + userExceptionNoToolSessions); + + if (userExceptionNoToolSessions.equals("true")) + { + logger.debug("there are no online student activity but there are reflections : "); + request.setAttribute(NO_SESSIONS_NOTEBOOK_ENTRIES_EXIST, new Boolean(true).toString()); + } + } else { @@ -3743,6 +3831,16 @@ if (notebookEntriesExist) { request.setAttribute(NOTEBOOK_ENTRIES_EXIST, new Boolean(true).toString()); + + String userExceptionNoToolSessions=(String)qaGeneralMonitoringDTO.getUserExceptionNoToolSessions(); + logger.debug("userExceptionNoToolSessions : " + userExceptionNoToolSessions); + + if (userExceptionNoToolSessions.equals("true")) + { + logger.debug("there are no online student activity but there are reflections : "); + request.setAttribute(NO_SESSIONS_NOTEBOOK_ENTRIES_EXIST, new Boolean(true).toString()); + } + } else { @@ -3901,6 +3999,15 @@ if (notebookEntriesExist) { request.setAttribute(NOTEBOOK_ENTRIES_EXIST, new Boolean(true).toString()); + + String userExceptionNoToolSessions=(String)qaGeneralMonitoringDTO.getUserExceptionNoToolSessions(); + logger.debug("userExceptionNoToolSessions : " + userExceptionNoToolSessions); + + if (userExceptionNoToolSessions.equals("true")) + { + logger.debug("there are no online student activity but there are reflections : "); + request.setAttribute(NO_SESSIONS_NOTEBOOK_ENTRIES_EXIST, new Boolean(true).toString()); + } } else { Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java =================================================================== diff -u -r24cbd649c978f88f34f4e80b5d8ab8ab2faefdcc -r8640cefdf8862cb87ca9847afbf05b1e388f5ff7 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java (.../QaMonitoringStarterAction.java) (revision 24cbd649c978f88f34f4e80b5d8ab8ab2faefdcc) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java (.../QaMonitoringStarterAction.java) (revision 8640cefdf8862cb87ca9847afbf05b1e388f5ff7) @@ -150,7 +150,6 @@ { logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to false"); generalMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(false).toString()); - } else { @@ -236,11 +235,20 @@ if (notebookEntriesExist) { request.setAttribute(NOTEBOOK_ENTRIES_EXIST, new Boolean(true).toString()); + + String userExceptionNoToolSessions=(String)generalMonitoringDTO.getUserExceptionNoToolSessions(); + logger.debug("userExceptionNoToolSessions : " + userExceptionNoToolSessions); + + if (userExceptionNoToolSessions.equals("true")) + { + logger.debug("there are no online student activity but there are reflections : "); + request.setAttribute(NO_SESSIONS_NOTEBOOK_ENTRIES_EXIST, new Boolean(true).toString()); + } + } else { request.setAttribute(NOTEBOOK_ENTRIES_EXIST, new Boolean(false).toString()); - } MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); Index: lams_tool_laqa/web/monitoring/Reflections.jsp =================================================================== diff -u -r24cbd649c978f88f34f4e80b5d8ab8ab2faefdcc -r8640cefdf8862cb87ca9847afbf05b1e388f5ff7 --- lams_tool_laqa/web/monitoring/Reflections.jsp (.../Reflections.jsp) (revision 24cbd649c978f88f34f4e80b5d8ab8ab2faefdcc) +++ lams_tool_laqa/web/monitoring/Reflections.jsp (.../Reflections.jsp) (revision 8640cefdf8862cb87ca9847afbf05b1e388f5ff7) @@ -57,5 +57,5 @@ - + Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp =================================================================== diff -u -r24cbd649c978f88f34f4e80b5d8ab8ab2faefdcc -r8640cefdf8862cb87ca9847afbf05b1e388f5ff7 --- lams_tool_laqa/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision 24cbd649c978f88f34f4e80b5d8ab8ab2faefdcc) +++ lams_tool_laqa/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision 8640cefdf8862cb87ca9847afbf05b1e388f5ff7) @@ -35,6 +35,7 @@ + @@ -97,6 +98,12 @@ + + + + + + \ No newline at end of file