The first and second assessments of each submission are now "graded" by

the workshop cron function. They are given the maximum grading grade.

diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php
index 1e17df003b51bad0474bbc68cfaf62150d8cfb1a..8c2ba1ee852bb6bcbfe48d9977e4e5d1794dd756 100644 (file)
--- a/mod/workshop/lib.php
+++ b/mod/workshop/lib.php
@@ -1674,6 +1674,15 @@ function workshop_grade_assessments($workshop) {
                             }
                         }
                     }
+                } else {
+                    // there are less 3 assessments for this submission
+                    foreach ($assessments as $assessment) {
+                        if (!$assessment->timegraded) {
+                            // set the grading grade to the maximum and say it's been graded 
+                            set_field("workshop_assessments", "gradinggrade", 100, "id", $assessment->id);
+                            set_field("workshop_assessments", "timegraded", $timenow, "id", $assessment->id);
+                        }
+                    }
                 }       
             }
         }

diff --git a/mod/workshop/locallib.php b/mod/workshop/locallib.php
index d72087076b8215028462a3104ef7f6bb69f116b5..ca47612e159a50bb7a58898a3f55481534700e24 100644 (file)
--- a/mod/workshop/locallib.php
+++ b/mod/workshop/locallib.php
@@ -2619,10 +2619,11 @@ function workshop_print_submission_assessments($workshop, $submission, $type) {
                                     number_format($assessment->gradinggrade * $workshop->gradinggrade / 100, 0).
                                     ")]</a> ";
                             } else {
-                                $str .= "&lt;".number_format($assessment->grade, 0)." (0)&gt;</a> ";
+                                $str .= "&lt;".number_format($assessment->grade * $workshop->grade / 100, 0).
+                                    " (0)&gt;</a> ";
                             }
                         } else {
-                            $str .= "[".number_format($assessment->grade, 0);
+                            $str .= "[".number_format($assessment->grade *$workshop->grade / 100, 0);
                             if ($workshop->wtype) { // print null grade if there are student assessments
                                 $str .= " ((".number_format($assessment->gradinggrade * $workshop->gradinggrade / 100,
                                             0)."))";