Index: lams_tool_laqa/conf/language/ApplicationResources.properties =================================================================== diff -u -ra75e559b98560312e36c4c9c546ee548460a8391 -rbb4caab788005b26d49b5caecae5fac3043d162a --- lams_tool_laqa/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision a75e559b98560312e36c4c9c546ee548460a8391) +++ lams_tool_laqa/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision bb4caab788005b26d49b5caecae5fac3043d162a) @@ -146,6 +146,7 @@ label.close =Close label.other.answers =Other learners answers label.learners.answers = Learners' answers +label.include.runOffline = (including runoffline activities) #======= End labels: Exported 140 labels for en AU ===== Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java =================================================================== diff -u -r1518349487f89cd30e6e04c40e0742e1c1f3d5ab -rbb4caab788005b26d49b5caecae5fac3043d162a --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java (.../QaMonitoringAction.java) (revision 1518349487f89cd30e6e04c40e0742e1c1f3d5ab) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java (.../QaMonitoringAction.java) (revision bb4caab788005b26d49b5caecae5fac3043d162a) @@ -607,6 +607,7 @@ preparEditActivityScreenData(request, qaContent); + prepareReflectionData(request, qaContent, qaService, null, false); if (qaService.studentActivityOccurredGlobal(qaContent)) { @@ -736,6 +737,7 @@ logger.debug("final generalMonitoringDTO: " + qaGeneralMonitoringDTO ); request.setAttribute(QA_GENERAL_MONITORING_DTO, qaGeneralMonitoringDTO); + prepareReflectionData(request, qaContent, qaService, null, false); logger.debug("fwd ing to LOAD_MONITORING: " + LOAD_MONITORING); return (mapping.findForward(LOAD_MONITORING)); @@ -845,6 +847,8 @@ logger.debug("final generalMonitoringDTO: " + qaGeneralMonitoringDTO ); request.setAttribute(QA_GENERAL_MONITORING_DTO, qaGeneralMonitoringDTO); + prepareReflectionData(request, qaContent, qaService, null, false); + logger.debug("fwd ing to LOAD_MONITORING: " + LOAD_MONITORING); return (mapping.findForward(LOAD_MONITORING)); } @@ -978,6 +982,8 @@ logger.debug("final generalMonitoringDTO: " + qaGeneralMonitoringDTO ); request.setAttribute(QA_GENERAL_MONITORING_DTO, qaGeneralMonitoringDTO); + prepareReflectionData(request, qaContent, qaService, null, false); + return mapping.findForward(LOAD_MONITORING); } Index: lams_tool_laqa/web/learning/defineLater.jsp =================================================================== diff -u -r9393c098e5dfd603e2d37347cd1e531a25aa424a -rbb4caab788005b26d49b5caecae5fac3043d162a --- lams_tool_laqa/web/learning/defineLater.jsp (.../defineLater.jsp) (revision 9393c098e5dfd603e2d37347cd1e531a25aa424a) +++ lams_tool_laqa/web/learning/defineLater.jsp (.../defineLater.jsp) (revision bb4caab788005b26d49b5caecae5fac3043d162a) @@ -1,3 +1,4 @@ + <%-- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) License Information: http://lamsfoundation.org/licensing/lams/2.0/ @@ -24,10 +25,10 @@ <%@ include file="/common/taglibs.jsp"%> - + - + @@ -63,3 +64,4 @@ + Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp =================================================================== diff -u -r1518349487f89cd30e6e04c40e0742e1c1f3d5ab -rbb4caab788005b26d49b5caecae5fac3043d162a --- lams_tool_laqa/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision 1518349487f89cd30e6e04c40e0742e1c1f3d5ab) +++ lams_tool_laqa/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision bb4caab788005b26d49b5caecae5fac3043d162a) @@ -254,7 +254,7 @@ - +