Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralLearnerFlowDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralLearnerFlowDTO.java,v diff -u -r1.11 -r1.12 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralLearnerFlowDTO.java 10 Oct 2016 12:56:00 -0000 1.11 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralLearnerFlowDTO.java 17 Nov 2016 11:59:45 -0000 1.12 @@ -80,7 +80,7 @@ protected String userNameVisible; - protected String showOtherAnswers; + protected boolean showOtherAnswers; protected String requestLearningReport; @@ -111,8 +111,6 @@ protected String userUid; - protected String existMultipleUserResponses; - protected String usernameVisible; protected String allowRichEditor; @@ -679,15 +677,15 @@ /** * @return Returns the showOtherAnswers. */ - public String getShowOtherAnswers() { + public boolean getShowOtherAnswers() { return showOtherAnswers; } /** * @param showOtherAnswers * The showOtherAnswers to set. */ - public void setShowOtherAnswers(String showOtherAnswers) { + public void setShowOtherAnswers(boolean showOtherAnswers) { this.showOtherAnswers = showOtherAnswers; } @@ -706,21 +704,6 @@ this.userUid = userUid; } - /** - * @return Returns the existMultipleUserResponses. - */ - public String getExistMultipleUserResponses() { - return existMultipleUserResponses; - } - - /** - * @param existMultipleUserResponses - * The existMultipleUserResponses to set. - */ - public void setExistMultipleUserResponses(String existMultipleUserResponses) { - this.existMultipleUserResponses = existMultipleUserResponses; - } - public String getAllowRichEditor() { return allowRichEditor; } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java,v diff -u -r1.57 -r1.58 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java 10 Oct 2016 12:56:00 -0000 1.57 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java 17 Nov 2016 11:59:45 -0000 1.58 @@ -74,7 +74,7 @@ } generalLearnerFlowDTO.setUserNameVisible(new Boolean(qaContent.isUsernameVisible()).toString()); - generalLearnerFlowDTO.setShowOtherAnswers(new Boolean(qaContent.isShowOtherAnswers()).toString()); + generalLearnerFlowDTO.setShowOtherAnswers(qaContent.isShowOtherAnswers()); generalLearnerFlowDTO.setAllowRichEditor(new Boolean(qaContent.isAllowRichEditor()).toString()); generalLearnerFlowDTO .setUseSelectLeaderToolOuput(new Boolean(qaContent.isUseSelectLeaderToolOuput()).toString()); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java,v diff -u -r1.80 -r1.81 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java 10 Oct 2016 12:56:00 -0000 1.80 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java 17 Nov 2016 11:59:45 -0000 1.81 @@ -397,16 +397,6 @@ generalLearnerFlowDTO.setAllowRichEditor(new Boolean(allowRichEditor).toString()); generalLearnerFlowDTO.setUserUid(user.getQueUsrId().toString()); - int sessionUserCount = 0; - if (qaSession.getQaQueUsers() != null) { - sessionUserCount = qaSession.getQaQueUsers().size(); - } - - if (sessionUserCount > 1) { - // there are multiple user responses - generalLearnerFlowDTO.setExistMultipleUserResponses(new Boolean(true).toString()); - } - boolean usernameVisible = qaContent.isUsernameVisible(); generalLearnerFlowDTO.setUserNameVisible(new Boolean(usernameVisible).toString()); @@ -500,15 +490,6 @@ QaQueUsr qaQueUsr = getCurrentUser(toolSessionID); generalLearnerFlowDTO.setUserUid(qaQueUsr.getQueUsrId().toString()); - int sessionUserCount = 0; - if (qaSession.getQaQueUsers() != null) { - sessionUserCount = qaSession.getQaQueUsers().size(); - } - - if (sessionUserCount > 1) { - generalLearnerFlowDTO.setExistMultipleUserResponses(new Boolean(true).toString()); - } - boolean usernameVisible = qaContent.isUsernameVisible(); generalLearnerFlowDTO.setUserNameVisible(new Boolean(usernameVisible).toString()); @@ -822,16 +803,6 @@ QaLearningAction.refreshSummaryData(request, qaContent, QaLearningAction.qaService, httpSessionID, qaQueUsr, generalLearnerFlowDTO); - int sessionUserCount = 0; - if (qaSession.getQaQueUsers() != null) { - sessionUserCount = qaSession.getQaQueUsers().size(); - } - - if (sessionUserCount > 1) { - // there are multiple user responses - generalLearnerFlowDTO.setExistMultipleUserResponses(new Boolean(true).toString()); - } - boolean isLearnerFinished = qaQueUsr.isLearnerFinished(); generalLearnerFlowDTO.setRequestLearningReportViewOnly(new Boolean(isLearnerFinished).toString()); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java,v diff -u -r1.98 -r1.99 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java 10 Oct 2016 12:56:00 -0000 1.98 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java 17 Nov 2016 11:59:45 -0000 1.99 @@ -252,23 +252,7 @@ generalLearnerFlowDTO.setInitialScreen(new Boolean(true).toString()); request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO); - /* - * 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 - * 3 modes are: - * author - * teacher - * learner - */ - /* handling PREVIEW mode */ - if ((qaSession.getQaQueUsers() != null) && (qaSession.getQaQueUsers().size() > 1) - && !qaContent.isUseSelectLeaderToolOuput()) { - //there are multiple user responses - generalLearnerFlowDTO.setExistMultipleUserResponses(new Boolean(true).toString()); - } - /* * by now, we know that the mode is either teacher or learner * check if the mode is teacher and request is for Learner Progress Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/IndividualLearnerResults.jsp,v diff -u -r1.44 -r1.45 --- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp 20 Jun 2015 20:48:46 -0000 1.44 +++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp 17 Nov 2016 11:59:45 -0000 1.45 @@ -41,7 +41,7 @@ - +
@@ -103,14 +103,14 @@
- + - +
- +

Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp,v diff -u -r1.47 -r1.48 --- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp 10 Oct 2016 12:56:00 -0000 1.47 +++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp 17 Nov 2016 11:59:45 -0000 1.48 @@ -343,16 +343,15 @@
- - -
- - - -
+ +
+ + +
- +

Index: lams_tool_laqa/web/learning/mobile/IndividualLearnerResults.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/mobile/IndividualLearnerResults.jsp,v diff -u -r1.8 -r1.9 --- lams_tool_laqa/web/learning/mobile/IndividualLearnerResults.jsp 20 Jun 2015 20:48:46 -0000 1.8 +++ lams_tool_laqa/web/learning/mobile/IndividualLearnerResults.jsp 17 Nov 2016 11:59:45 -0000 1.9 @@ -65,7 +65,7 @@
- +
@@ -127,13 +127,13 @@