Forum grades can now be numerical as well (like the other modules).

If so, grades in the gradebook are printed as proper numbers and
contribute to the total of the course.

lib/weblib.php

@@ -1383,7 +1383,7 @@ function print_time_selector($hour, $minute, $currenttime=0) {
     choose_from_menu($minutes, $minute, $currentdate['minutes'], "");
 }
 
-function print_grade_menu($courseid, $name, $current) {
+function print_grade_menu($courseid, $name, $current, $includenograde=true) {
 /// Prints a grade menu (as part of an existing form) with help
 /// Showing all possible numerical grades and scales
 
@@ -1396,7 +1396,9 @@ function print_grade_menu($courseid, $name, $current) {
     foreach ($scales as $i => $scalename) {
         $grades[-$i] = "$strscale: $scalename";
     }
-    $grades[0] = get_string("nograde");
+    if ($includenograde) {
+        $grades[0] = get_string("nograde");
+    }
     for ($i=100; $i>=1; $i--) {
         $grades[$i] = $i;
     }

mod/forum/db/mysql.php

@@ -70,6 +70,11 @@ function forum_upgrade($oldversion) {
       table_column("forum", "", "assesstimestart", "integer", "10", "unsigned", "0", "", "assessed");
       table_column("forum", "", "assesstimefinish", "integer", "10", "unsigned", "0", "", "assesstimestart");
   }
+
+  if ($oldversion < 2003082502) {
+      table_column("forum", "scale", "scale", "integer", "10", "", "0");
+      execute_sql("UPDATE {$CFG->prefix}forum SET scale = (- scale)");
+  }
   
   return true;
 

mod/forum/db/mysql.sql

@@ -12,7 +12,7 @@ CREATE TABLE prefix_forum (
   assessed int(10) unsigned NOT NULL default '0',
   assesstimestart int(10) unsigned NOT NULL default '0',
   assesstimefinish int(10) unsigned NOT NULL default '0',
-  scale int(10) unsigned NOT NULL default '0',
+  scale int(10) NOT NULL default '0',
   forcesubscribe tinyint(1) unsigned NOT NULL default '0',
   timemodified int(10) unsigned NOT NULL default '0',
   PRIMARY KEY  (id),

mod/forum/db/postgres7.php

@@ -15,6 +15,10 @@ function forum_upgrade($oldversion) {
       table_column("forum", "", "assesstimefinish", "integer", "10", "unsigned", "0", "", "assesstimestart");
   }
 
+  if ($oldversion < 2003082502) {
+      execute_sql("UPDATE {$CFG->prefix}forum SET scale = (- scale)");
+  }
+
   return true;
 
 }

mod/forum/lib.php

@@ -442,10 +442,7 @@ function forum_grades($forumid) {
     if (!$forum->assessed) {
         return false;
     }
-    if (!$scale = get_record("scale", "id", $forum->scale)) {
+    $scalemenu = make_grades_menu($forum->scale);
-        return false;
-    }
-    $scalemenu = make_menu_from_list($scale->scale);
 
     $currentuser = 0;
     $ratingsuser = array();
@@ -454,8 +451,18 @@ function forum_grades($forumid) {
         foreach ($ratings as $rating) {     // Ordered by user
             if ($currentuser and $rating->userid != $currentuser) {
                 if (!empty($ratingsuser)) {
-                    $return->grades[$currentuser] = forum_get_ratings_mean(0, $scalemenu, $ratingsuser);
+                    if ($forum->scale < 0) {
-                    $return->grades[$currentuser] .= "<br />".forum_get_ratings_summary(0, $scalemenu, $ratingsuser);
+                        $return->grades[$currentuser] = forum_get_ratings_mean(0, $scalemenu, $ratingsuser);
+                        $return->grades[$currentuser] .= "<br />".forum_get_ratings_summary(0, $scalemenu, $ratingsuser);
+                    } else {
+                        $total = 0;
+                        $count = 0;
+                        foreach ($ratingsuser as $ra) {
+                            $total += $ra;
+                            $count ++;
+                        }
+                        $return->grades[$currentuser] = format_float($total/$count, 2);
+                    }
                 } else {
                     $return->grades[$currentuser] = "";
                 }
@@ -465,8 +472,18 @@ function forum_grades($forumid) {
             $currentuser = $rating->userid;
         }
         if (!empty($ratingsuser)) {
-            $return->grades[$currentuser] = forum_get_ratings_mean(0, $scalemenu, $ratingsuser);
+            if ($forum->scale < 0) {
-            $return->grades[$currentuser] .= "<br />".forum_get_ratings_summary(0, $scalemenu, $ratingsuser);
+                $return->grades[$currentuser] = forum_get_ratings_mean(0, $scalemenu, $ratingsuser);
+                $return->grades[$currentuser] .= "<br />".forum_get_ratings_summary(0, $scalemenu, $ratingsuser);
+            } else {
+                $total = 0;
+                $count = 0;
+                foreach ($ratingsuser as $ra) {
+                    $total += $ra;
+                    $count ++;
+                }
+                $return->grades[$currentuser] = format_float((float)$total/(float)$count, 2);
+            }
         } else {
             $return->grades[$currentuser] = "";
         }
@@ -474,7 +491,11 @@ function forum_grades($forumid) {
         $return->grades = array();
     }
 
-    $return->maxgrade = "";
+    if ($forum->scale < 0) {
+        $return->maxgrade = "";
+    } else {
+        $return->maxgrade = $forum->scale;
+    }
     return $return;
 }
 
@@ -1947,8 +1968,7 @@ function forum_print_discussion($course, $forum, $discussion, $post, $mode) {
 
     $ratings = NULL;
     if ($forum->assessed and !empty($USER->id)) {
-        if ($scale = get_record("scale", "id", $forum->scale)) {
+        if ($ratings->scale = make_grades_menu($forum->scale)) {
-            $ratings->scale = make_menu_from_list($scale->scale);
             $ratings->assesstimestart = $forum->assesstimestart;
             $ratings->assesstimefinish = $forum->assesstimefinish;
             if ($forum->assessed == 2 and !isteacher($course->id)) {

mod/forum/mod.html

@@ -109,8 +109,8 @@
             helpbutton("ratings", get_string("allowratings", "forum"), "forum");
             echo "<br />";
 
-            echo get_string("scale").":";
+            echo get_string("grade").":";
-            print_scale_menu($course->id, "scale", $form->scale);
+            print_grade_menu($course->id, "scale", $form->scale, false);
             echo "<br />";
 
             echo "<input name=\"ratingtime\" type=checkbox value=1 ";

mod/forum/version.php

@@ -5,7 +5,7 @@
 //  This fragment is called by /admin/index.php
 ////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2003082500;
+$module->version  = 2003082502;
 $module->cron     = 60;
 
 ?>