From a8b6fc0e702f0497f29c00967fb1d2a44f2f52d1 Mon Sep 17 00:00:00 2001
From: David Mudrak <david.mudrak@gmail.com>
Date: Mon, 4 Jan 2010 18:30:20 +0000
Subject: [PATCH] workshop grading report improved displaying of grades

Weight of assessment is expected to be equal 1 in majority of cases.
Such weight will not be displayed. As the comment says - this logic
should really go to the language pack level.
---
 mod/workshop/lang/en_utf8/workshop.php |  6 ++++--
 mod/workshop/renderer.php              | 13 +++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/mod/workshop/lang/en_utf8/workshop.php b/mod/workshop/lang/en_utf8/workshop.php
index b0c75512dd..c1a6cd2dba 100644
--- a/mod/workshop/lang/en_utf8/workshop.php
+++ b/mod/workshop/lang/en_utf8/workshop.php
@@ -95,8 +95,10 @@ $string['feedbackauthor'] = 'Feedback for the author';
 $string['feedbackreviewer'] = 'Feedback for the reviewer';
 $string['formataggregatedgrade'] = '$a->grade';
 $string['formataggregatedgradeover'] = '<del>$a->grade</del><br /><ins>$a->over</ins>';
-$string['formatpeergradeover'] = '<span class=\"grade\">$a->grade</span> <span class=\"gradinggrade\">(<del>$a->gradinggrade</del> / <ins>$a->gradinggradeover</ins>)</span> @ <span class=\"weight\">{$a->weight}</span>';
-$string['formatpeergrade'] = '<span class=\"grade\">$a->grade</span> <span class=\"gradinggrade\">({$a->gradinggrade})</span> @ <span class=\"weight\">{$a->weight}</span>';
+$string['formatpeergradeover'] = '<span class=\"grade\">$a->grade</span> <span class=\"gradinggrade\">(<del>$a->gradinggrade</del> / <ins>$a->gradinggradeover</ins>)</span>';
+$string['formatpeergradeoverweighted'] = '<span class=\"grade\">$a->grade</span> <span class=\"gradinggrade\">(<del>$a->gradinggrade</del> / <ins>$a->gradinggradeover</ins>)</span> @ <span class=\"weight\">{$a->weight}</span>';
+$string['formatpeergrade'] = '<span class=\"grade\">$a->grade</span> <span class=\"gradinggrade\">({$a->gradinggrade})</span>';
+$string['formatpeergradeweighted'] = '<span class=\"grade\">$a->grade</span> <span class=\"gradinggrade\">({$a->gradinggrade})</span> @ <span class=\"weight\">{$a->weight}</span>';
 $string['givengrades'] = 'Given grades';
 $string['gradecalculated'] = 'Calculated grade for submission';
 $string['gradedecimals'] = 'Decimal places in grades';
diff --git a/mod/workshop/renderer.php b/mod/workshop/renderer.php
index 0cb462b041..a3bdba0a09 100644
--- a/mod/workshop/renderer.php
+++ b/mod/workshop/renderer.php
@@ -710,11 +710,20 @@ class mod_workshop_renderer extends plugin_renderer_base {
         $a->grade = is_null($assessment->grade) ? get_string('nullgrade', 'workshop') : $assessment->grade;
         $a->gradinggrade = is_null($assessment->gradinggrade) ? get_string('nullgrade', 'workshop') : $assessment->gradinggrade;
         $a->weight = $assessment->weight;
+        // grrr the following logic should really be handled by a future language pack feature
         if (is_null($assessment->gradinggradeover)) {
-            $grade = get_string('formatpeergrade', 'workshop', $a);
+            if ($a->weight == 1) {
+                $grade = get_string('formatpeergrade', 'workshop', $a);
+            } else {
+                $grade = get_string('formatpeergradeweighted', 'workshop', $a);
+            }
         } else {
             $a->gradinggradeover = $assessment->gradinggradeover;
-            $grade = get_string('formatpeergradeover', 'workshop', $a);
+            if ($a->weight == 1) {
+                $grade = get_string('formatpeergradeover', 'workshop', $a);
+            } else {
+                $grade = get_string('formatpeergradeoverweighted', 'workshop', $a);
+            }
         }
         $link = new html_link();
         $link->text = $grade;
-- 
2.39.5