Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r244a9406a29ee43ba74f184246381dfb152ee2c0 -r96b7a2590aaed942de2023d2afec8d7127677d20 --- lams_tool_assessment/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 244a9406a29ee43ba74f184246381dfb152ee2c0) +++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 96b7a2590aaed942de2023d2afec8d7127677d20) @@ -317,6 +317,7 @@ label.teams = Teams label.no.questions.in.question.bank = No questions have been added to the question list. Do you still want to proceed with no questions? label.authoring.advance.disclose.answers = Disclose learner's and other groups' answers in monitor +label.authoring.advance.rate.answers = Allow learners to rate peers' answers label.learning.summary.other.team.answers = Other teams' answers label.learning.summary.selected.by = Selected by: label.disclose.correct.answers = Disclose correct answers @@ -485,4 +486,4 @@ label.authoring.advance.shuffle.answers = Shuffle answers label.learning.submit.all.confirm = Are you certain you wish to submit your responses? Once submitted, you will not have the ability to alter them. message.authoring.rat.questions.sync = You've made edits to the questions in this activity. Would you like to sync these changes with the corresponding TBL RAT activity? -label.monitoring.user.summary.grade.auto = auto-graded +label.monitoring.user.summary.grade.auto = auto-graded \ No newline at end of file Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20240227.sql =================================================================== diff -u --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20240227.sql (revision 0) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20240227.sql (revision 96b7a2590aaed942de2023d2afec8d7127677d20) @@ -0,0 +1,14 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +-- Put all sql statements below here + +-- LDEV-5449 Make answer rating optional +ALTER TABLE tl_laasse10_assessment ADD COLUMN allow_answer_rating TINYINT DEFAULT 1 AFTER allow_disclose_answers; + +-- Put all sql statements above here + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java =================================================================== diff -u -r0356b71a54403d2a4f45a3b90e5fab4fc3c11dd7 -r96b7a2590aaed942de2023d2afec8d7127677d20 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java (.../Assessment.java) (revision 0356b71a54403d2a4f45a3b90e5fab4fc3c11dd7) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java (.../Assessment.java) (revision 96b7a2590aaed942de2023d2afec8d7127677d20) @@ -30,6 +30,7 @@ import org.hibernate.annotations.SortComparator; import org.lamsfoundation.lams.qb.model.QbToolQuestion; import org.lamsfoundation.lams.tool.assessment.util.SequencableComparator; +import org.lamsfoundation.lams.tool.assessment.web.form.AssessmentForm; import javax.persistence.CascadeType; import javax.persistence.CollectionTable; @@ -132,6 +133,9 @@ @Column(name = "allow_disclose_answers") private boolean allowDiscloseAnswers; + @Column(name = "allow_answer_rating") + private Boolean allowAnswerRating = true; + @Column(name = "allow_right_answers") private boolean allowRightAnswersAfterQuestion; @@ -210,6 +214,11 @@ // ********************************************************** // Function method for Assessment // ********************************************************** + + public Assessment() { + this.allowAnswerRating = true; + } + public static Assessment newInstance(Assessment defaultContent, Long contentId) { Assessment toContent = new Assessment(); toContent = (Assessment) defaultContent.clone(); @@ -595,6 +604,14 @@ this.allowDiscloseAnswers = tblReleaseAnswers; } + public boolean getAllowAnswerRating() { + return allowAnswerRating == null ? true : allowAnswerRating; + } + + public void setAllowAnswerRating(boolean allowAnswerRating) { + this.allowAnswerRating = allowAnswerRating; + } + public boolean isAllowRightAnswersAfterQuestion() { return allowRightAnswersAfterQuestion; } Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java =================================================================== diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r96b7a2590aaed942de2023d2afec8d7127677d20 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 0b1d534ce1915b907afff0171909f90226b31921) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 96b7a2590aaed942de2023d2afec8d7127677d20) @@ -3838,6 +3838,7 @@ assessment.setAllowQuestionFeedback( JsonUtil.optBoolean(toolContentJSON, "allowQuestionFeedback", Boolean.FALSE)); assessment.setAllowDiscloseAnswers(JsonUtil.optBoolean(toolContentJSON, "allowDiscloseAnswers", Boolean.FALSE)); + assessment.setAllowDiscloseAnswers(JsonUtil.optBoolean(toolContentJSON, "allowAnswerRating", Boolean.TRUE)); assessment.setAllowRightAnswersAfterQuestion( JsonUtil.optBoolean(toolContentJSON, "allowRightAnswersAfterQuestion", Boolean.FALSE)); assessment.setAllowWrongAnswersAfterQuestion( Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java =================================================================== diff -u -r0356b71a54403d2a4f45a3b90e5fab4fc3c11dd7 -r96b7a2590aaed942de2023d2afec8d7127677d20 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java (.../AssessmentForm.java) (revision 0356b71a54403d2a4f45a3b90e5fab4fc3c11dd7) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java (.../AssessmentForm.java) (revision 96b7a2590aaed942de2023d2afec8d7127677d20) @@ -57,6 +57,7 @@ assessment.setAllowOverallFeedbackAfterQuestion(false); assessment.setAllowQuestionFeedback(false); assessment.setAllowDiscloseAnswers(false); + assessment.setAllowDiscloseAnswers(true); assessment.setAllowRightAnswersAfterQuestion(false); assessment.setAllowWrongAnswersAfterQuestion(false); assessment.setDefineLater(false); Index: lams_tool_assessment/web/pages/authoring/advance.jsp =================================================================== diff -u -red692fe7f7a69f5d84dcc5f07eef657fcb4b83f3 -r96b7a2590aaed942de2023d2afec8d7127677d20 --- lams_tool_assessment/web/pages/authoring/advance.jsp (.../advance.jsp) (revision ed692fe7f7a69f5d84dcc5f07eef657fcb4b83f3) +++ lams_tool_assessment/web/pages/authoring/advance.jsp (.../advance.jsp) (revision 96b7a2590aaed942de2023d2afec8d7127677d20) @@ -21,18 +21,21 @@ $('#display-summary-area').toggle('slow'); $('#allowQuestionFeedback').prop("checked", false); $('#allowDiscloseAnswers').prop("checked", false); - $('#allowRightAnswersAfterQuestion, #allowWrongAnswersAfterQuestion').prop("checked", false).prop('disabled', false); - $('#allowRightAnswersAfterQuestion, #allowWrongAnswersAfterQuestion').parent().removeClass('text-muted'); + $('#allowAnswerRating').prop("checked", false); + $('#allowRightAnswersAfterQuestion, #allowWrongAnswersAfterQuestion') + .prop("checked", false).prop('disabled', false).parent().removeClass('text-muted'); $('#allowHistoryResponsesAfterAttempt').prop("checked", false); }); $('#allowDiscloseAnswers').change(function(){ if ($(this).prop('checked')) { $('#allowRightAnswersAfterQuestion, #allowWrongAnswersAfterQuestion').prop('checked', false).prop('disabled', true); + $('#allowAnswerRating').prop('checked', true).prop('disabled', false); } else { $('#allowRightAnswersAfterQuestion, #allowWrongAnswersAfterQuestion').prop('disabled', false); + $('#allowAnswerRating').prop('checked', false).prop('disabled', true); } - $('#allowRightAnswersAfterQuestion, #allowWrongAnswersAfterQuestion').parent().toggleClass('text-muted'); + $('#allowRightAnswersAfterQuestion, #allowWrongAnswersAfterQuestion, #allowAnswerRating').parent().toggleClass('text-muted'); }); $("#useSelectLeaderToolOuput").change(function() { @@ -55,10 +58,14 @@ $("#passingMark").prop("disabled", true); $("#attemptsAllowed").prop("disabled", true); $("#display-summary").prop("disabled", true); - - $('#allowRightAnswersAfterQuestion, #allowWrongAnswersAfterQuestion').prop('disabled', true); - $('#allowRightAnswersAfterQuestion, #allowWrongAnswersAfterQuestion').parent().addClass('text-muted'); - + + + $('#allowRightAnswersAfterQuestion, #allowWrongAnswersAfterQuestion').prop('disabled', true).parent().addClass('text-muted'); + + + $('#allowAnswerRating').prop('checked', false).prop('disabled', true).parent().addClass('text-muted'); + + $('#confidence-levels-type-area').css('display', 'none'); @@ -375,6 +382,13 @@
+ +
+ +