Index: lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.52 -r1.53 --- lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties 14 Jun 2016 13:23:23 -0000 1.52 +++ lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties 29 Sep 2016 11:59:11 -0000 1.53 @@ -1,9 +1,6 @@ appName = mcq #language code: en -#locale code: AU - - - +#locale code: AU #=================== labels for Multiple Choice Questions =================# activity.title =Multiple Choice Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java,v diff -u -r1.118 -r1.119 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java 12 Sep 2016 13:31:08 -0000 1.118 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java 29 Sep 2016 11:59:10 -0000 1.119 @@ -43,13 +43,10 @@ public static final String LOAD_MONITORING_CONTENT_EDITACTIVITY = "loadMonitoringEditActivity"; public static final String LIST_ALL_GROUPS_DTO = "listAllGroupsDTO"; public static final String EXPORT_PORTFOLIO = "exportPortfolio"; - public static final String INDIVIDUAL_REPORT = "individualReport"; public static final String REDO_QUESTIONS = "redoQuestions"; public static final String SINGLE_QUESTION_ANSWERS = "singleQuestionAnswers"; public static final String ERROR_LIST = "errorList"; public static final String PREVIEW = "preview"; - public static final String LEARNER_PROGRESS = "learnerProgress"; - public static final String LEARNER_PROGRESS_USERID = "learnerProgressUserId"; public static final String ACTIVITY_TITLE_KEY = "activityTitleKey"; public static final String ACTIVITY_INSTRUCTIONS_KEY = "activityInstructionsKey"; public static final String LIST_QUESTION_DTOS = "listQuestionContentDTO"; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java,v diff -u -r1.23 -r1.24 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java 12 Sep 2016 13:31:08 -0000 1.23 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java 29 Sep 2016 11:59:10 -0000 1.24 @@ -57,8 +57,6 @@ protected String activityTitle; - protected Integer latestAttemptMark; - protected Integer currentQuestionIndex; protected String countSessionComplete; @@ -77,10 +75,6 @@ protected Integer averageMark; - protected String learnerProgress; - - protected String learnerProgressUserId; - protected String showMarks; protected String displayAnswers; @@ -237,21 +231,6 @@ } /** - * @return Returns the LatestAttemptMark. - */ - public Integer getLatestAttemptMark() { - return latestAttemptMark; - } - - /** - * @param learnerBestMark - * The learnerBestMark to set. - */ - public void setLatestAttemptMark(Integer latestAttemptMark) { - this.latestAttemptMark = latestAttemptMark; - } - - /** * @return Returns the activityInstructions. */ public String getActivityInstructions() { @@ -375,10 +354,9 @@ .append("passMarkApplicable: ", passMarkApplicable).append("userPassed: ", userPassed) .append("userOverPassMark: ", userOverPassMark).append("reportTitleLearner: ", reportTitleLearner) .append("activityInstructions: ", activityInstructions).append("activityTitle: ", activityTitle) - .append("learnerProgress: ", learnerProgress).append("displayAnswers: ", displayAnswers) - .append("reflection: ", reflection).append("reflectionSubject: ", reflectionSubject) - .append("notebookEntry: ", notebookEntry).append("notebookEntriesVisible: ", notebookEntriesVisible) - .toString(); + .append("displayAnswers: ", displayAnswers).append("reflection: ", reflection) + .append("reflectionSubject: ", reflectionSubject).append("notebookEntry: ", notebookEntry) + .append("notebookEntriesVisible: ", notebookEntriesVisible).toString(); } /** @@ -442,36 +420,6 @@ } /** - * @return Returns the learnerProgress. - */ - public String getLearnerProgress() { - return learnerProgress; - } - - /** - * @param learnerProgress - * The learnerProgress to set. - */ - public void setLearnerProgress(String learnerProgress) { - this.learnerProgress = learnerProgress; - } - - /** - * @return Returns the learnerProgressUserId. - */ - public String getLearnerProgressUserId() { - return learnerProgressUserId; - } - - /** - * @param learnerProgressUserId - * The learnerProgressUserId to set. - */ - public void setLearnerProgressUserId(String learnerProgressUserId) { - this.learnerProgressUserId = learnerProgressUserId; - } - - /** * @return Returns the mapQuestionsContent. */ public Map getMapQuestionsContent() { Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java,v diff -u -r1.66 -r1.67 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java 12 Sep 2016 13:31:07 -0000 1.66 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java 29 Sep 2016 11:59:10 -0000 1.67 @@ -48,13 +48,10 @@ request.getSession().removeAttribute("monitoringStarter"); request.getSession().removeAttribute(LOAD_LEARNER); request.getSession().removeAttribute(LOAD_MONITORING_CONTENT); - request.getSession().removeAttribute(INDIVIDUAL_REPORT); request.getSession().removeAttribute(REDO_QUESTIONS); request.getSession().removeAttribute(SINGLE_QUESTION_ANSWERS); request.getSession().removeAttribute(ERROR_LIST); request.getSession().removeAttribute(PREVIEW); - request.getSession().removeAttribute(LEARNER_PROGRESS); - request.getSession().removeAttribute(LEARNER_PROGRESS_USERID); request.getSession().removeAttribute(AUTHORING_CANCELLED); request.getSession().removeAttribute(DEFINE_LATER_EDIT_ACTIVITY); request.getSession().removeAttribute(EDIT_OPTIONS_MODE); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java,v diff -u -r1.58 -r1.59 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java 12 Sep 2016 13:31:08 -0000 1.58 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java 29 Sep 2016 11:59:10 -0000 1.59 @@ -38,16 +38,11 @@ * Keeps all operations needed for Authoring mode. * * @author Ozgur Demirtas - * */ public class LearningUtil implements McAppConstants { static Logger logger = Logger.getLogger(LearningUtil.class.getName()); - /** - * - */ - public static void saveFormRequestData(HttpServletRequest request, McLearningForm mcLearningForm, - boolean prepareViewAnswersDataMode) { + public static void saveFormRequestData(HttpServletRequest request, McLearningForm mcLearningForm) { String httpSessionID = request.getParameter("httpSessionID"); mcLearningForm.setHttpSessionID(httpSessionID); @@ -57,13 +52,6 @@ String userOverPassMark = request.getParameter("userOverPassMark"); mcLearningForm.setUserOverPassMark(userOverPassMark); - - if (prepareViewAnswersDataMode == false) { - String learnerProgress = request.getParameter("learnerProgress"); - mcLearningForm.setLearnerProgress(learnerProgress); - String learnerProgressUserId = request.getParameter("learnerProgressUserId"); - mcLearningForm.setLearnerProgressUserId(learnerProgressUserId); - } } /** @@ -76,7 +64,6 @@ mcGeneralLearnerFlowDTO.setActivityInstructions(mcContent.getInstructions()); mcGeneralLearnerFlowDTO.setPassMark(mcContent.getPassMark()); mcGeneralLearnerFlowDTO.setReportTitleLearner("Report"); - mcGeneralLearnerFlowDTO.setLearnerProgress(new Boolean(false).toString()); mcGeneralLearnerFlowDTO.setTotalQuestionCount(new Integer(mcContent.getMcQueContents().size())); return mcGeneralLearnerFlowDTO; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java,v diff -u -r1.88 -r1.89 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java 12 Sep 2016 13:31:08 -0000 1.88 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java 29 Sep 2016 11:59:10 -0000 1.89 @@ -84,7 +84,7 @@ public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { McLearningForm mcLearningForm = (McLearningForm) form; - LearningUtil.saveFormRequestData(request, mcLearningForm, false); + LearningUtil.saveFormRequestData(request, mcLearningForm); return null; } @@ -114,7 +114,7 @@ String toolContentId = mcSession.getMcContent().getMcContentId().toString(); mcLearningForm.setToolContentID(toolContentId); - LearningUtil.saveFormRequestData(request, mcLearningForm, false); + LearningUtil.saveFormRequestData(request, mcLearningForm); if (mcLearningForm.getNextQuestionSelected() != null && !mcLearningForm.getNextQuestionSelected().equals("")) { mcLearningForm.resetParameters(); @@ -127,7 +127,6 @@ } else if (mcLearningForm.getRedoQuestions() != null) { return redoQuestions(request, mcLearningForm, mapping); } else if (mcLearningForm.getViewAnswers() != null) { - mcLearningForm.setLearnerProgress(new Boolean(false).toString()); return viewAnswers(mapping, mcLearningForm, request, response); } else if (mcLearningForm.getSubmitReflection() != null) { return submitReflection(mapping, form, request, response); @@ -168,7 +167,7 @@ String toolContentId = mcSession.getMcContent().getMcContentId().toString(); mcLearningForm.setToolContentID(toolContentId); - LearningUtil.saveFormRequestData(request, mcLearningForm, false); + LearningUtil.saveFormRequestData(request, mcLearningForm); // requested learner finished, the learner should be directed to next activity HttpSession ss = SessionManager.getSession(); @@ -280,55 +279,20 @@ /* process the answers */ List answerDtos = buildAnswerDtos(answers, mcContent); mcService.saveUserAttempt(user, answerDtos); - request.setAttribute(McAppConstants.ANSWER_DTOS, answerDtos); //calculate total learner mark int learnerMark = 0; for (AnswerDTO answerDto : answerDtos) { learnerMark += answerDto.getMark(); } - McGeneralLearnerFlowDTO mcGeneralLearnerFlowDTO = LearningUtil.buildMcGeneralLearnerFlowDTO(mcContent); - mcGeneralLearnerFlowDTO.setLearnerMark(learnerMark); - mcGeneralLearnerFlowDTO.setTotalQuestionCount(mcContent.getMcQueContents().size()); - mcGeneralLearnerFlowDTO.setTotalMarksPossible(mcContent.getTotalMarksPossible()); - - // Have to work out in advance if passed so that we can store it against the attempts - boolean passed = user.isMarkPassed(learnerMark); - mcGeneralLearnerFlowDTO.setUserOverPassMark(new Boolean(passed).toString()); - mcGeneralLearnerFlowDTO.setPassMarkApplicable(new Boolean(mcContent.getPassMark() != null).toString()); - - Integer numberOfAttempts = user.getNumberOfAttempts() + 1; user.setNumberOfAttempts(numberOfAttempts); user.setLastAttemptTotalMark(learnerMark); user.setResponseFinalised(true); mcService.updateMcQueUsr(user); - mcGeneralLearnerFlowDTO.setDisplayAnswers(new Boolean(mcContent.isDisplayAnswers()).toString()); - - mcGeneralLearnerFlowDTO.setShowMarks(new Boolean(mcContent.isShowMarks()).toString()); - if (mcContent.isShowMarks()) { - Integer[] markStatistics = mcService.getMarkStatistics(session); - mcGeneralLearnerFlowDTO.setTopMark(markStatistics[0]); - mcGeneralLearnerFlowDTO.setLowestMark(markStatistics[1]); - mcGeneralLearnerFlowDTO.setAverageMark(markStatistics[2]); - } else { - mcGeneralLearnerFlowDTO.setTopMark(0); - mcGeneralLearnerFlowDTO.setLowestMark(0); - mcGeneralLearnerFlowDTO.setAverageMark(0); - } - - mcGeneralLearnerFlowDTO.setReflection(new Boolean(mcContent.isReflect()).toString()); - - //String reflectionSubject = McUtils.replaceNewLines(mcContent.getReflectionSubject()); - mcGeneralLearnerFlowDTO.setReflectionSubject(mcContent.getReflectionSubject()); - - mcGeneralLearnerFlowDTO.setLatestAttemptMark(user.getLastAttemptTotalMark()); - - request.setAttribute(McAppConstants.MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO); - - return mapping.findForward(McAppConstants.INDIVIDUAL_REPORT); + return viewAnswers(mapping, mcLearningForm, request, response); } /** @@ -422,6 +386,9 @@ String toolContentId = mcSession.getMcContent().getMcContentId().toString(); McContent mcContent = mcService.getMcContent(new Long(toolContentId)); + + String sessionMapID = mcLearningForm.getHttpSessionID(); + request.setAttribute("sessionMapID", sessionMapID); McGeneralLearnerFlowDTO mcGeneralLearnerFlowDTO = LearningUtil.buildMcGeneralLearnerFlowDTO(mcContent); @@ -489,31 +456,16 @@ } mcGeneralLearnerFlowDTO.setMapFeedbackContent(mapFeedbackContent); - // Set up the user details. If this is the learner progress screen then we that id, - // otherwise we use the user from the session. + McQueUsr user = getCurrentUser(toolSessionID); - String learnerProgress = mcLearningForm.getLearnerProgress(); - String learnerProgressUserId = mcLearningForm.getLearnerProgressUserId(); - mcGeneralLearnerFlowDTO.setLearnerProgressUserId(learnerProgressUserId); - mcGeneralLearnerFlowDTO.setLearnerProgress(learnerProgress); - - Boolean learnerProgressOn = Boolean.parseBoolean(learnerProgress); - - McQueUsr mcQueUsr = null; - if (learnerProgressOn.equals(Boolean.FALSE)) { - mcQueUsr = getCurrentUser(toolSessionID); - } else { - mcQueUsr = mcService.getMcUserBySession(new Long(learnerProgressUserId), mcSession.getUid()); - } - Long toolContentUID = mcContent.getUid(); //create attemptMap for displaying on jsp Map attemptMap = new TreeMap(new McComparator()); for (int i = 1; i <= mcContent.getMcQueContents().size(); i++) { McQueContent question = mcService.getQuestionByDisplayOrder(new Long(i), toolContentUID); - McUsrAttempt userAttempt = mcService.getUserAttemptByQuestion(mcQueUsr.getUid(), question.getUid()); + McUsrAttempt userAttempt = mcService.getUserAttemptByQuestion(user.getUid(), question.getUid()); if (userAttempt != null) { attemptMap.put(new Integer(i).toString(), userAttempt); @@ -524,27 +476,30 @@ mcGeneralLearnerFlowDTO.setReflectionSubject(mcContent.getReflectionSubject()); NotebookEntry notebookEntry = mcService.getEntry(new Long(toolSessionID), CoreNotebookConstants.NOTEBOOK_TOOL, - McAppConstants.MY_SIGNATURE, new Integer(mcQueUsr.getQueUsrId().intValue())); + McAppConstants.MY_SIGNATURE, new Integer(user.getQueUsrId().intValue())); + request.setAttribute("notebookEntry", notebookEntry); if (notebookEntry != null) { mcGeneralLearnerFlowDTO.setNotebookEntry(notebookEntry.getEntry()); } mcGeneralLearnerFlowDTO.setRetries(new Boolean(mcContent.isRetries()).toString()); mcGeneralLearnerFlowDTO.setPassMarkApplicable(new Boolean(mcContent.isPassMarkApplicable()).toString()); - mcGeneralLearnerFlowDTO.setUserOverPassMark(new Boolean(mcQueUsr.isLastAttemptMarkPassed()).toString()); + mcGeneralLearnerFlowDTO.setUserOverPassMark(new Boolean(user.isLastAttemptMarkPassed()).toString()); mcGeneralLearnerFlowDTO.setTotalMarksPossible(mcContent.getTotalMarksPossible()); mcGeneralLearnerFlowDTO.setShowMarks(new Boolean(mcContent.isShowMarks()).toString()); mcGeneralLearnerFlowDTO.setDisplayAnswers(new Boolean(mcContent.isDisplayAnswers()).toString()); + mcGeneralLearnerFlowDTO.setLearnerMark(user.getLastAttemptTotalMark()); + if (mcContent.isShowMarks()) { Integer[] markStatistics = mcService.getMarkStatistics(mcSession); mcGeneralLearnerFlowDTO.setTopMark(markStatistics[0]); mcGeneralLearnerFlowDTO.setLowestMark(markStatistics[1]); mcGeneralLearnerFlowDTO.setAverageMark(markStatistics[2]); + } else { - Integer zero = new Integer(0); - mcGeneralLearnerFlowDTO.setTopMark(zero); - mcGeneralLearnerFlowDTO.setLowestMark(zero); - mcGeneralLearnerFlowDTO.setAverageMark(zero); + mcGeneralLearnerFlowDTO.setTopMark(0); + mcGeneralLearnerFlowDTO.setLowestMark(0); + mcGeneralLearnerFlowDTO.setAverageMark(0); } request.setAttribute(McAppConstants.MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java,v diff -u -r1.35 -r1.36 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java 12 Sep 2016 13:31:08 -0000 1.35 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java 29 Sep 2016 11:59:10 -0000 1.36 @@ -41,8 +41,6 @@ protected String redoQuestions; protected String viewAnswers; protected String learnerFinished; - protected String donePreview; - protected String doneLearnerProgress; protected String submitReflection; protected String forwardtoReflection; @@ -60,8 +58,6 @@ /** put tghese under SessionMap */ protected String userOverPassMark; protected String passMarkApplicable; - protected String learnerProgress; - protected String learnerProgressUserId; protected String entryText; @@ -85,8 +81,6 @@ this.setRedoQuestions(null); this.setViewAnswers(null); this.setLearnerFinished(null); - this.setDonePreview(null); - this.setDoneLearnerProgress(null); } public void resetParameters() { @@ -184,36 +178,6 @@ } /** - * @return Returns the donePreview. - */ - public String getDonePreview() { - return donePreview; - } - - /** - * @param donePreview - * The donePreview to set. - */ - public void setDonePreview(String donePreview) { - this.donePreview = donePreview; - } - - /** - * @return Returns the doneLearnerProgress. - */ - public String getDoneLearnerProgress() { - return doneLearnerProgress; - } - - /** - * @param doneLearnerProgress - * The doneLearnerProgress to set. - */ - public void setDoneLearnerProgress(String doneLearnerProgress) { - this.doneLearnerProgress = doneLearnerProgress; - } - - /** * @return Returns the userOverPassMark. */ public String getUserOverPassMark() { @@ -304,36 +268,6 @@ } /** - * @return Returns the learnerProgress. - */ - public String getLearnerProgress() { - return learnerProgress; - } - - /** - * @param learnerProgress - * The learnerProgress to set. - */ - public void setLearnerProgress(String learnerProgress) { - this.learnerProgress = learnerProgress; - } - - /** - * @return Returns the learnerProgressUserId. - */ - public String getLearnerProgressUserId() { - return learnerProgressUserId; - } - - /** - * @param learnerProgressUserId - * The learnerProgressUserId to set. - */ - public void setLearnerProgressUserId(String learnerProgressUserId) { - this.learnerProgressUserId = learnerProgressUserId; - } - - /** * @return Returns the nextQuestionSelected. */ public String getNextQuestionSelected() { Index: lams_tool_lamc/web/WEB-INF/struts-config.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/struts-config.xml,v diff -u -r1.71 -r1.72 --- lams_tool_lamc/web/WEB-INF/struts-config.xml 16 Aug 2016 08:30:07 -0000 1.71 +++ lams_tool_lamc/web/WEB-INF/struts-config.xml 29 Sep 2016 11:59:10 -0000 1.72 @@ -236,12 +236,6 @@ /> - - - - - + <%@ include file="/common/messages.jsp"%> Index: lams_tool_lamc/web/learning/CombinedAnswersContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/CombinedAnswersContent.jsp,v diff -u -r1.37 -r1.38 --- lams_tool_lamc/web/learning/CombinedAnswersContent.jsp 12 Sep 2016 13:31:07 -0000 1.37 +++ lams_tool_lamc/web/learning/CombinedAnswersContent.jsp 29 Sep 2016 11:59:10 -0000 1.38 @@ -88,8 +88,6 @@ - -
Fisheye: Tag 1.60 refers to a dead (removed) revision in file `lams_tool_lamc/web/learning/IndividualLearnerResults.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp,v diff -u -r1.36 -r1.37 --- lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp 12 Sep 2016 13:31:07 -0000 1.36 +++ lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp 29 Sep 2016 11:59:10 -0000 1.37 @@ -79,8 +79,6 @@ - -
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/ViewAnswers.jsp,v diff -u -r1.71 -r1.72 --- lams_tool_lamc/web/learning/ViewAnswers.jsp 12 Sep 2016 13:31:07 -0000 1.71 +++ lams_tool_lamc/web/learning/ViewAnswers.jsp 29 Sep 2016 11:59:10 -0000 1.72 @@ -48,25 +48,41 @@ + + +

+ + + + + + + + + + + +

+

+ + + + +

+ - + - -

- - - - - - - +

@@ -139,6 +155,15 @@ + +

+ + + + +

+ +

@@ -163,15 +188,15 @@ - + - + - +

@@ -186,43 +211,37 @@

- - - + -
- - +
+ + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - -
+ + + + + +
- - -

- -

Index: lams_tool_lamc/web/learning/mobile/AnswersContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/mobile/AnswersContent.jsp,v diff -u -r1.15 -r1.16 --- lams_tool_lamc/web/learning/mobile/AnswersContent.jsp 12 Sep 2016 13:31:07 -0000 1.15 +++ lams_tool_lamc/web/learning/mobile/AnswersContent.jsp 29 Sep 2016 11:59:10 -0000 1.16 @@ -124,9 +124,7 @@ - - - + <%@ include file="/common/messages.jsp"%> Index: lams_tool_lamc/web/learning/mobile/CombinedAnswersContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/mobile/CombinedAnswersContent.jsp,v diff -u -r1.8 -r1.9 --- lams_tool_lamc/web/learning/mobile/CombinedAnswersContent.jsp 12 Sep 2016 13:31:07 -0000 1.8 +++ lams_tool_lamc/web/learning/mobile/CombinedAnswersContent.jsp 29 Sep 2016 11:59:10 -0000 1.9 @@ -80,8 +80,6 @@ - -
Fisheye: Tag 1.11 refers to a dead (removed) revision in file `lams_tool_lamc/web/learning/mobile/IndividualLearnerResults.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/web/learning/mobile/SingleQuestionAnswersContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/mobile/SingleQuestionAnswersContent.jsp,v diff -u -r1.8 -r1.9 --- lams_tool_lamc/web/learning/mobile/SingleQuestionAnswersContent.jsp 12 Sep 2016 13:31:07 -0000 1.8 +++ lams_tool_lamc/web/learning/mobile/SingleQuestionAnswersContent.jsp 29 Sep 2016 11:59:10 -0000 1.9 @@ -72,9 +72,6 @@ - - -
- + + - - - + + - -