Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java =================================================================== diff -u -rc215962e5ad947b556b51a222c65893d31580f29 -r6aae05a339038bca1bc67564026097be3cf9cfd5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision c215962e5ad947b556b51a222c65893d31580f29) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 6aae05a339038bca1bc67564026097be3cf9cfd5) @@ -1033,7 +1033,6 @@ + e.getMessage(), e); } - } public User getCurrentUserData(String username) throws McApplicationException Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java =================================================================== diff -u -rc215962e5ad947b556b51a222c65893d31580f29 -r6aae05a339038bca1bc67564026097be3cf9cfd5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java (.../McMonitoringStarterAction.java) (revision c215962e5ad947b556b51a222c65893d31580f29) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java (.../McMonitoringStarterAction.java) (revision 6aae05a339038bca1bc67564026097be3cf9cfd5) @@ -28,7 +28,6 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.apache.log4j.Logger; import org.apache.struts.Globals; @@ -44,8 +43,6 @@ import org.lamsfoundation.lams.tool.mc.pojos.McContent; import org.lamsfoundation.lams.tool.mc.service.IMcService; import org.lamsfoundation.lams.tool.mc.service.McServiceProxy; -import org.lamsfoundation.lams.usermanagement.dto.UserDTO; -import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java =================================================================== diff -u -rade8f831292a12702670cf78c88345efc3572956 -r6aae05a339038bca1bc67564026097be3cf9cfd5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java (.../QaAppConstants.java) (revision ade8f831292a12702670cf78c88345efc3572956) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java (.../QaAppConstants.java) (revision 6aae05a339038bca1bc67564026097be3cf9cfd5) @@ -195,6 +195,7 @@ public static final String TO_TOOL_CONTENT_ID ="toToolContentId"; public static final String LEARNER_REPORT ="learnerRep"; public static final String REQUEST_LEARNING_REPORT ="requestLearningReport"; + public static final String REQUEST_PREVIEW ="requestPreview"; public static final String REQUEST_LEARNING_REPORT_VIEWONLY ="requestLearningReportViewOnly"; @@ -214,6 +215,7 @@ public static final String QUESTION_LISTING_MODE ="questionListingMode"; public static final String QUESTION_LISTING_MODE_SEQUENTIAL ="questionListingModeSequential"; + public static final String QUESTION_LISTING_MODE_PREVIEW ="questionListingModePreview"; public static final String QUESTION_LISTING_MODE_COMBINED ="questionListingModeCombined"; public static final String FEEDBACK_TYPE_SEQUENTIAL ="You will be presented a total of : "; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties =================================================================== diff -u -rade8f831292a12702670cf78c88345efc3572956 -r6aae05a339038bca1bc67564026097be3cf9cfd5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties (.../QaResources.properties) (revision ade8f831292a12702670cf78c88345efc3572956) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties (.../QaResources.properties) (revision 6aae05a339038bca1bc67564026097be3cf9cfd5) @@ -147,7 +147,8 @@ label.content.notEditable =The content can not be edited since it is being used by learners. label.learning.report =Learning Report -label.learning.viewOnly =Responses Report +label.learning.viewOnly =Previous Responses Report +label.preview =Preview Learner Screen label.openEditor =Open Richtext Editor label.user =User label.question.col =Question: Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java =================================================================== diff -u -rade8f831292a12702670cf78c88345efc3572956 -r6aae05a339038bca1bc67564026097be3cf9cfd5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java (.../QaUtils.java) (revision ade8f831292a12702670cf78c88345efc3572956) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java (.../QaUtils.java) (revision 6aae05a339038bca1bc67564026097be3cf9cfd5) @@ -528,6 +528,7 @@ request.getSession().removeAttribute(QUESTION_LISTING_MODE); request.getSession().removeAttribute(QUESTION_LISTING_MODE_SEQUENTIAL); request.getSession().removeAttribute(QUESTION_LISTING_MODE_COMBINED); + request.getSession().removeAttribute(QUESTION_LISTING_MODE_COMBINED); request.getSession().removeAttribute(FEEDBACK_TYPE_SEQUENTIAL); request.getSession().removeAttribute(FEEDBACK_TYPE_COMBINED); request.getSession().removeAttribute(QUESTIONS); @@ -549,8 +550,10 @@ request.getSession().removeAttribute(LOAD_MONITORING_CONTENT_EDITACTIVITY); request.getSession().removeAttribute(MONITORING_ORIGINATED_DEFINELATER); request.getSession().removeAttribute(REQUEST_LEARNING_REPORT); - request.getSession().removeAttribute(REQUEST_LEARNING_REPORT_VIEWONLY); + request.getSession().removeAttribute(REQUEST_LEARNING_REPORT_VIEWONLY); + request.getSession().removeAttribute(REQUEST_PREVIEW); + request.getSession().removeAttribute(USER_EXCEPTION_WRONG_FORMAT); request.getSession().removeAttribute(USER_EXCEPTION_UNCOMPATIBLE_IDS); request.getSession().removeAttribute(USER_EXCEPTION_NUMBERFORMAT); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java =================================================================== diff -u -rade8f831292a12702670cf78c88345efc3572956 -r6aae05a339038bca1bc67564026097be3cf9cfd5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java (.../QaLearningStarterAction.java) (revision ade8f831292a12702670cf78c88345efc3572956) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java (.../QaLearningStarterAction.java) (revision 6aae05a339038bca1bc67564026097be3cf9cfd5) @@ -131,6 +131,7 @@ /*initialize available question display modes in the session */ request.getSession().setAttribute(QUESTION_LISTING_MODE_SEQUENTIAL,QUESTION_LISTING_MODE_SEQUENTIAL); request.getSession().setAttribute(QUESTION_LISTING_MODE_COMBINED, QUESTION_LISTING_MODE_COMBINED); + request.getSession().setAttribute(QUESTION_LISTING_MODE_PREVIEW, QUESTION_LISTING_MODE_PREVIEW); IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext()); logger.debug("retrieving qaService: " + qaService); @@ -332,9 +333,6 @@ String userFeedback= feedBackType + request.getSession().getAttribute(TOTAL_QUESTION_COUNT) + QUESTIONS; request.getSession().setAttribute(USER_FEEDBACK, userFeedback); - - - /* Is the request for a preview by the author? Preview The tool must be able to show the specified content as if it was running in a lesson. It will be the learner url with tool access mode set to ToolAccessMode.AUTHOR @@ -353,8 +351,11 @@ /*complete this section */ logger.debug("Author requests for a preview of the content."); logger.debug("existing qaContent:" + qaContent); - - return (mapping.findForward(LEARNING_STARTER)); + + /* overwrite qiestionListing mode for preview*/ + request.getSession().setAttribute(QUESTION_LISTING_MODE, QUESTION_LISTING_MODE_PREVIEW); + logger.debug("forwarding to for preview: " + LOAD_LEARNER); + return (mapping.findForward(LOAD_LEARNER)); } /* by now, we know that the mode is either teacher or learner Index: lams_tool_laqa/web/learning/Preview.jsp =================================================================== diff -u --- lams_tool_laqa/web/learning/Preview.jsp (revision 0) +++ lams_tool_laqa/web/learning/Preview.jsp (revision 6aae05a339038bca1bc67564026097be3cf9cfd5) @@ -0,0 +1,48 @@ +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-lams" prefix="lams" %> + + + + + + + + + + + + + +
: + +
+ " size="60" maxlength="255" value=""/> +
 
+ + Index: lams_tool_laqa/web/learning/answersContent.jsp =================================================================== diff -u -rf2b7c28c53bfee9c676b5a836e42b71e0e1bf20f -r6aae05a339038bca1bc67564026097be3cf9cfd5 --- lams_tool_laqa/web/learning/answersContent.jsp (.../answersContent.jsp) (revision f2b7c28c53bfee9c676b5a836e42b71e0e1bf20f) +++ lams_tool_laqa/web/learning/answersContent.jsp (.../answersContent.jsp) (revision 6aae05a339038bca1bc67564026097be3cf9cfd5) @@ -30,19 +30,30 @@
- - - - - + + + + + + + + + + + +
- -
- -
- + +
+
+ +
+ +
+ +
@@ -63,14 +74,19 @@ + + + + +
- + \ No newline at end of file