Index: lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml =================================================================== diff -u -r373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c -r8d12e38358cf4253f46f914de5fb7630482c9358 --- lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml (.../Assessment.hbm.xml) (revision 373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c) +++ lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml (.../Assessment.hbm.xml) (revision 8d12e38358cf4253f46f914de5fb7630482c9358) @@ -183,7 +183,7 @@ insert="true" column="allow_overall_feedback" /> - + - + Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r4c51f9c8b6fab7efa4d5296f1ee60c1c3bd207e5 -r8d12e38358cf4253f46f914de5fb7630482c9358 --- lams_tool_assessment/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 4c51f9c8b6fab7efa4d5296f1ee60c1c3bd207e5) +++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 8d12e38358cf4253f46f914de5fb7630482c9358) @@ -330,6 +330,7 @@ label.excel.export =Excel export 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 #======= End labels: Exported 324 labels for en AU ===== Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180330.sql =================================================================== diff -u --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180330.sql (revision 0) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180330.sql (revision 8d12e38358cf4253f46f914de5fb7630482c9358) @@ -0,0 +1,15 @@ +-- 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-4540 Allow teachers to release other groups' answers in TBL monitor + +ALTER TABLE tl_laasse10_assessment ADD COLUMN allow_disclose_answers TINYINT(1) DEFAULT 0 AFTER allow_overall_feedback; + +----------------------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 -r373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c -r8d12e38358cf4253f46f914de5fb7630482c9358 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java (.../Assessment.java) (revision 373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java (.../Assessment.java) (revision 8d12e38358cf4253f46f914de5fb7630482c9358) @@ -71,12 +71,14 @@ private boolean allowOverallFeedbackAfterQuestion; + private boolean allowDiscloseAnswers; + private boolean allowRightAnswersAfterQuestion; private boolean allowWrongAnswersAfterQuestion; private boolean allowGradesAfterAttempt; - + private boolean enableConfidenceLevels; private boolean allowHistoryResponses; @@ -234,17 +236,18 @@ } this.setUpdated(new Date(now)); } - + /** - * Checks whether content was modified in monitor and this has happened after attempt was started (and thus this modification can potentially affect attempt results). - * + * Checks whether content was modified in monitor and this has happened after attempt was started (and thus this + * modification can potentially affect attempt results). + * * @param attemptStartingDate * @return */ public boolean isContentModifiedInMonitor(Date attemptStartingDate) { return (updated != null) && updated.after(attemptStartingDate); } - + /** * @return true if there is at least one random question reference, false otherwise */ @@ -492,6 +495,14 @@ this.allowOverallFeedbackAfterQuestion = allowOverallFeedbackAfterQuestion; } + public boolean isAllowDiscloseAnswers() { + return allowDiscloseAnswers; + } + + public void setAllowDiscloseAnswers(boolean tblReleaseAnswers) { + this.allowDiscloseAnswers = tblReleaseAnswers; + } + /** * * @return @@ -527,18 +538,18 @@ public void setAllowGradesAfterAttempt(boolean allowGradesAfterAttempt) { this.allowGradesAfterAttempt = allowGradesAfterAttempt; } - + /** - * - * @return - */ - public boolean isEnableConfidenceLevels() { + * + * @return + */ + public boolean isEnableConfidenceLevels() { return enableConfidenceLevels; - } + } - public void setEnableConfidenceLevels(boolean enableConfidenceLevels) { + public void setEnableConfidenceLevels(boolean enableConfidenceLevels) { this.enableConfidenceLevels = enableConfidenceLevels; - } + } /** * Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java =================================================================== diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r8d12e38358cf4253f46f914de5fb7630482c9358 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java (.../AssessmentForm.java) (revision 3399163940c61c9132223c758d274486e57ff9b7) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java (.../AssessmentForm.java) (revision 8d12e38358cf4253f46f914de5fb7630482c9358) @@ -77,6 +77,7 @@ assessment.setAllowGradesAfterAttempt(false); assessment.setAllowOverallFeedbackAfterQuestion(false); assessment.setAllowQuestionFeedback(false); + assessment.setAllowDiscloseAnswers(false); assessment.setAllowRightAnswersAfterQuestion(false); assessment.setAllowWrongAnswersAfterQuestion(false); assessment.setDefineLater(false); Index: lams_tool_assessment/web/pages/authoring/advance.jsp =================================================================== diff -u -r373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c -r8d12e38358cf4253f46f914de5fb7630482c9358 --- lams_tool_assessment/web/pages/authoring/advance.jsp (.../advance.jsp) (revision 373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c) +++ lams_tool_assessment/web/pages/authoring/advance.jsp (.../advance.jsp) (revision 8d12e38358cf4253f46f914de5fb7630482c9358) @@ -3,31 +3,39 @@