From: rkingdon <rkingdon>
Date: Sat, 13 Nov 2004 01:00:17 +0000 (+0000)
Subject: Display of current/final grades now has the individual lists order by
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=cb0a172434e4ffa9716d227a5c860dfc21c4f5dd;p=moodle.git

Display of current/final grades now has the individual lists order by
grade.
---

diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php
index b6310a4165..d1cd42a355 100644
--- a/mod/workshop/lib.php
+++ b/mod/workshop/lib.php
@@ -1221,19 +1221,23 @@ function workshop_get_assess_logs($course, $timestart) {
 
 
 //////////////////////////////////////////////////////////////////////////////////////
-function workshop_get_assessments($submission, $all = '') {
+function workshop_get_assessments($submission, $all = '', $order = '') {
     // Return assessments for this submission ordered oldest first, newest last
     // new assessments made within the editing time are NOT returned unless the
     // second argument is set to ALL
     global $CFG;
+    
 
+    if (!$order) {
+        $order = "timecreated DESC";
+    }
     if ($all != 'ALL') {
         $timenow = time();
         return get_records_select("workshop_assessments", "(submissionid = $submission->id) AND 
-            (timecreated < $timenow - $CFG->maxeditingtime)", "timecreated DESC");
+            (timecreated < $timenow - $CFG->maxeditingtime)", $order);
     } else {
         return get_records_select("workshop_assessments", "submissionid = $submission->id", 
-                "timecreated DESC");
+                $order);
     }
 }
 
diff --git a/mod/workshop/locallib.php b/mod/workshop/locallib.php
index e803c2423f..6011ede7fa 100644
--- a/mod/workshop/locallib.php
+++ b/mod/workshop/locallib.php
@@ -2747,7 +2747,8 @@ function workshop_print_submission_assessments($workshop, $submission, $type) {
     }
  
     $str = '';
-    if ($assessments = workshop_get_assessments($submission)) {
+    // get the cold assessments in grade order, highest first
+    if ($assessments = workshop_get_assessments($submission, "cold", "grade DESC")) {
         switch ($type) {
             case "teacher" :
                 // students can see teacher assessments only if the release date has passed