-
Index: lams_tool_preview/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r5d05bdfc363573135e137ba6ec059fc53af3645c -rafa594dcd224f2a81243b912213fe8332ef589f0
--- lams_tool_preview/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 5d05bdfc363573135e137ba6ec059fc53af3645c)
+++ lams_tool_preview/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision afa594dcd224f2a81243b912213fe8332ef589f0)
@@ -90,11 +90,19 @@
label.rating.style.ranking = Ranking
label.rating.style.hedging = Hedging
label.rating.style.comment = Comment
+label.rating.style.rubrics = Rubrics
label.rating.all = ALL
label.rating.author.justify = Ask for hedging justification?
label.rating.learner.hedge.assign.marks = Assign marks to answers. Max possible mark: 10
label.rating.learner.justify = Please, justify your mark allocation.
label.rating.max.hedge = Total hedge mark
+label.rating.rubrics.column.headers = Column headers
+label.rating.rubrics.column.content = Column content
+label.rating.rubrics.column.add = Add column
+label.rating.rubrics.row.headers = Row headers
+label.rating.rubrics.row.add = Add row
+label.rating.rubrics.error.rate = Error while saving your answer.
+label.rating.rubrics.expand.all = Expand all
error.rating.hedge.total.add.up = Marks for criteria {0} must add up to {1}
error.rating.rank.all = You must rank all the learners for criteria {0}
label.justify.hedging.marks = Justify your mark allocation.
@@ -132,6 +140,7 @@
msg.results.sent = {0} Email(s) Sent
button.email.results = Email Results
label.notify.user.of.results = Notify students of results
+confirm.notify.user.of.results =You are about to send the results of peer review by email to all students. Are you sure you want to do this now?
label.number.of.team.members = No of team members
label.average = Average
label.for.user = For {0}
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/EmailAnalysisBuilder.java
===================================================================
diff -u -re71845f3bb0d02540f9c16bcc783a71ee924de51 -rafa594dcd224f2a81243b912213fe8332ef589f0
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/EmailAnalysisBuilder.java (.../EmailAnalysisBuilder.java) (revision e71845f3bb0d02540f9c16bcc783a71ee924de51)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/EmailAnalysisBuilder.java (.../EmailAnalysisBuilder.java) (revision afa594dcd224f2a81243b912213fe8332ef589f0)
@@ -124,8 +124,12 @@
htmlText.append("
\n");
generateSelfPeerTable(htmlText, learnerData);
htmlText.append("
\n");
- generateSAPASPAExplanation(htmlText, learnerData.getSPAFactor(), learnerData.getSAPAFactor());
+ if (peerreview.isSelfReview()) {
+ generateSAPASPAExplanation(htmlText, learnerData.getSPAFactor(), learnerData.getSAPAFactor());
+ htmlText.append("
\n");
+ }
+
htmlText.append("
").append(getLocalisedMessage("email.send.automatically")).append("
\n");
htmlText.append("