Index: lams_tool_laqa/conf/language/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/language/Attic/ApplicationResources.properties,v diff -u -r1.35 -r1.36 --- lams_tool_laqa/conf/language/ApplicationResources.properties 12 Sep 2006 12:11:00 -0000 1.35 +++ lams_tool_laqa/conf/language/ApplicationResources.properties 13 Sep 2006 15:29:05 -0000 1.36 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java,v diff -u -r1.48 -r1.49 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java 13 Sep 2006 11:31:37 -0000 1.48 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java 13 Sep 2006 15:29:06 -0000 1.49 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/defineLater.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_laqa/web/learning/defineLater.jsp 14 Jul 2006 05:02:37 -0000 1.1 +++ lams_tool_laqa/web/learning/defineLater.jsp 13 Sep 2006 15:29:06 -0000 1.2 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/SummaryContent.jsp,v diff -u -r1.28 -r1.29 --- lams_tool_laqa/web/monitoring/SummaryContent.jsp 13 Sep 2006 11:31:35 -0000 1.28 +++ lams_tool_laqa/web/monitoring/SummaryContent.jsp 13 Sep 2006 15:29:06 -0000 1.29 @@ -254,7 +254,7 @@ - +