Index: lams_tool_doku/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r1621b6daf8385b83e75f7ffde03c017b05c12487 -re2f52f574599806a41fe8864002496eaf73ff722 --- lams_tool_doku/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 1621b6daf8385b83e75f7ffde03c017b05c12487) +++ lams_tool_doku/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision e2f52f574599806a41fe8864002496eaf73ff722) @@ -35,6 +35,7 @@ define.later.message = Please wait for the instructor to complete the contents of this activity. button.try.again = Try again label.authoring.advanced.reflectOnActivity = Add a notebook at end of the activity with the following instructions: +label.authoring.advanced.maxMark = Maximum mark title.reflection = Notebook entry label.continue = Continue message.no.reflection.available = No notebook available @@ -83,7 +84,7 @@ label.monitoring.learner.marks.first.name = First name label.monitoring.learner.marks.last.name = Last name label.monitoring.learner.marks.mark = Mark -label.monitoring.learner.marks.mark.tip = (click to edit; max: 100) +label.monitoring.learner.marks.mark.tip = (click to edit; max: {0}) messsage.monitoring.learner.marks.no.data = No learner data found messsage.monitoring.learner.marks.update.fail = Error while updating a learner mark outcome.authoring.title = Learning outcomes Index: lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r5563dc18a8b8d19478fb804c8beef31e63bd249b -re2f52f574599806a41fe8864002496eaf73ff722 --- lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 5563dc18a8b8d19478fb804c8beef31e63bd249b) +++ lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision e2f52f574599806a41fe8864002496eaf73ff722) @@ -35,6 +35,7 @@ define.later.message = Please wait for the instructor to complete the contents of this activity. button.try.again = Try again label.authoring.advanced.reflectOnActivity = Add a notebook at end of the activity with the following instructions: +label.authoring.advanced.maxMark = Maximum mark title.reflection = Notebook entry label.continue = Continue message.no.reflection.available = No notebook available @@ -83,7 +84,7 @@ label.monitoring.learner.marks.first.name = First name label.monitoring.learner.marks.last.name = Last name label.monitoring.learner.marks.mark = Mark -label.monitoring.learner.marks.mark.tip = (click to edit; max: 100) +label.monitoring.learner.marks.mark.tip = (click to edit; max: {0}) messsage.monitoring.learner.marks.no.data = No learner data found messsage.monitoring.learner.marks.update.fail = Error while updating a learner mark outcome.authoring.title = Learning outcomes @@ -129,3 +130,14 @@ label.gallery.walk.state.started = started label.gallery.walk.state.finished = finished label.gallery.walk.state.learner.edit.enabled = , learners can modify answers +monitor.summary.date.restriction = Date and time restriction +monitor.summary.when.date.restriction.is.set = If a date and time restriction is set, learners will not be able to submit assignments after this date. +monitor.summary.after.date = Date and time: +monitor.summary.set.restriction = Set restriction +monitor.summary.unset.restriction = Remove restriction +authoring.info.teacher.set.restriction = The teacher has set a restriction for submission from {0}. +label.sorry.the.deadline.has.passed = Sorry, the deadline to participate in this activity has passed. Please contact your teacher for further details. +monitor.summary.notification = Notification +monitor.summary.date.restriction.set = Date availability has been set +monitor.summary.date.restriction.removed = Date availability has been removed + Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20230330.sql =================================================================== diff -u --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20230330.sql (revision 0) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20230330.sql (revision e2f52f574599806a41fe8864002496eaf73ff722) @@ -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-5378 Add max mark for whole dokumaran activity +ALTER TABLE tl_ladoku11_dokumaran ADD COLUMN max_mark TINYINT UNSIGNED NOT NULL DEFAULT '100' AFTER reflect_on_activity; + +-- 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; Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java =================================================================== diff -u -r1621b6daf8385b83e75f7ffde03c017b05c12487 -re2f52f574599806a41fe8864002496eaf73ff722 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java (.../Dokumaran.java) (revision 1621b6daf8385b83e75f7ffde03c017b05c12487) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java (.../Dokumaran.java) (revision e2f52f574599806a41fe8864002496eaf73ff722) @@ -76,13 +76,15 @@ private String instructions; // advance - @Column(name = "use_select_leader_tool_ouput") private boolean useSelectLeaderToolOuput; @Column(name = "allow_multiple_leaders") private boolean allowMultipleLeaders; + @Column(name = "max_mark") + private int maxMark; + @Column(name = "submission_deadline") private Date submissionDeadline; @@ -464,6 +466,14 @@ this.reflectOnActivity = reflectOnActivity; } + public int getMaxMark() { + return maxMark; + } + + public void setMaxMark(int maxMark) { + this.maxMark = maxMark; + } + public boolean isGalleryWalkEnabled() { return galleryWalkEnabled; } Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranOutputFactory.java =================================================================== diff -u -r55f13a696f5ed5cf77c8c273b756f2e415a4b3c0 -re2f52f574599806a41fe8864002496eaf73ff722 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranOutputFactory.java (.../DokumaranOutputFactory.java) (revision 55f13a696f5ed5cf77c8c273b756f2e415a4b3c0) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranOutputFactory.java (.../DokumaranOutputFactory.java) (revision e2f52f574599806a41fe8864002496eaf73ff722) @@ -30,6 +30,7 @@ import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; import org.lamsfoundation.lams.tool.dokumaran.DokumaranConstants; +import org.lamsfoundation.lams.tool.dokumaran.model.Dokumaran; import org.lamsfoundation.lams.tool.exception.ToolException; public class DokumaranOutputFactory extends OutputFactory { @@ -43,8 +44,13 @@ TreeMap definitionMap = new TreeMap<>(); switch (definitionType) { case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_CONDITION: + Integer maxMark = 100; + if (toolContentObject != null) { + Dokumaran dokumaran = (Dokumaran) toolContentObject; + maxMark = dokumaran.getMaxMark(); + } ToolOutputDefinition manualGradingDefinition = buildRangeDefinition( - DokumaranConstants.MANUAL_GRADING_DEFINITION_NAME, 0L, 100L, true); + DokumaranConstants.MANUAL_GRADING_DEFINITION_NAME, 0L, maxMark.longValue(), true); manualGradingDefinition.setWeightable(true); manualGradingDefinition.setShowConditionNameOnly(true); definitionMap.put(DokumaranConstants.MANUAL_GRADING_DEFINITION_NAME, manualGradingDefinition); Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/form/DokumaranForm.java =================================================================== diff -u -r0ebaba46f0ce87b5138e8e70cc1965887c1c7787 -re2f52f574599806a41fe8864002496eaf73ff722 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/form/DokumaranForm.java (.../DokumaranForm.java) (revision 0ebaba46f0ce87b5138e8e70cc1965887c1c7787) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/form/DokumaranForm.java (.../DokumaranForm.java) (revision e2f52f574599806a41fe8864002496eaf73ff722) @@ -53,6 +53,7 @@ public DokumaranForm() { dokumaran = new Dokumaran(); dokumaran.setTitle("Shared Dokumaran"); + dokumaran.setMaxMark(100); currentTab = 1; } Index: lams_tool_doku/web/pages/authoring/advance.jsp =================================================================== diff -u -r2db54768ed82bc5868fa55c0bfb46445fdb06770 -re2f52f574599806a41fe8864002496eaf73ff722 --- lams_tool_doku/web/pages/authoring/advance.jsp (.../advance.jsp) (revision 2db54768ed82bc5868fa55c0bfb46445fdb06770) +++ lams_tool_doku/web/pages/authoring/advance.jsp (.../advance.jsp) (revision e2f52f574599806a41fe8864002496eaf73ff722) @@ -38,8 +38,14 @@ -
+ + +
+ +