Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties =================================================================== diff -u -re7b376ab647cc34726cd1dc3c572d3fd82e967c9 -r4c1831729bf38bebdd629cd0b4f427e61930ae01 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties (.../QaResources.properties) (revision e7b376ab647cc34726cd1dc3c572d3fd82e967c9) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties (.../QaResources.properties) (revision 4c1831729bf38bebdd629cd0b4f427e61930ae01) @@ -81,6 +81,7 @@ error.content.doesNotExist =Tool Activity Error! Can't continue. The content id passed to the Tool Activity does not refer to an existing content. error.toolSessions.doesNotExist =Tool Activity Error! Can't continue. One of the toolsession ids passed to the Tool Activity does not refer to an existing tool session. error.content.onlyContentAndNoSessions =A report can not be generated since no tool sessions has been passed to the Tool Activity. +error.content.noToolSessions =A report can not be generated since there has not been any student activity on this content. error.tab.contentId.required =Sorry, the screen is not available. The Tool Activity requires a content id. monitoring.feedback.instructionUpdate =The content has been updated successfully. Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java =================================================================== diff -u -r5ba75a338c76b23778bf80ab835209d38e2316cb -r4c1831729bf38bebdd629cd0b4f427e61930ae01 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java (.../QaMonitoringAction.java) (revision 5ba75a338c76b23778bf80ab835209d38e2316cb) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java (.../QaMonitoringAction.java) (revision 4c1831729bf38bebdd629cd0b4f427e61930ae01) @@ -131,7 +131,7 @@ { qaMonitoringForm.resetUserAction(); logger.debug("detected noToolSessionsAvailable:" + noToolSessionsAvailable); - persistError(request,"error.content.onlyContentAndNoSessions"); + persistError(request,"error.content.noToolSessions"); request.setAttribute(USER_EXCEPTION_ONLYCONTENT_ANDNOSESSIONS, new Boolean(true)); logger.debug("forwarding to: " + MONITORING_REPORT); return (mapping.findForward(MONITORING_REPORT)); @@ -603,7 +603,7 @@ { qaMonitoringForm.resetUserAction(); logger.debug("detected noToolSessionsAvailable:" + noToolSessionsAvailable); - persistError(request,"error.content.onlyContentAndNoSessions"); + persistError(request,"error.content.noToolSessions"); request.setAttribute(USER_EXCEPTION_ONLYCONTENT_ANDNOSESSIONS, new Boolean(true)); logger.debug("forwarding to: " + MONITORING_REPORT); return (mapping.findForward(MONITORING_REPORT)); Index: lams_tool_laqa/web/BasicContent.jsp =================================================================== diff -u -r13e8a854b878342109ba1b3f778e508934917115 -r4c1831729bf38bebdd629cd0b4f427e61930ae01 --- lams_tool_laqa/web/BasicContent.jsp (.../BasicContent.jsp) (revision 13e8a854b878342109ba1b3f778e508934917115) +++ lams_tool_laqa/web/BasicContent.jsp (.../BasicContent.jsp) (revision 4c1831729bf38bebdd629cd0b4f427e61930ae01) @@ -97,22 +97,14 @@ : - - - + - : + : test - - - + Index: lams_tool_laqa/web/InstructionsContent.jsp =================================================================== diff -u -r27a3ba4f41698f83ce6320d5b855329b1addd5eb -r4c1831729bf38bebdd629cd0b4f427e61930ae01 --- lams_tool_laqa/web/InstructionsContent.jsp (.../InstructionsContent.jsp) (revision 27a3ba4f41698f83ce6320d5b855329b1addd5eb) +++ lams_tool_laqa/web/InstructionsContent.jsp (.../InstructionsContent.jsp) (revision 4c1831729bf38bebdd629cd0b4f427e61930ae01) @@ -10,7 +10,7 @@
- + : - + : - + - - + - +
- + : - - - +
- + : - - - +
\ No newline at end of file