Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java =================================================================== diff -u -r29b508d4481abb4c95cbbf153b49f698c58f433b -r79328640316a242dc1494b35047fa82365d30b63 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java (.../QaAppConstants.java) (revision 29b508d4481abb4c95cbbf153b49f698c58f433b) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java (.../QaAppConstants.java) (revision 79328640316a242dc1494b35047fa82365d30b63) @@ -30,7 +30,7 @@ public static final long DEFAULT_CONTENT_ID =0; public static final long DEFAULT_QUE_CONTENT_ID =1; public static final String TOOL_SERVICE ="tool_service"; - public static final String ERROR_MCAPPLICATION = "error.exception.QaApplication"; + public static final String ERROR_QAAPPLICATION = "error.exception.QaApplication"; public static final String TOOL_CONTENT_ID = "toolContentID"; public static final String TARGET_MODE ="targetMode"; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties =================================================================== diff -u -r29b508d4481abb4c95cbbf153b49f698c58f433b -r79328640316a242dc1494b35047fa82365d30b63 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties (.../QaResources.properties) (revision 29b508d4481abb4c95cbbf153b49f698c58f433b) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties (.../QaResources.properties) (revision 79328640316a242dc1494b35047fa82365d30b63) @@ -29,6 +29,7 @@ label.offlineFiles =Offline Files: label.onlineFiles =Online Files: label.exportPortfolio.simple =Export Portfolio +label.exportPortfolio =Q/A Export Portfolio instructions.type.online =Online instructions.type.offline =Offline @@ -60,6 +61,7 @@ radiobox.forceOffline =Force Offline radiobox.usernameVisible =Username Visible radiobox.questionsSequenced =Questions Sequenced +radiobox.showFeedback =Show Feedback label.offlineInstructions =Offline Instructions label.onlineInstructions =Online Instructions label.offlineFiles =Offline Files: Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java =================================================================== diff -u -r17032ee407bc324b8b3a6121cb291b66cab7293a -r79328640316a242dc1494b35047fa82365d30b63 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java (.../QaUtils.java) (revision 17032ee407bc324b8b3a6121cb291b66cab7293a) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java (.../QaUtils.java) (revision 79328640316a242dc1494b35047fa82365d30b63) @@ -437,7 +437,7 @@ public static void cleanUpSessionAbsolute(HttpServletRequest request) { request.getSession().removeAttribute(MY_SIGNATURE); - request.getSession().removeAttribute(ERROR_MCAPPLICATION); + request.getSession().removeAttribute(ERROR_QAAPPLICATION); request.getSession().removeAttribute(TARGET_MODE); request.getSession().removeAttribute(TARGET_MODE_AUTHORING); request.getSession().removeAttribute(TARGET_MODE_LEARNING); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/CustomStrutsExceptionHandler.java =================================================================== diff -u -rf2b7c28c53bfee9c676b5a836e42b71e0e1bf20f -r79328640316a242dc1494b35047fa82365d30b63 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/CustomStrutsExceptionHandler.java (.../CustomStrutsExceptionHandler.java) (revision f2b7c28c53bfee9c676b5a836e42b71e0e1bf20f) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/CustomStrutsExceptionHandler.java (.../CustomStrutsExceptionHandler.java) (revision 79328640316a242dc1494b35047fa82365d30b63) @@ -73,7 +73,7 @@ logger.error("errorMessage: " + errorMessage); ActionMessage error = null; if (QaApplicationException.class.isInstance(ex) ) { - error = new ActionMessage(QaAppConstants.ERROR_MCAPPLICATION, errorMessage ); + error = new ActionMessage(QaAppConstants.ERROR_QAAPPLICATION, errorMessage ); } storeException(request, property, error, forward, ae.getScope( )); /* process the exception as normal */ Index: lams_tool_laqa/web/WEB-INF/struts-config.xml =================================================================== diff -u -r6bfa03ad456ce58485d7f46bf300ddaf54f64a89 -r79328640316a242dc1494b35047fa82365d30b63 --- lams_tool_laqa/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 6bfa03ad456ce58485d7f46bf300ddaf54f64a89) +++ lams_tool_laqa/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 79328640316a242dc1494b35047fa82365d30b63) @@ -16,6 +16,7 @@ + @@ -284,7 +285,30 @@ redirect="true" /> + + + + + + + Index: lams_tool_laqa/web/exportPortfolio.jsp =================================================================== diff -u -rf2b7c28c53bfee9c676b5a836e42b71e0e1bf20f -r79328640316a242dc1494b35047fa82365d30b63 --- lams_tool_laqa/web/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision f2b7c28c53bfee9c676b5a836e42b71e0e1bf20f) +++ lams_tool_laqa/web/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision 79328640316a242dc1494b35047fa82365d30b63) @@ -27,13 +27,11 @@ <%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> - <bean:message key="label.exportPortfolio"/> -

Index: lams_tool_laqa/web/learningIndex.jsp =================================================================== diff -u -rf2b7c28c53bfee9c676b5a836e42b71e0e1bf20f -r79328640316a242dc1494b35047fa82365d30b63 --- lams_tool_laqa/web/learningIndex.jsp (.../learningIndex.jsp) (revision f2b7c28c53bfee9c676b5a836e42b71e0e1bf20f) +++ lams_tool_laqa/web/learningIndex.jsp (.../learningIndex.jsp) (revision 79328640316a242dc1494b35047fa82365d30b63) @@ -47,6 +47,12 @@ String strLearnerProgress2="/learningStarter?toolSessionID=" + toolSessionID2 + "&mode=teacher" + "&userID=1"; String strLearnerProgress3="/learningStarter?toolSessionID=" + toolSessionID + "&mode=teacher" + "&userID=4"; String strLearnerProgress4="/learningStarter?toolSessionID=" + toolSessionID + "&mode=teacher" + "&userID=1"; + + String exportPortfolioStudent8 = "/exportPortfolio.do?mode=learner&toolSessionID=88888888&userID=4"; + String exportPortfolioStudent5 = "/exportPortfolio.do?mode=learner&toolSessionID=55555555&userID=1"; + + String exportPortfolioStudent9 = "/exportPortfolio.do?mode=learner&toolSessionID=55555555&userID=5"; + String exportPortfolioStudent10 = "/exportPortfolio.do?mode=learner&toolSessionID=88888888&userID=6"; %> @@ -128,4 +134,27 @@ + + +


+ +
+ + +


+ +
+ + + +


+ +
+ + + +


+ +
+