workshop displays assessment weight in the grading evaluation report

diff --git a/mod/workshop/lang/en_utf8/workshop.php b/mod/workshop/lang/en_utf8/workshop.php
index e3107206d6bf5e421fdea474464e384d083b9b3f..b253ec4fd5623b3e8850e9d26ec3aca7ed4716dd 100644 (file)
--- a/mod/workshop/lang/en_utf8/workshop.php
+++ b/mod/workshop/lang/en_utf8/workshop.php
@@ -96,8 +96,8 @@ $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['formatpeergrade'] = '$a->grade ($a->gradinggrade)';
-$string['formatpeergradeover'] = '$a->grade (<del>$a->gradinggrade</del> / <ins>$a->gradinggradeover</ins>)';
+$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> @ <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/locallib.php b/mod/workshop/locallib.php
index c685229c6e1bd8bb1d4e6adbddf8c430ad458ea5..e9b48508119411926e055488dcc036e31fe83013 100644 (file)
--- a/mod/workshop/locallib.php
+++ b/mod/workshop/locallib.php
@@ -1330,7 +1330,7 @@ class workshop {
         $reviewers = array();
         if ($submissions) {
             list($submissionids, $params) = $DB->get_in_or_equal(array_keys($submissions), SQL_PARAMS_NAMED);
-            $sql = "SELECT a.id AS assessmentid, a.submissionid, a.grade, a.gradinggrade, a.gradinggradeover,
+            $sql = "SELECT a.id AS assessmentid, a.submissionid, a.grade, a.gradinggrade, a.gradinggradeover, a.weight,
                            r.id AS reviewerid, r.lastname, r.firstname, r.picture, r.imagealt,
                            s.id AS submissionid, s.authorid
                       FROM {workshop_assessments} a
@@ -1355,7 +1355,7 @@ class workshop {
         if ($participants) {
             list($participantids, $params) = $DB->get_in_or_equal(array_keys($participants), SQL_PARAMS_NAMED);
             $params['workshopid'] = $this->id;
-            $sql = "SELECT a.id AS assessmentid, a.submissionid, a.grade, a.gradinggrade, a.gradinggradeover, a.reviewerid,
+            $sql = "SELECT a.id AS assessmentid, a.submissionid, a.grade, a.gradinggrade, a.gradinggradeover, a.reviewerid, a.weight,
                            s.id AS submissionid,
                            e.id AS authorid, e.lastname, e.firstname, e.picture, e.imagealt
                       FROM {user} u
@@ -1410,6 +1410,7 @@ class workshop {
             $info->grade = $this->real_grade($reviewer->grade);
             $info->gradinggrade = $this->real_grading_grade($reviewer->gradinggrade);
             $info->gradinggradeover = $this->real_grading_grade($reviewer->gradinggradeover);
+            $info->weight = $reviewer->weight;
             $grades[$reviewer->authorid]->reviewedby[$reviewer->reviewerid] = $info;
         }
         unset($reviewers);
@@ -1423,6 +1424,7 @@ class workshop {
             $info->grade = $this->real_grade($reviewee->grade);
             $info->gradinggrade = $this->real_grading_grade($reviewee->gradinggrade);
             $info->gradinggradeover = $this->real_grading_grade($reviewee->gradinggradeover);
+            $info->weight = $reviewee->weight;
             $grades[$reviewee->reviewerid]->reviewerof[$reviewee->authorid] = $info;
         }
         unset($reviewees);

diff --git a/mod/workshop/renderer.php b/mod/workshop/renderer.php
index 03b0356d415c9a3b57b36d39d6bf2b8800c2b35e..ebae07f376cfc17ffa3e824a12fba314bf393aa0 100644 (file)
--- a/mod/workshop/renderer.php
+++ b/mod/workshop/renderer.php
@@ -709,6 +709,7 @@ class mod_workshop_renderer extends plugin_renderer_base {
         $a = new stdClass();
         $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;
         if (is_null($assessment->gradinggradeover)) {
             $grade = get_string('formatpeergrade', 'workshop', $a);
         } else {

diff --git a/mod/workshop/styles.css b/mod/workshop/styles.css
index 2ab10d8bc32548ecd8d02829821fc3477cb176db..bdb72992630d712afcecc24e4af97e5237beb2a5 100644 (file)
--- a/mod/workshop/styles.css
+++ b/mod/workshop/styles.css
@@ -464,8 +464,13 @@
     white-space: nowrap;
 }
 
-.mod-workshop .grading-report .submissiongrade,
-.mod-workshop .grading-report .gradinggrade {
+.mod-workshop .grading-report .receivedgrade span.grade,
+.mod-workshop .grading-report .givengrade span.gradinggrade {
+    font-weight: bold;
+}
+
+.mod-workshop .grading-report .submissiongrade.cell,
+.mod-workshop .grading-report .gradinggrade.cell {
     text-align: center;
     font-size: 200%;
     white-space: nowrap;

diff --git a/mod/workshop/view.php b/mod/workshop/view.php
index bbb1ebe8895ddc6d54b015ff5ca6722b2dc4805e..791e5222042f93c14d4133b1dea1902dd21ac5c8 100644 (file)
--- a/mod/workshop/view.php
+++ b/mod/workshop/view.php
@@ -261,7 +261,6 @@ case workshop::PHASE_ASSESSMENT:
             }
             echo $OUTPUT->box_start('generalbox assessment-summary' . $class);
             echo $wsoutput->submission_summary($submission, $shownames);
-            echo get_string('givengradestatus', 'workshop', $status);
             $button = new html_form();
             $button->method         = 'get';
             $button->button->text   = $buttontext;