Index: lams_build/build.xml =================================================================== diff -u -re6dc4db4137cfd6b07a4aa79711b9d12b39fb78e -rb5d2a6851ee4797e641081bd5e6a1f28f78c30a6 --- lams_build/build.xml (.../build.xml) (revision e6dc4db4137cfd6b07a4aa79711b9d12b39fb78e) +++ lams_build/build.xml (.../build.xml) (revision b5d2a6851ee4797e641081bd5e6a1f28f78c30a6) @@ -63,7 +63,6 @@ - @@ -87,6 +86,7 @@ + @@ -108,7 +108,6 @@ - @@ -259,7 +258,7 @@ - + @@ -689,7 +688,6 @@ - Index: lams_central/conf/security/Owasp.CsrfGuard.properties =================================================================== diff -u -r4a2902072e80bc9fcfd6534115751829210e2153 -rb5d2a6851ee4797e641081bd5e6a1f28f78c30a6 --- lams_central/conf/security/Owasp.CsrfGuard.properties (.../Owasp.CsrfGuard.properties) (revision 4a2902072e80bc9fcfd6534115751829210e2153) +++ lams_central/conf/security/Owasp.CsrfGuard.properties (.../Owasp.CsrfGuard.properties) (revision b5d2a6851ee4797e641081bd5e6a1f28f78c30a6) @@ -157,12 +157,6 @@ org.owasp.csrfguard.protected.imsccAuthoringSave=/lams/tool/laimsc11/authoring/update.do org.owasp.csrfguard.protected.imsccAuthoringDefineLater=/lams/tool/laimsc11/authoring/definelater.do -org.owasp.csrfguard.protected.lamcAuthoringSave=/lams/tool/lamc11/authoring/submitAllContent.do -org.owasp.csrfguard.protected.lamcAuthoringDefineLater=/lams/tool/lamc11/authoring/definelater.do -org.owasp.csrfguard.protected.lamcMonitoringSubmissionDeadline=/lams/tool/lamc11/monitoring/setSubmissionDeadline.do -org.owasp.csrfguard.protected.lamcMonitoringExportExcel=/lams/tool/lamc11/monitoring/downloadMarks.do -org.owasp.csrfguard.protected.lamcSaveUserMark=/lams/tool/lamc11/monitoring/saveUserMark.do - org.owasp.csrfguard.protected.leaderAuthoringSave=/lams/tool/lalead11/authoring/updateContent.do org.owasp.csrfguard.protected.leaderAuthoringDefineLater=/lams/tool/lalead11/authoring/definelater.do org.owasp.csrfguard.protected.leaderSaveLeaders=/lams/tool/lalead11/monitoring/saveLeaders.do Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java =================================================================== diff -u -r8794fa416164738d1e1a4954081f6e5e1db00c6b -rb5d2a6851ee4797e641081bd5e6a1f28f78c30a6 --- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java (.../LdTemplateController.java) (revision 8794fa416164738d1e1a4954081f6e5e1db00c6b) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java (.../LdTemplateController.java) (revision b5d2a6851ee4797e641081bd5e6a1f28f78c30a6) @@ -130,9 +130,6 @@ protected static final String FORUM_ICON = "tool/lafrum11/images/icon_forum.swf"; protected static final String LEADER_TOOL_SIGNATURE = "lalead11"; protected static final String LEADER_ICON = "tool/lalead11/images/icon_leaderselection.swf"; - protected static final String MCQ_TOOL_SIGNATURE = "lamc11"; - protected static final String MCQ_ICON = "tool/lamc11/images/icon_mcq.swf"; - protected static final String MCQ_TOOL_OUTPUT_DEFINITION = "learner.mark"; protected static final String NOTEBOOK_TOOL_SIGNATURE = "lantbk11"; protected static final String NOTEBOOK_ICON = "tool/lantbk11/images/icon_notebook.swf"; protected static final String NOTICEBOARD_TOOL_SIGNATURE = "lanb11"; @@ -994,35 +991,6 @@ } /** - * Helper method to create a MCQ tool content. Title, instructions and questions are required (see tool for full - * details of questions). Other fields are optional. - */ - protected Long createMCQToolContent(UserDTO user, String title, String instructions, - boolean useSelectLeaderToolOuput, boolean enableConfidenceLevel, boolean prefixAnswersWithLetters, - ArrayNode questions) throws IOException { - - ObjectNode toolContentJSON = createStandardToolContent(title, instructions, null, null, null, null); - toolContentJSON.put(RestTags.USE_SELECT_LEADER_TOOL_OUTPUT, useSelectLeaderToolOuput); - toolContentJSON.set(RestTags.QUESTIONS, questions); - toolContentJSON.put(RestTags.ENABLE_CONFIDENCE_LEVELS, enableConfidenceLevel); - toolContentJSON.put("prefixAnswersWithLetters", prefixAnswersWithLetters); - return createToolContent(user, LdTemplateController.MCQ_TOOL_SIGNATURE, toolContentJSON); - } - - /** - * Creates a MCQ activity's JSON details. - */ - protected ObjectNode createMCQActivity(AtomicInteger uiid, int order, Integer[] layoutCoords, Long toolContentID, - String contentFolderID, Integer groupingUIID, Integer parentUIID, Integer parentActivityType, - String activityTitle) { - - return createToolActivity(uiid, order, layoutCoords, LdTemplateController.MCQ_TOOL_SIGNATURE, - LdTemplateController.MCQ_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID, - parentActivityType, activityTitle != null ? activityTitle : "Multiple Choice", - Activity.CATEGORY_ASSESSMENT, LdTemplateController.MCQ_TOOL_OUTPUT_DEFINITION); - } - - /** * Helper method to create a mindmap tool content. */ protected Long createMindmapToolContent(UserDTO user, String title, String instructions, boolean lockWhenFinished, Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java =================================================================== diff -u -r6f0db409b3114a7999205219d5e23a2f03b1a813 -rb5d2a6851ee4797e641081bd5e6a1f28f78c30a6 --- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java (.../TBLTemplateController.java) (revision 6f0db409b3114a7999205219d5e23a2f03b1a813) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java (.../TBLTemplateController.java) (revision b5d2a6851ee4797e641081bd5e6a1f28f78c30a6) @@ -148,15 +148,14 @@ activityTitle, activityTitle)); } - // iRA Test - MCQ + // iRA Test - Assessment currentActivityPosition = calcPositionNextRight(currentActivityPosition); activityTitle = data.getText("boilerplate.ira.title"); ArrayNode testQuestionsArray = JsonUtil.readArray(data.testQuestions.values()); - Long iRAToolContentId = createMCQToolContent(userDTO, activityTitle, - data.getText("boilerplate.ira.instructions"), false, data.confidenceLevelEnable, false, - testQuestionsArray); - ObjectNode iraActivityJSON = createMCQActivity(maxUIID, order++, currentActivityPosition, iRAToolContentId, - data.contentFolderID, groupingUIID, null, null, activityTitle); + Long iRAToolContentId = createAssessmentToolContent(userDTO, activityTitle, + data.getText("boilerplate.ira.instructions"), "", false, false, testQuestionsArray); + ObjectNode iraActivityJSON = createAssessmentActivity(maxUIID, order++, currentActivityPosition, + iRAToolContentId, data.contentFolderID, groupingUIID, null, null, activityTitle); activities.add(iraActivityJSON); // Leader Selection Index: lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java =================================================================== diff -u -r9f4d4f19dc70ef350ebab8e6aa89cb05e1c78c04 -rb5d2a6851ee4797e641081bd5e6a1f28f78c30a6 --- lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java (.../SearchQBController.java) (revision 9f4d4f19dc70ef350ebab8e6aa89cb05e1c78c04) +++ lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java (.../SearchQBController.java) (revision b5d2a6851ee4797e641081bd5e6a1f28f78c30a6) @@ -99,9 +99,7 @@ StringBuilder questionTypesAvailable = new StringBuilder(); //by default show MCQ type of questions (except for Q&A tool) int questionTypeDefault = QbQuestion.TYPE_MULTIPLE_CHOICE; - if (CommonConstants.TOOL_SIGNATURE_MCQ.equals(toolSignature)) { - - } else if (CommonConstants.TOOL_SIGNATURE_SCRATCHIE.equals(toolSignature)) { + if (CommonConstants.TOOL_SIGNATURE_SCRATCHIE.equals(toolSignature)) { questionTypesAvailable.append(QbQuestion.TYPE_MULTIPLE_CHOICE); questionTypesAvailable.append(","); questionTypesAvailable.append(QbQuestion.TYPE_VERY_SHORT_ANSWERS); Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java =================================================================== diff -u -rc975a1230b65f2245c5c77ba413afe97a2816df9 -rb5d2a6851ee4797e641081bd5e6a1f28f78c30a6 --- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java (.../LessonManagerServlet.java) (revision c975a1230b65f2245c5c77ba413afe97a2816df9) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java (.../LessonManagerServlet.java) (revision b5d2a6851ee4797e641081bd5e6a1f28f78c30a6) @@ -1266,7 +1266,6 @@ for (ToolActivity activity : activities) { String toolSignature = activity.getTool().getToolSignature(); hasNumericToolOutput |= CommonConstants.TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature) - || CommonConstants.TOOL_SIGNATURE_MCQ.equals(toolSignature) || CommonConstants.TOOL_SIGNATURE_SCRATCHIE.equals(toolSignature); } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java =================================================================== diff -u -rcab4481e1fe1774af7cf0e546ecd37f55630ab00 -rb5d2a6851ee4797e641081bd5e6a1f28f78c30a6 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision cab4481e1fe1774af7cf0e546ecd37f55630ab00) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision b5d2a6851ee4797e641081bd5e6a1f28f78c30a6) @@ -746,7 +746,7 @@ String fromVersion = activity.getToolVersion(); //transform MCQ tool to Assessment - if (CommonConstants.TOOL_SIGNATURE_MCQ.equals(activity.getToolSignature())) { + if ("lamc11".equals(activity.getToolSignature())) { activity.setToolSignature(CommonConstants.TOOL_SIGNATURE_ASSESSMENT); // run all appropriate methods from McqImportContentVersionFilter, transforming MCQ object to its latest version and then to Assessment object Index: lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java =================================================================== diff -u -r9012873415698350686bf05ac1ddb1ee5b8fe154 -rb5d2a6851ee4797e641081bd5e6a1f28f78c30a6 --- lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java (.../QbDAO.java) (revision 9012873415698350686bf05ac1ddb1ee5b8fe154) +++ lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java (.../QbDAO.java) (revision b5d2a6851ee4797e641081bd5e6a1f28f78c30a6) @@ -41,12 +41,10 @@ + "LEFT JOIN tl_laasse10_option_answer AS aa ON a.answer_uid = aa.question_result_uid AND aa.answer_boolean = 1 " + "WHERE tq.qb_question_uid = :qbQuestionUid GROUP BY opt HAVING opt IS NOT NULL"; - private static final String FIND_ANSWERS_BY_ACTIVITY = "SELECT COALESCE(mcu.que_usr_id, su.user_id, au.user_id), " + private static final String FIND_ANSWERS_BY_ACTIVITY = "SELECT COALESCE(su.user_id, au.user_id), " + "COALESCE(a.qb_option_uid, aa.question_option_uid) AS opt " + "FROM lams_learning_activity AS act JOIN lams_qb_tool_question AS tq USING (tool_content_id) " + "JOIN lams_qb_tool_answer AS a USING (tool_question_uid) " - + "LEFT JOIN tl_lamc11_usr_attempt AS mca ON a.answer_uid = mca.uid " - + "LEFT JOIN tl_lamc11_que_usr AS mcu ON mca.que_usr_id = mcu.uid " + "LEFT JOIN tl_lascrt11_answer_log AS sa ON a.answer_uid = sa.uid " + "LEFT JOIN tl_lascrt11_session AS ss ON sa.session_id = ss.session_id " + "LEFT JOIN tl_lascrt11_user AS su ON ss.uid = su.session_uid " Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java =================================================================== diff -u -re97dcb50701feb5f8cfd666de05caf9d0cd69bd6 -rb5d2a6851ee4797e641081bd5e6a1f28f78c30a6 --- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java (.../LamsToolService.java) (revision e97dcb50701feb5f8cfd666de05caf9d0cd69bd6) +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java (.../LamsToolService.java) (revision b5d2a6851ee4797e641081bd5e6a1f28f78c30a6) @@ -80,7 +80,6 @@ private static final String LEADER_SELECTION_TOOL_OUTPUT_NAME_LEADER_USERID = "leader.user.id"; private static final String TOOL_SIGNATURE_ASSESSMENT = "laasse10"; - private static final String TOOL_SIGNATURE_MCQ = "lamc11"; private IActivityDAO activityDAO; private ILogEventService logEventService; @@ -372,7 +371,7 @@ } Set confidenceProvidingActivityIds = new LinkedHashSet(); - findPrecedingAssessmentAndMcqActivities(specifiedActivity, confidenceProvidingActivityIds, true); + findPrecedingAssessmentActivities(specifiedActivity, confidenceProvidingActivityIds); Set confidenceProvidingActivities = new LinkedHashSet(); for (Long confidenceProvidingActivityId : confidenceProvidingActivityIds) { @@ -385,12 +384,11 @@ } /** - * Finds all preceding activities that can provide confidence levels (currently only Assessment and MCQ provide + * Finds all preceding activities that can provide confidence levels (currently only Assessment provide * them). Please note, it does not check whether enableConfidenceLevels advanced option is ON in those activities. */ @SuppressWarnings("rawtypes") - private void findPrecedingAssessmentAndMcqActivities(Activity activity, - Set confidenceProvidingActivityIds, boolean isMcqIncluded) { + private void findPrecedingAssessmentActivities(Activity activity, Set confidenceProvidingActivityIds) { // check if current activity is Leader Select one. if so - stop searching and return it. Class activityClass = Hibernate.getClass(activity); if (activityClass.equals(ToolActivity.class)) { @@ -407,8 +405,7 @@ } String toolSignature = toolActivity.getTool().getToolSignature(); - if (TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature) - || isMcqIncluded && TOOL_SIGNATURE_MCQ.equals(toolSignature)) { + if (TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature)) { confidenceProvidingActivityIds.add(toolActivity.getActivityId()); } @@ -418,8 +415,7 @@ for (Activity activityIter : activities) { if (activityIter instanceof ToolActivity) { String toolSignatureIter = ((ToolActivity) activityIter).getTool().getToolSignature(); - if (TOOL_SIGNATURE_ASSESSMENT.equals(toolSignatureIter) - || isMcqIncluded && TOOL_SIGNATURE_MCQ.equals(toolSignatureIter)) { + if (TOOL_SIGNATURE_ASSESSMENT.equals(toolSignatureIter)) { confidenceProvidingActivityIds.add(activityIter.getActivityId()); } } @@ -431,14 +427,14 @@ Transition transitionTo = activity.getTransitionTo(); if (transitionTo != null) { Activity fromActivity = transitionTo.getFromActivity(); - findPrecedingAssessmentAndMcqActivities(fromActivity, confidenceProvidingActivityIds, isMcqIncluded); + findPrecedingAssessmentActivities(fromActivity, confidenceProvidingActivityIds); return; } // check parent activity Activity parent = activity.getParentActivity(); if (parent != null) { - findPrecedingAssessmentAndMcqActivities(parent, confidenceProvidingActivityIds, isMcqIncluded); + findPrecedingAssessmentActivities(parent, confidenceProvidingActivityIds); return; } } @@ -453,7 +449,7 @@ } Set providingVsaAnswersActivityIds = new LinkedHashSet(); - findPrecedingAssessmentAndMcqActivities(specifiedActivity, providingVsaAnswersActivityIds, false); + findPrecedingAssessmentActivities(specifiedActivity, providingVsaAnswersActivityIds); Set activitiesProvidingVsaAnswers = new LinkedHashSet(); for (Long confidenceProvidingActivityId : providingVsaAnswersActivityIds) { Index: lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java =================================================================== diff -u -r43d88e533dd5666feeaeab4368982ad8028bfae3 -rb5d2a6851ee4797e641081bd5e6a1f28f78c30a6 --- lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java (.../CommonConstants.java) (revision 43d88e533dd5666feeaeab4368982ad8028bfae3) +++ lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java (.../CommonConstants.java) (revision b5d2a6851ee4797e641081bd5e6a1f28f78c30a6) @@ -46,7 +46,6 @@ public static final String TOOL_SIGNATURE_ASSESSMENT = "laasse10"; public static final String TOOL_SIGNATURE_FORUM = "lafrum11"; public static final String TOOL_SIGNATURE_LEADERSELECTION = "lalead11"; - public static final String TOOL_SIGNATURE_MCQ = "lamc11"; public static final String TOOL_SIGNATURE_SCRATCHIE = "lascrt11"; public static final String TOOL_SIGNATURE_PEER_REVIEW = "laprev11"; Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java =================================================================== diff -u -rab88b7ff6a0dbd05c91a29e135b11f9596674f4c -rb5d2a6851ee4797e641081bd5e6a1f28f78c30a6 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java (.../GradebookService.java) (revision ab88b7ff6a0dbd05c91a29e135b11f9596674f4c) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java (.../GradebookService.java) (revision b5d2a6851ee4797e641081bd5e6a1f28f78c30a6) @@ -121,7 +121,6 @@ private static final String TOOL_SIGNATURE_ASSESSMENT = "laasse10"; public static final String TOOL_SIGNATURE_SCRATCHIE = "lascrt11"; - public static final String TOOL_SIGNATURE_MCQ = "lamc11"; // Services private ILamsCoreToolService toolService; @@ -1211,7 +1210,7 @@ String toolSignature = activity.getTool().getToolSignature(); //check whether toolActivity has a NumericToolOutput if (activity.getEvaluation() != null && (TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature) - || TOOL_SIGNATURE_MCQ.equals(toolSignature) || TOOL_SIGNATURE_SCRATCHIE.equals(toolSignature))) { + || TOOL_SIGNATURE_SCRATCHIE.equals(toolSignature))) { filteredActivityToUserDTOMap.put(activity, activityToUserDTOMap.get(activity)); } } Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java =================================================================== diff -u -rd9e8a78a5ed64814792a7a6ef301d36507f18b81 -rb5d2a6851ee4797e641081bd5e6a1f28f78c30a6 --- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (.../LearnerService.java) (revision d9e8a78a5ed64814792a7a6ef301d36507f18b81) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (.../LearnerService.java) (revision b5d2a6851ee4797e641081bd5e6a1f28f78c30a6) @@ -1461,7 +1461,6 @@ /* Added for RepopulateProgressMarksServlet - can be removed later */ private static final String TOOL_SIGNATURE_ASSESSMENT = "laasse10"; private static final String TOOL_SIGNATURE_SCRATCHIE = "lascrt11"; - private static final String TOOL_SIGNATURE_MCQ = "lamc11"; @Override public String[] recalcProgressForLearner(Lesson lesson, ArrayList activityList, @@ -1493,8 +1492,7 @@ ToolActivity toolActivity = (ToolActivity) activity; Tool tool = toolActivity.getTool(); if (updateGradebookForAll || TOOL_SIGNATURE_ASSESSMENT.equals(tool.getToolSignature()) - || TOOL_SIGNATURE_SCRATCHIE.equals(tool.getToolSignature()) - || TOOL_SIGNATURE_MCQ.equals(tool.getToolSignature())) { + || TOOL_SIGNATURE_SCRATCHIE.equals(tool.getToolSignature())) { auditLogBuilder.append("Pushing mark to Gradebook for activity ") .append(activity.getActivityId()).append(" ").append(activity.getTitle()).append("\n"); gradebookService.updateGradebookUserActivityMark(lesson, activity, learner); Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java =================================================================== diff -u -r40de3afab4e8d589660daffb6efd6e568e87f8fa -rb5d2a6851ee4797e641081bd5e6a1f28f78c30a6 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java (.../MonitoringController.java) (revision 40de3afab4e8d589660daffb6efd6e568e87f8fa) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java (.../MonitoringController.java) (revision b5d2a6851ee4797e641081bd5e6a1f28f78c30a6) @@ -968,7 +968,7 @@ } /** - * If learning design contains the following activities Grouping->(MCQ or Assessment)->Leader Selection->Scratchie + * If learning design contains the following activities Grouping->Assessment->Leader Selection->Scratchie * (potentially with some other gates or activities in the middle), there is a good chance this is a TBL sequence * and all activities must be grouped. */ @@ -986,7 +986,7 @@ * * @param activity * @param anticipatedActivity - * could be either "Grouping", "MCQ or Assessment", "Leaderselection" or "Scratchie" + * could be either "Grouping", "Assessment", "Leaderselection" or "Scratchie" */ private boolean verifyNextActivityFitsTbl(Activity activity, String anticipatedActivity) { @@ -1004,22 +1004,20 @@ case "Grouping": //the first activity should be a grouping if (activity instanceof GroupingActivity) { - return verifyNextActivityFitsTbl(nextActivity, "MCQ or Assessment"); + return verifyNextActivityFitsTbl(nextActivity, "Assessment"); } else { return verifyNextActivityFitsTbl(nextActivity, "Grouping"); } - case "MCQ or Assessment": - //the second activity shall be a MCQ or Assessment + case "Assessment": + //the second activity shall be Assessment if (activity.isToolActivity() && (CommonConstants.TOOL_SIGNATURE_ASSESSMENT - .equals(((ToolActivity) activity).getTool().getToolSignature()) - || CommonConstants.TOOL_SIGNATURE_MCQ - .equals(((ToolActivity) activity).getTool().getToolSignature()))) { + .equals(((ToolActivity) activity).getTool().getToolSignature()))) { return verifyNextActivityFitsTbl(nextActivity, "Leaderselection"); } else { - return verifyNextActivityFitsTbl(nextActivity, "MCQ or Assessment"); + return verifyNextActivityFitsTbl(nextActivity, "Assessment"); } case "Leaderselection": Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java =================================================================== diff -u -r40de3afab4e8d589660daffb6efd6e568e87f8fa -rb5d2a6851ee4797e641081bd5e6a1f28f78c30a6 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java (.../TblMonitoringController.java) (revision 40de3afab4e8d589660daffb6efd6e568e87f8fa) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java (.../TblMonitoringController.java) (revision b5d2a6851ee4797e641081bd5e6a1f28f78c30a6) @@ -91,10 +91,8 @@ setupAvailableActivityTypes(request, lessonActivities); boolean isScratchieAvailable = (request.getAttribute("isScratchieAvailable") != null) && ((Boolean) request.getAttribute("isScratchieAvailable")); - boolean isIraMcqAvailable = (request.getAttribute("isIraMcqAvailable") != null) - && ((Boolean) request.getAttribute("isIraMcqAvailable")); - boolean isIraAssessmentAvailable = (request.getAttribute("isIraAssessmentAvailable") != null) - && ((Boolean) request.getAttribute("isIraAssessmentAvailable")); + boolean isIraAvailable = (request.getAttribute("isIraAvailable") != null) + && ((Boolean) request.getAttribute("isIraAvailable")); Long iraToolActivityId = request.getAttribute("iraToolActivityId") == null ? null : (Long) request.getAttribute("iraToolActivityId"); Long traToolActivityId = request.getAttribute("traToolActivityId") == null ? null @@ -105,7 +103,7 @@ //get all mcq and assessment scores List iraGradebookUserActivities = new LinkedList<>(); List traGradebookUserActivities = new LinkedList<>(); - if (isIraMcqAvailable || isIraAssessmentAvailable) { + if (isIraAvailable) { iraGradebookUserActivities = gradebookService.getGradebookUserActivities(iraToolActivityId); } if (isScratchieAvailable) { @@ -136,7 +134,7 @@ groupDto.setGroupLeader(userDto); } - if (isIraMcqAvailable || isIraAssessmentAvailable) { + if (isIraAvailable) { //find according iraGradebookUserActivity for (GradebookUserActivity iraGradebookUserActivity : iraGradebookUserActivities) { if (iraGradebookUserActivity.getLearner().getUserId().equals(user.getUserId())) { @@ -373,19 +371,13 @@ Long toolActivityId = toolActivity.getActivityId(); String toolTitle = toolActivity.getTitle(); - //count only the first MCQ or Assessmnet as iRA - if (!iraPassed && (CommonConstants.TOOL_SIGNATURE_MCQ.equals(toolSignature) - || isScratchieAvailable && CommonConstants.TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature))) { + //count only the first Assessmnet as iRA + if (!iraPassed && isScratchieAvailable + && CommonConstants.TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature)) { iraPassed = true; - if (CommonConstants.TOOL_SIGNATURE_MCQ.equals(toolSignature)) { - request.setAttribute("isIraMcqAvailable", true); - - } else { - request.setAttribute("isIraAssessmentAvailable", true); - } + request.setAttribute("isIraAvailable", true); request.setAttribute("iraToolContentId", toolContentId); request.setAttribute("iraToolActivityId", toolActivityId); - continue; } Index: lams_monitoring/web/tblmonitor/tblmonitor.jsp =================================================================== diff -u -r40de3afab4e8d589660daffb6efd6e568e87f8fa -rb5d2a6851ee4797e641081bd5e6a1f28f78c30a6 --- lams_monitoring/web/tblmonitor/tblmonitor.jsp (.../tblmonitor.jsp) (revision 40de3afab4e8d589660daffb6efd6e568e87f8fa) +++ lams_monitoring/web/tblmonitor/tblmonitor.jsp (.../tblmonitor.jsp) (revision b5d2a6851ee4797e641081bd5e6a1f28f78c30a6) @@ -58,10 +58,6 @@ toolContentID = "${traToolContentId}"; url = "tool/lascrt11/tblmonitoring/"; - } else if (method == "iraMcq" || method == "mcqStudentChoices") { - toolContentID = "${iraToolContentId}"; - url = "tool/lamc11/tblmonitoring/"; - } else if (method == "iraAssessment" || method == "iraAssessmentStudentChoices") { toolContentID = "${iraToolContentId}"; url = "tool/laasse10/tblmonitoring/"; @@ -186,17 +182,10 @@ - - - - iraMcq - iraAssessment - - - + - + Index: lams_monitoring/web/tblmonitor/teams.jsp =================================================================== diff -u -r40de3afab4e8d589660daffb6efd6e568e87f8fa -rb5d2a6851ee4797e641081bd5e6a1f28f78c30a6 --- lams_monitoring/web/tblmonitor/teams.jsp (.../teams.jsp) (revision 40de3afab4e8d589660daffb6efd6e568e87f8fa) +++ lams_monitoring/web/tblmonitor/teams.jsp (.../teams.jsp) (revision b5d2a6851ee4797e641081bd5e6a1f28f78c30a6) @@ -124,7 +124,7 @@ $('#ira-user-score').html(userScore); //load modal dialog content using Ajax - var url = "${isIraMcqAvailable}" == "true" ? "tool/lamc11/tblmonitoring/getModalDialogForTeamsTab.do" : "tool/laasse10/tblmonitoring/getModalDialogForTeamsTab.do"; + var url = "tool/laasse10/tblmonitoring/getModalDialogForTeamsTab.do"; $('#ira-modal .modal-body').load( url, { @@ -205,7 +205,7 @@ - + @@ -233,7 +233,7 @@ - + @@ -269,7 +269,7 @@
- +