Index: lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -rae5273508e98e92fc4652bd46f1595dfb099b16e -r69bab93d4e5fe0103071789ddd666c031814e79c --- lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision ae5273508e98e92fc4652bd46f1595dfb099b16e) +++ lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 69bab93d4e5fe0103071789ddd666c031814e79c) @@ -176,6 +176,9 @@ email.label.feedback = Feedback from group members for {0}: email.label.self.rating = Self rating email.label.peers.ratng = Peers +email.label.spa.sapa.info.title = SPA Factor (Average) and SAPA Factor +email.label.spa.info = SPA: 'Performance' factor: this is the students' overall contribution to the team, score. +email.label.sapa.info = SAPA: 'Self Assessment to Peer Assessment': this is the 'Perception' factor and compares the student's perception of this performance relative to teammates' perception of his performance label.email.preview = Email preview button.preview.results = View / email results label.hide = Hide @@ -212,3 +215,9 @@ label.last.name = Last name label.all.learners = All label.group = Group +label.rating.rubrics.view = Learner rubrics view +label.rating.rubrics.view.learner = by learner +label.rating.rubrics.view.row = by rubrics row +label.rating.rubrics.in.between = in-between +label.rating.rubrics.in.between.enable = Add in-between columns in rubrics + Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/EmailAnalysisBuilder.java =================================================================== diff -u -rafa594dcd224f2a81243b912213fe8332ef589f0 -r69bab93d4e5fe0103071789ddd666c031814e79c --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/EmailAnalysisBuilder.java (.../EmailAnalysisBuilder.java) (revision afa594dcd224f2a81243b912213fe8332ef589f0) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/EmailAnalysisBuilder.java (.../EmailAnalysisBuilder.java) (revision 69bab93d4e5fe0103071789ddd666c031814e79c) @@ -68,6 +68,7 @@ // HTML Styles private static final String width100pc = "width:100%;"; private static final String tableBorderedStyle = "border-collapse:collapse;border-width:1px;border-style:solid;border-color:#777;"; + private static final String divSpaSapaInfoBorderStyle = "margin: auto;width: 50%;border-width:1px;border-style:solid;border-color:#777;background:#ffd236;padding:10px;"; private static final String centeredStyle = "text-align:center;"; private static final String headerBackgroundStyle = "background:#B9CDE5;"; private static final String highlightBackgroundStyle = "background:#D7E4BD;"; @@ -126,6 +127,10 @@ htmlText.append("

 

\n"); if (peerreview.isSelfReview()) { + htmlText.append("
\n

\n") + .append("

").append(getLocalisedMessage("email.label.spa.info")).append("

") + .append("

").append(getLocalisedMessage("email.label.sapa.info")).append("

\n

 

\n"); generateSAPASPAExplanation(htmlText, learnerData.getSPAFactor(), learnerData.getSAPAFactor()); htmlText.append("

 

\n"); } @@ -378,7 +383,7 @@ String spaFactor = roundTo2PlacesAsString(learnerData.getSPAFactor()); StringBuilder spaFactorCellContents = new StringBuilder().append(" ") - .append(getLocalisedMessage("email.SPA.factor")).append("").append(spaFactor) .append(""); htmlText.append(""); @@ -394,7 +399,7 @@ String selfRating = roundTo2PlacesAsString(criteriaData.selfRating); htmlText.append(""); if (!spaDone) { htmlText.append(spaFactorCellContents); @@ -404,16 +409,16 @@ String peerRatingExcSelf = roundTo2PlacesAsString(criteriaData.peerRatingExcSelf); htmlText.append(""); if (!spaDone) { if (isSelfReview) { String sapaFactor = roundTo2PlacesAsString(learnerData.getSAPAFactor()); htmlText.append(""); } else { htmlText.append(spaFactorCellContents); @@ -426,7 +431,7 @@ if (isSelfReview) { htmlText.append(""); htmlText.append("\n");
").append(selfRatingString) - .append("").append(selfRating).append("").append(peerRatingString).append("").append(peerRatingString).append("").append(peerRatingExcSelf) .append(" ") - .append(getLocalisedMessage("email.SAPA.factor")).append("") + .append(getLocalisedMessage("email.SAPA.factor")).append("") .append(sapaFactor).append("
").append("Self & Peers' Rating") - .append("").append(roundTo2PlacesAsString(criteriaData.peerRatingIncSelf)) .append("