Index: lams_central/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -ra08ef5f19d839ce969e8de4eac60b88789b3010d -r8a6ef31e47f040438cce78848c3ccb238a9620b7 --- lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision a08ef5f19d839ce969e8de4eac60b88789b3010d) +++ lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 8a6ef31e47f040438cce78848c3ccb238a9620b7) @@ -1142,3 +1142,5 @@ label.grouping.general.instructions.branching = This grouping activity is used for branching. Groups can therefore not be added or deleted. label.branching.general.instructions = Place the lesson participants in their branches. Initially you can add and remove learners, but once a participant starts one of the branches then you will not be able to remove learners from any branches. If you try to remove someone from a branch and they will not remove then check their progress - if they start using the branch while you are on this screen you will not get any errors but you will not be able to remove them from the branch. You will still be able to add learners to branches. label.grouping.popup.viewmode.message = You are presently in group view mode. Groups can not be modified. +authoring.tbl.shuffle.questions = Shuffle question order in iRAT +authoring.tbl.shuffle.questions.tooltip = Shuffles the order of questions in the iRAT for all students. In the tRAT the order of question will be the same for all students. Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java =================================================================== diff -u -r7feea405b05b8c29cca9cf7d81bbf652d7bd5314 -r8a6ef31e47f040438cce78848c3ccb238a9620b7 --- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision 7feea405b05b8c29cca9cf7d81bbf652d7bd5314) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision 8a6ef31e47f040438cce78848c3ccb238a9620b7) @@ -1634,14 +1634,16 @@ @Override public Long createTblAssessmentToolContent(UserDTO user, String title, String instructions, String reflectionInstructions, boolean selectLeaderToolOutput, boolean enableNumbering, - boolean enableConfidenceLevels, boolean allowDiscloseAnswers, boolean allowAnswerJustification, - boolean enableDiscussionSentiment, ArrayNode questions) throws IOException { + boolean shuffleQuestions, boolean enableConfidenceLevels, boolean allowDiscloseAnswers, + boolean allowAnswerJustification, boolean enableDiscussionSentiment, ArrayNode questions) + throws IOException { ObjectNode toolContentJSON = AuthoringService.createStandardToolContent(title, instructions, reflectionInstructions, null, null, user); toolContentJSON.put(RestTags.USE_SELECT_LEADER_TOOL_OUTPUT, selectLeaderToolOutput); toolContentJSON.put(RestTags.ENABLE_CONFIDENCE_LEVELS, enableConfidenceLevels); toolContentJSON.put("numbered", enableNumbering); + toolContentJSON.put("shuffled", shuffleQuestions); toolContentJSON.put("displaySummary", Boolean.TRUE); toolContentJSON.put("allowDiscloseAnswers", allowDiscloseAnswers); toolContentJSON.put("allowAnswerJustification", allowAnswerJustification); Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringFullService.java =================================================================== diff -u -r585c5afc5fcabdb88754b7c1bd7f7ec5eef4e150 -r8a6ef31e47f040438cce78848c3ccb238a9620b7 --- lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringFullService.java (.../IAuthoringFullService.java) (revision 585c5afc5fcabdb88754b7c1bd7f7ec5eef4e150) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringFullService.java (.../IAuthoringFullService.java) (revision 8a6ef31e47f040438cce78848c3ccb238a9620b7) @@ -147,7 +147,7 @@ void storeLearningDesignAccess(Long learningDesignId, Integer userId); Long createTblAssessmentToolContent(UserDTO user, String title, String instructions, String reflectionInstructions, - boolean selectLeaderToolOutput, boolean enableNumbering, boolean enableConfidenceLevels, - boolean allowDiscloseAnswers, boolean allowAnswerJustification, boolean enableDiscussionSentiment, - ArrayNode questions) throws IOException; + boolean selectLeaderToolOutput, boolean enableNumbering, boolean shuffleQuestions, + boolean enableConfidenceLevels, boolean allowDiscloseAnswers, boolean allowAnswerJustification, + boolean enableDiscussionSentiment, ArrayNode questions) throws IOException; } \ No newline at end of file Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java =================================================================== diff -u -r5e1779fdea3b14515d2eeb9079168e81b6defa81 -r8a6ef31e47f040438cce78848c3ccb238a9620b7 --- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java (.../TBLTemplateController.java) (revision 5e1779fdea3b14515d2eeb9079168e81b6defa81) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java (.../TBLTemplateController.java) (revision 8a6ef31e47f040438cce78848c3ccb238a9620b7) @@ -162,8 +162,8 @@ ArrayNode testQuestionsArray = JsonUtil.readArray(data.testQuestions.values()); Long iRAToolContentId = authoringService.createTblAssessmentToolContent(userDTO, activityTitle, - data.getText("boilerplate.ira.instructions"), null, false, true, data.confidenceLevelEnable, false, - false, false, testQuestionsArray); + data.getText("boilerplate.ira.instructions"), null, false, true, data.shuffleIRAT, + data.confidenceLevelEnable, false, false, false, testQuestionsArray); ObjectNode iraActivityJSON = createAssessmentActivity(maxUIID, order++, currentActivityPosition, iRAToolContentId, data.contentFolderID, groupingUIID, null, null, activityTitle); activities.add(iraActivityJSON); @@ -252,7 +252,7 @@ StringUtils.isBlank(applicationExercise.description) ? data.getText("boilerplate.ae.instructions") : applicationExercise.description, - null, true, true, false, true, true, true, questionsJSONArray); + null, true, true, false, false, true, true, true, questionsJSONArray); activities.add(createAssessmentActivity(maxUIID, order++, currentActivityPosition, aetoolContentId, data.contentFolderID, groupingUIID, null, null, applicationExerciseTitle)); } @@ -393,6 +393,7 @@ SortedMap testQuestions; boolean confidenceLevelEnable; + boolean shuffleIRAT; SortedMap applicationExercises; SortedMap peerReviewCriteria; @@ -498,6 +499,7 @@ } confidenceLevelEnable = WebUtil.readBooleanParam(request, "confidenceLevelEnable", false); + shuffleIRAT = WebUtil.readBooleanParam(request, "shuffleIRAT", false); if (useIRATRA) { if (testQuestions.size() == 0) { addValidationErrorMessage("authoring.error.rat.not.blank", null, ratErrors); Index: lams_central/web/authoring/template/tbl/tbl.jsp =================================================================== diff -u -r766973f2a21ca668667914744418c4c25dc031e3 -r8a6ef31e47f040438cce78848c3ccb238a9620b7 --- lams_central/web/authoring/template/tbl/tbl.jsp (.../tbl.jsp) (revision 766973f2a21ca668667914744418c4c25dc031e3) +++ lams_central/web/authoring/template/tbl/tbl.jsp (.../tbl.jsp) (revision 8a6ef31e47f040438cce78848c3ccb238a9620b7) @@ -321,6 +321,14 @@ + +
+   + + +