Index: lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.hbm.xml
===================================================================
diff -u -rd2f1cafab9126e3848663764c082b76ccf2de0c5 -r0a6765ac7eb73c6b99c343a021877c48236241b8
--- lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.hbm.xml (.../Peerreview.hbm.xml) (revision d2f1cafab9126e3848663764c082b76ccf2de0c5)
+++ lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.hbm.xml (.../Peerreview.hbm.xml) (revision 0a6765ac7eb73c6b99c343a021877c48236241b8)
@@ -155,6 +155,14 @@
insert="true"
column="self_review"
/>
+
+
Your results are:
This message was send automatically, please do not reply to it.
+event.sent.results.criteria.comment={0}:
{0} (Star): {1}
{0} (Mark Hedging): {1} out of {2}
+event.sent.results.criteria.rank={0} (Rank): {1} out of {2}
+event.sent.results.criteria.rankAll={0} (Rank All): {1}
+event.sent.results.no.results=No results +msg.results.sent={0} Email(s) Sent +button.email.results=Email Results +label.notify.user.of.results=Notify Users of Results \ No newline at end of file Index: lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -rf059acd48464d2785b1ab003d64cc21747bba49d -r0a6765ac7eb73c6b99c343a021877c48236241b8 --- lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision f059acd48464d2785b1ab003d64cc21747bba49d) +++ lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 0a6765ac7eb73c6b99c343a021877c48236241b8) @@ -120,7 +120,7 @@ label.step=Step {0} of {1} label.mark=Mark label.rank=Rank -label.authoring.self.review=Allow Self Review +label.self.review=Allow Self Review label.monitoring.num.of.comments={0} Comments label.monitoring.instructions.rank.all.learners=Learners needed to rank ALL the learners. label.monitoring.instructions.rank.some.learners=Learners needed to rank {0} learners. @@ -133,4 +133,15 @@ label.monitoring.number.learners=Number of learners label.monitoring.number.learners.finished=Number of learners finished label.monitoring.view=View {0} -label.close=Close \ No newline at end of file +label.close=Close +event.sent.results.subject=LAMS: {0} results were released +event.sent.results.body={0}
Your results are:
This message was send automatically, please do not reply to it.
+event.sent.results.criteria.comment={0}:
{0} (Star): {1}
{0} (Mark Hedging): {1} out of {2}
+event.sent.results.criteria.rank={0} (Rank): {1} out of {2}
+event.sent.results.criteria.rankAll={0} (Rank All): {1}
+event.sent.results.no.results=No results +msg.results.sent={0} Email(s) Sent +button.email.results=Email Results +label.notify.user.of.results=Notify Users of Results \ No newline at end of file Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20161026.sql =================================================================== diff -u --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20161026.sql (revision 0) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20161026.sql (revision 0a6765ac7eb73c6b99c343a021877c48236241b8) @@ -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-3767 Peer review: two new review methods. Allow monitor to email results to users + +ALTER TABLE tl_laprev11_peerreview ADD COLUMN notify_users_of_results TINYINT(4) DEFAULT '1'; + +----------------------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_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java =================================================================== diff -u -rd2f1cafab9126e3848663764c082b76ccf2de0c5 -r0a6765ac7eb73c6b99c343a021877c48236241b8 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java (.../Peerreview.java) (revision d2f1cafab9126e3848663764c082b76ccf2de0c5) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java (.../Peerreview.java) (revision 0a6765ac7eb73c6b99c343a021877c48236241b8) @@ -82,6 +82,8 @@ private boolean selfReview; + private boolean notifyUsersOfResults; + // ********************************************************** // Function method for Peerreview // ********************************************************** @@ -392,4 +394,12 @@ public void setSelfReview(boolean selfReview) { this.selfReview = selfReview; } + + public boolean isNotifyUsersOfResults() { + return notifyUsersOfResults; + } + + public void setNotifyUsersOfResults(boolean notifyUsersOfResults) { + this.notifyUsersOfResults = notifyUsersOfResults; + } } Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/peerreviewApplicationContext.xml =================================================================== diff -u -r9fc998daa072351bbb64ed9d16a1c571c8136b64 -r0a6765ac7eb73c6b99c343a021877c48236241b8 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/peerreviewApplicationContext.xml (.../peerreviewApplicationContext.xml) (revision 9fc998daa072351bbb64ed9d16a1c571c8136b64) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/peerreviewApplicationContext.xml (.../peerreviewApplicationContext.xml) (revision 0a6765ac7eb73c6b99c343a021877c48236241b8) @@ -65,7 +65,8 @@