Index: lams_tool_laqa/.mymetadata =================================================================== diff -u -r6582f99968f17e3e54b6f83230f6fe0b67b019e6 -r35717bc4f7da978b2c0a0f9a85a77d7b77f5670b --- lams_tool_laqa/.mymetadata (.../.mymetadata) (revision 6582f99968f17e3e54b6f83230f6fe0b67b019e6) +++ lams_tool_laqa/.mymetadata (.../.mymetadata) (revision 35717bc4f7da978b2c0a0f9a85a77d7b77f5670b) @@ -5,7 +5,7 @@ id="myeclipse.1133940888421" context-root="/lams_tool_laqa" j2ee-spec="1.4" - archive="lams_tool_lamc.war"> + archive="lams_tool_laqa.war"> Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties =================================================================== diff -u -r1f174bd80945a04023d087aba42b4041e450d557 -r35717bc4f7da978b2c0a0f9a85a77d7b77f5670b --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties (.../QaResources.properties) (revision 1f174bd80945a04023d087aba42b4041e450d557) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties (.../QaResources.properties) (revision 35717bc4f7da978b2c0a0f9a85a77d7b77f5670b) @@ -92,6 +92,7 @@ label.learning.qa =Answers for Q/A label.question =Question label.answers =Answers: +label.answer =Answer: button.endLearning =Finish label.learning.user =User label.learning.attemptTime =Attempt Date/Time Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java =================================================================== diff -u -r9df1d5a98cca04bad889e37e9e9bf91ade33b5fb -r35717bc4f7da978b2c0a0f9a85a77d7b77f5670b --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 9df1d5a98cca04bad889e37e9e9bf91ade33b5fb) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 35717bc4f7da978b2c0a0f9a85a77d7b77f5670b) @@ -149,6 +149,14 @@ List sessionsList=qaService.getSessionNamesFromContent(qaContent); logger.debug("sessionsList size is:..." + sessionsList.size()); + if (sessionsList.isEmpty()) + { + /* inform in the Summary tab that the tool has no active sessions */ + request.getSession().setAttribute(USER_EXCEPTION_NO_TOOL_SESSIONS, new Boolean(true).toString()); + logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to true"); + } + + Map sessionsMap=QaUtils.convertToStringMap(sessionsList, "String"); logger.debug("generated sessionsMap:..." + sessionsMap); logger.debug("sessionsMap size:..." + sessionsMap.size()); @@ -375,6 +383,7 @@ } return map; } + } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java =================================================================== diff -u -r394b0f24142992b4a38bd07797d6f439e51f0838 -r35717bc4f7da978b2c0a0f9a85a77d7b77f5670b --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java (.../QAction.java) (revision 394b0f24142992b4a38bd07797d6f439e51f0838) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java (.../QAction.java) (revision 35717bc4f7da978b2c0a0f9a85a77d7b77f5670b) @@ -236,14 +236,28 @@ } + public ActionForward editActivity(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws IOException, + ServletException + { + logger.debug("dispatching proxy editActivity..."); + //QaMonitoringAction qaMonitoringAction= new QaMonitoringAction(); + //return qaMonitoringAction.editActivity(mapping, form, request, response); + return null; + } + + public ActionForward getSummary(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { logger.debug("dispatching proxy getSummary...start with monitoringStarter" + request); - return null; + QaMonitoringAction qaMonitoringAction= new QaMonitoringAction(); + return qaMonitoringAction.getSummary(mapping, form, request, response); } @@ -254,8 +268,8 @@ ServletException { logger.debug("dispatching proxy getInstructions..." + request); - return null; - + QaMonitoringAction qaMonitoringAction= new QaMonitoringAction(); + return qaMonitoringAction.getInstructions(mapping, form, request, response); } public ActionForward getStats(ActionMapping mapping, @@ -265,7 +279,8 @@ ServletException { logger.debug("dispatching proxy getStats..." + request); - return null; + QaMonitoringAction qaMonitoringAction= new QaMonitoringAction(); + return qaMonitoringAction.getStats(mapping, form, request, response); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java =================================================================== diff -u -r394b0f24142992b4a38bd07797d6f439e51f0838 -r35717bc4f7da978b2c0a0f9a85a77d7b77f5670b --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java (.../QaMonitoringAction.java) (revision 394b0f24142992b4a38bd07797d6f439e51f0838) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java (.../QaMonitoringAction.java) (revision 35717bc4f7da978b2c0a0f9a85a77d7b77f5670b) @@ -88,6 +88,8 @@ ServletException { logger.debug("dispatching getStats..." + request); + + refreshStatsData(request); request.getSession().setAttribute(EDIT_RESPONSE, new Boolean(false)); request.getSession().setAttribute(CURRENT_MONITORING_TAB, "stats"); @@ -118,6 +120,23 @@ ServletException { logger.debug("dispatching getInstructions..." + request); + + IQaService qaService = (IQaService)request.getSession().getAttribute(TOOL_SERVICE); + logger.debug("qaService: " + qaService); + if (qaService == null) + { + logger.debug("will retrieve qaService"); + qaService = QaServiceProxy.getQaService(getServlet().getServletContext()); + logger.debug("retrieving qaService from session: " + qaService); + } + + Long toolContentId =(Long) request.getSession().getAttribute(TOOL_CONTENT_ID); + logger.debug("toolContentId: " + toolContentId); + + QaContent qaContent=qaService.loadQa(toolContentId.longValue()); + logger.debug("existing qaContent:" + qaContent); + + refreshInstructionsData(request, qaContent); request.getSession().setAttribute(EDIT_RESPONSE, new Boolean(false)); request.getSession().setAttribute(CURRENT_MONITORING_TAB, "instructions"); @@ -132,8 +151,7 @@ ServletException { logger.debug("dispatching editActivity..."); - QaMonitoringForm qaMonitoringForm = (QaMonitoringForm) form; - + IQaService qaService = (IQaService)request.getSession().getAttribute(TOOL_SERVICE); logger.debug("qaService: " + qaService); if (qaService == null) @@ -200,8 +218,14 @@ logger.debug("dispatching getSummary..." + request); request.getSession().setAttribute(EDIT_RESPONSE, new Boolean(false)); - IQaService qaService = (IQaService)request.getSession().getAttribute(TOOL_SERVICE); - logger.debug("qaService: " + qaService); + IQaService qaService = (IQaService)request.getSession().getAttribute(TOOL_SERVICE); + logger.debug("qaService: " + qaService); + if (qaService == null) + { + logger.debug("will retrieve qaService"); + qaService = QaServiceProxy.getQaService(getServlet().getServletContext()); + logger.debug("retrieving qaService from session: " + qaService); + } Long toolContentId =(Long) request.getSession().getAttribute(TOOL_CONTENT_ID); logger.debug("toolContentId: " + toolContentId); @@ -215,7 +239,8 @@ if (summaryToolSessions.isEmpty()) { /* inform in the Summary tab that the tool has no active sessions */ - request.setAttribute(USER_EXCEPTION_NO_TOOL_SESSIONS, new Boolean(true)); + request.getSession().setAttribute(USER_EXCEPTION_NO_TOOL_SESSIONS, new Boolean(true).toString()); + logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to true"); } request.getSession().setAttribute(SUMMARY_TOOL_SESSIONS, summaryToolSessions); @@ -435,5 +460,44 @@ return false; } } + + + public void refreshStatsData(HttpServletRequest request) + { + /* it is possible that no users has ever logged in for the activity yet*/ + IQaService qaService = (IQaService)request.getSession().getAttribute(TOOL_SERVICE); + logger.debug("qaService: " + qaService); + if (qaService == null) + { + logger.debug("will retrieve qaService"); + qaService = QaServiceProxy.getQaService(getServlet().getServletContext()); + logger.debug("retrieving qaService from session: " + qaService); + } + + int countAllUsers=qaService.getTotalNumberOfUsers(); + logger.debug("countAllUsers: " + countAllUsers); + + if (countAllUsers == 0) + { + logger.debug("error: countAllUsers is 0"); + request.getSession().setAttribute(USER_EXCEPTION_NO_STUDENT_ACTIVITY, new Boolean(true)); + } + + request.getSession().setAttribute(COUNT_ALL_USERS, new Integer(countAllUsers).toString()); + + int countSessionComplete=qaService.countSessionComplete(); + logger.debug("countSessionComplete: " + countSessionComplete); + request.getSession().setAttribute(COUNT_SESSION_COMPLETE, new Integer(countSessionComplete).toString()); + } + + + public void refreshInstructionsData(HttpServletRequest request, QaContent qaContent) + { + request.getSession().setAttribute(RICHTEXT_ONLINEINSTRUCTIONS,qaContent.getOnlineInstructions()); + request.getSession().setAttribute(RICHTEXT_OFFLINEINSTRUCTIONS,qaContent.getOfflineInstructions()); + } + + + } \ No newline at end of file Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java =================================================================== diff -u -rbe3dd87b1e0a6417681d6ba8e9c7cc432cedd2f7 -r35717bc4f7da978b2c0a0f9a85a77d7b77f5670b --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java (.../QaMonitoringStarterAction.java) (revision be3dd87b1e0a6417681d6ba8e9c7cc432cedd2f7) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java (.../QaMonitoringStarterAction.java) (revision 35717bc4f7da978b2c0a0f9a85a77d7b77f5670b) @@ -104,7 +104,8 @@ if (summaryToolSessions.isEmpty()) { /* inform in the Summary tab that the tool has no active sessions */ - request.setAttribute(USER_EXCEPTION_NO_TOOL_SESSIONS, new Boolean(true)); + request.setAttribute(USER_EXCEPTION_NO_TOOL_SESSIONS, new Boolean(true).toString()); + logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to true"); } request.getSession().setAttribute(SUMMARY_TOOL_SESSIONS, summaryToolSessions); @@ -127,31 +128,18 @@ logger.debug("LIST_MONITORED_ANSWERS_CONTAINER_DTO: " + request.getSession().getAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO)); /* ends here. */ + QaMonitoringAction qaMonitoringAction= new QaMonitoringAction(); + logger.debug("refreshing stats data..."); + qaMonitoringAction.refreshStatsData(request); + logger.debug("refreshing instructions data..."); + qaMonitoringAction.refreshInstructionsData(request, qaContent); - /* this section is related to Stats tab. Starts here. */ - /* it is possible that no users has ever logged in for the activity yet*/ - int countAllUsers=qaService.getTotalNumberOfUsers(); - logger.debug("countAllUsers: " + countAllUsers); - - if (countAllUsers == 0) - { - logger.debug("error: countAllUsers is 0"); - request.getSession().setAttribute(USER_EXCEPTION_NO_STUDENT_ACTIVITY, new Boolean(true)); - } - request.getSession().setAttribute(COUNT_ALL_USERS, new Integer(countAllUsers).toString()); - - int countSessionComplete=qaService.countSessionComplete(); - logger.debug("countSessionComplete: " + countSessionComplete); - request.getSession().setAttribute(COUNT_SESSION_COMPLETE, new Integer(countSessionComplete).toString()); - /* ends here. */ - /* this section is related to instructions tab. Starts here. */ - request.getSession().setAttribute(RICHTEXT_ONLINEINSTRUCTIONS,qaContent.getOnlineInstructions()); - request.getSession().setAttribute(RICHTEXT_OFFLINEINSTRUCTIONS,qaContent.getOfflineInstructions()); /* ends here. */ return true; } + /** * validates request paramaters based on tool contract Index: lams_tool_laqa/web/WEB-INF/struts-config.xml =================================================================== diff -u -r394b0f24142992b4a38bd07797d6f439e51f0838 -r35717bc4f7da978b2c0a0f9a85a77d7b77f5670b --- lams_tool_laqa/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 394b0f24142992b4a38bd07797d6f439e51f0838) +++ lams_tool_laqa/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 35717bc4f7da978b2c0a0f9a85a77d7b77f5670b) @@ -94,6 +94,12 @@ path="/AuthoringMaincontent.jsp" redirect="true" /> + + -
+
@@ -174,7 +174,7 @@ }"> -
+
Index: lams_tool_laqa/web/learning/CombinedAnswersContent.jsp =================================================================== diff -u -r1f174bd80945a04023d087aba42b4041e450d557 -r35717bc4f7da978b2c0a0f9a85a77d7b77f5670b --- lams_tool_laqa/web/learning/CombinedAnswersContent.jsp (.../CombinedAnswersContent.jsp) (revision 1f174bd80945a04023d087aba42b4041e450d557) +++ lams_tool_laqa/web/learning/CombinedAnswersContent.jsp (.../CombinedAnswersContent.jsp) (revision 35717bc4f7da978b2c0a0f9a85a77d7b77f5670b) @@ -31,12 +31,12 @@ - - + Index: lams_tool_laqa/web/learning/SequentialAnswersContent.jsp =================================================================== diff -u -rf2b7c28c53bfee9c676b5a836e42b71e0e1bf20f -r35717bc4f7da978b2c0a0f9a85a77d7b77f5670b --- lams_tool_laqa/web/learning/SequentialAnswersContent.jsp (.../SequentialAnswersContent.jsp) (revision f2b7c28c53bfee9c676b5a836e42b71e0e1bf20f) +++ lams_tool_laqa/web/learning/SequentialAnswersContent.jsp (.../SequentialAnswersContent.jsp) (revision 35717bc4f7da978b2c0a0f9a85a77d7b77f5670b) @@ -34,12 +34,12 @@ - + -
: + :
" size="60" maxlength="255" value=""/>
- - : + + :
Index: lams_tool_laqa/web/monitoring/MonitoringTabsHeader.jsp =================================================================== diff -u -r394b0f24142992b4a38bd07797d6f439e51f0838 -r35717bc4f7da978b2c0a0f9a85a77d7b77f5670b --- lams_tool_laqa/web/monitoring/MonitoringTabsHeader.jsp (.../MonitoringTabsHeader.jsp) (revision 394b0f24142992b4a38bd07797d6f439e51f0838) +++ lams_tool_laqa/web/monitoring/MonitoringTabsHeader.jsp (.../MonitoringTabsHeader.jsp) (revision 35717bc4f7da978b2c0a0f9a85a77d7b77f5670b) @@ -30,6 +30,10 @@ + + + +
@@ -44,10 +48,10 @@
images/aqua_tab_s_left.gif" name="tab_left_su" width="8" height="25" border="0" id="tab_left_su"/> + images/aqua_tab_s_right.gif" name="tab_right_su" width="8" height="25" border="0" id="tab_right_su"/>
@@ -58,10 +62,10 @@ images/aqua_tab_s_left.gif" name="tab_left_i" width="8" height="25" border="0" id="tab_left_i"/> - + images/aqua_tab_s_right.gif" name="tab_right_i" width="8" height="25" border="0" id="tab_right_i"/> @@ -73,10 +77,10 @@ images/aqua_tab_s_left.gif" name="tab_left_e" width="8" height="25" border="0" id="tab_left_e"/> - + images/aqua_tab_s_right.gif" name="tab_right_e" width="8" height="25" border="0" id="tab_right_e"/> @@ -88,10 +92,10 @@ images/aqua_tab_s_left.gif" name="tab_left_s" width="8" height="25" border="0" id="tab_left_s"/> - + images/aqua_tab_s_right.gif" name="tab_right_s" width="8" height="25" border="0" id="tab_right_s"/> Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp =================================================================== diff -u -r4beb496ffd830646c5752e770f04ca60e56ef231 -r35717bc4f7da978b2c0a0f9a85a77d7b77f5670b --- lams_tool_laqa/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision 4beb496ffd830646c5752e770f04ca60e56ef231) +++ lams_tool_laqa/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision 35717bc4f7da978b2c0a0f9a85a77d7b77f5670b) @@ -38,17 +38,18 @@

- +
- + + - + @@ -93,7 +94,7 @@
- +