MDL-10525 renaming class grade_grades and grade_grades_text - singulars for all grade...

diff --git a/grade/edit/grade.php b/grade/edit/grade.php
index cc3d7f7ffd6dd7eecf1527b49a449c5cb8438e51..fc1cc54e3e2ff4a968704dce735d9ce904bad927 100644 (file)
--- a/grade/edit/grade.php
+++ b/grade/edit/grade.php
@@ -6,7 +6,7 @@ require_once $CFG->libdir.'/gradelib.php';
 require_once 'grade_form.php';
 
 $courseid = required_param('courseid', PARAM_INT);
-$id       = optional_param('id', 0, PARAM_INT); // grade_grades id
+$id       = optional_param('id', 0, PARAM_INT); // grade_grade id
 $action   = optional_param('action', 'view', PARAM_ALPHA);
 
 if (!$course = get_record('course', 'id', $courseid)) {
@@ -24,11 +24,11 @@ $returnurl = $gpr->get_return_url($CFG->wwwroot.'/grade/report.php?id='.$course-
 
 // TODO: add proper check that grade is editable
 
-$grade_grades = get_record('grade_grades', 'id', $id);
-$gradeitem = get_record('grade_items', 'id', $grade_grades->itemid);
+$grade_grade = get_record('grade_grades', 'id', $id);
+$gradeitem = get_record('grade_items', 'id', $grade_grade->itemid);
 
 $mform = new edit_grade_form(null, array('gradeitem'=>$gradeitem, 'gpr'=>$gpr));
-if ($grade_grades = get_record('grade_grades', 'id', $id)) {
+if ($grade_grade = get_record('grade_grades', 'id', $id)) {
     if ($grade_text = get_record('grade_grades_text', 'gradeid', $id)) {
         if (can_use_html_editor()) {
             $options = new object();
@@ -40,9 +40,9 @@ if ($grade_grades = get_record('grade_grades', 'id', $id)) {
         $mform->set_data($grade_text);
     }
 
-    $grade_grades->locked = $grade_grades->locked > 0 ? 1:0;
-    $grade_grades->courseid = $courseid;
-    $mform->set_data($grade_grades);
+    $grade_grade->locked = $grade_grade->locked > 0 ? 1:0;
+    $grade_grade->courseid = $courseid;
+    $mform->set_data($grade_grade);
 
 } else {
     $mform->set_data(array('courseid'=>$course->id, 'id' => $id));
@@ -52,21 +52,21 @@ if ($mform->is_cancelled()) {
     redirect($returnurl);
 // form processing
 } else if ($data = $mform->get_data()) {
-    $grade_grades = new grade_grades(array('id'=>$id));
-    $grade_item = new grade_item(array('id'=>$grade_grades->itemid));
-    $grade_item->update_final_grade($grade_grades->userid, $data->finalgrade, NULL, NULL, $data->feedback, $data->feedbackformat);
+    $grade_grade = new grade_grade(array('id'=>$id));
+    $grade_item = new grade_item(array('id'=>$grade_grade->itemid));
+    $grade_item->update_final_grade($grade_grade->userid, $data->finalgrade, NULL, NULL, $data->feedback, $data->feedbackformat);
 
     // Assign finalgrade value
-    $grade_grades->finalgrade = $data->finalgrade;
+    $grade_grade->finalgrade = $data->finalgrade;
 
     // set locked
-    $grade_grades->set_locked($data->locked);
+    $grade_grade->set_locked($data->locked);
 
     // set hidden
-    $grade_grades->set_hidden($data->hidden);
+    $grade_grade->set_hidden($data->hidden);
 
     // set locktime
-    $grade_grades->set_locktime($data->locktime);
+    $grade_grade->set_locktime($data->locktime);
 
     redirect($returnurl);
 }

diff --git a/grade/export/lib.php b/grade/export/lib.php
index df39b919506d8ad4f9a215fdb1b5ae0aeb5429a9..cac51e88f21b342eb9933ba3805acac54e186027 100755 (executable)
--- a/grade/export/lib.php
+++ b/grade/export/lib.php
@@ -127,7 +127,7 @@ class grade_export {
             }
         } else {
             // else we get all items for this course
-            $gradeitems = grade_grades::fetch_all(array('courseid'=>$this->id));
+            $gradeitems = grade_grade::fetch_all(array('courseid'=>$this->id));
         }
 
         if ($gradeitems) {
@@ -172,7 +172,7 @@ class grade_export {
                                 if ($studentgrade) {
                                     $studentgrade->load_text();
                                     // get the actual comment
-                                    $comment = $studentgrade->grade_grades_text->feedback;
+                                    $comment = $studentgrade->grade_grade_text->feedback;
                                     $this->comments[$student->id][$gradeitem->id] = $comment;
                                 }
                             } else {

diff --git a/grade/export/ods/grade_export_ods.php b/grade/export/ods/grade_export_ods.php
index bca72ecb79f41142f7bc329d0ff370c2204a9f33..c7bc34bd47d7df62498615cdf231f47c747dd246 100755 (executable)
--- a/grade/export/ods/grade_export_ods.php
+++ b/grade/export/ods/grade_export_ods.php
@@ -106,17 +106,17 @@ class grade_export_ods extends grade_export {
                     }
 
                     /// if export flag needs to be set
-                    /// construct the grade_grades object and update timestamp if CFG flag is set
+                    /// construct the grade_grade object and update timestamp if CFG flag is set
 
                     if ($export) {
                         $params= new object();
                         $params->itemid = $gradeitemid;
                         $params->userid = $studentid;
 
-                        $grade_grades = new grade_grades($params);
-                        $grade_grades->exported = time();
+                        $grade_grade = new grade_grade($params);
+                        $grade_grade->exported = time();
                         // update the time stamp;
-                        $grade_grades->update();
+                        $grade_grade->update();
                     }
                 }
                 $myxls->write_number($i,$j,$this->totals[$student->id]);

diff --git a/grade/export/txt/grade_export_txt.php b/grade/export/txt/grade_export_txt.php
index c2330ede1a61d41bffec8f50a042e6cfe6999339..c41e9a4428372d0f4872cd576932553714880712 100755 (executable)
--- a/grade/export/txt/grade_export_txt.php
+++ b/grade/export/txt/grade_export_txt.php
@@ -97,17 +97,17 @@ class grade_export_txt extends grade_export {
                 }
 
                 /// if export flag needs to be set
-                /// construct the grade_grades object and update timestamp if CFG flag is set
+                /// construct the grade_grade object and update timestamp if CFG flag is set
 
                 if ($export) {
                     $params = new object();
                     $params->itemid = $gradeitemid;
                     $params->userid = $studentid;
 
-                    $grade_grades = new grade_grades($params);
-                    $grade_grades->exported = time();
+                    $grade_grade = new grade_grade($params);
+                    $grade_grade->exported = time();
                     // update the time stamp;
-                    $grade_grades->update();
+                    $grade_grade->update();
                 }
             }
             echo "{$this->separator}".$this->totals[$student->id];

diff --git a/grade/export/xls/grade_export_xls.php b/grade/export/xls/grade_export_xls.php
index 98d4f8b8badad1e8a706bcf9e6447061d65f2b72..70c46b0afbe3a399da85dd87d2140e3d57bd2145 100755 (executable)
--- a/grade/export/xls/grade_export_xls.php
+++ b/grade/export/xls/grade_export_xls.php
@@ -105,17 +105,17 @@ class grade_export_xls extends grade_export {
                     }
 
                     /// if export flag needs to be set
-                    /// construct the grade_grades object and update timestamp if CFG flag is set
+                    /// construct the grade_grade object and update timestamp if CFG flag is set
 
                     if ($export) {
                         $params = new object();
                         $params->itemid = $gradeitemid;
                         $params->userid = $studentid;
 
-                        $grade_grades = new grade_grades($params);
-                        $grade_grades->exported = time();
+                        $grade_grade = new grade_grade($params);
+                        $grade_grade->exported = time();
                         // update the time stamp;
-                        $grade_grades->update();
+                        $grade_grade->update();
                     }
                 }
                 $myxls->write_number($i,$j,$this->totals[$student->id]);

diff --git a/grade/export/xml/grade_export_xml.php b/grade/export/xml/grade_export_xml.php
index d69e73c762d2fc07958eaa24737d9801818a8d8f..e1dfe8199d899d8c753e1b150ae87becc0ed39ad 100755 (executable)
--- a/grade/export/xml/grade_export_xml.php
+++ b/grade/export/xml/grade_export_xml.php
@@ -74,17 +74,17 @@ class grade_export_xml extends grade_export {
                 // we are trying to figure out if this is a new grade, or a regraded grade
                 // only relevant if this grade for this user is already exported
 
-                // get the grade_grades for this user
+                // get the grade_grade for this user
                 $params = new object();
                 $params->itemid = $gradeitem->id;
                 $params->userid = $studentid;
 
-                $grade_grades = new grade_grades($params);
+                $grade_grade = new grade_grade($params);
 
                 // if exported, check grade_history, if modified after export, set state to regrade
-                if (!empty($grade_grades->exported)) {
+                if (!empty($grade_grade->exported)) {
                     //TODO: use timemodified or something else instead
-/*                    if (record_exists_select('grade_history', 'itemid = '.$gradeitem->id.' AND userid = '.$studentid.' AND timemodified > '.$grade_grades->exported)) {
+/*                    if (record_exists_select('grade_history', 'itemid = '.$gradeitem->id.' AND userid = '.$studentid.' AND timemodified > '.$grade_grade->exported)) {
                         $status = 'regrade';
                     } else {
                         $status = 'new';
@@ -107,9 +107,9 @@ class grade_export_xml extends grade_export {
 
                 // timestamp this if needed
                 if ($export) {
-                    $grade_grades->exported = time();
+                    $grade_grade->exported = time();
                     // update the time stamp;
-                    $grade_grades->update();
+                    $grade_grade->update();
                 }
             }
         }

diff --git a/grade/import/csv/index.php b/grade/import/csv/index.php
index 48a0af3fa33da446ebd305b6614572b68060ba98..76779acf40eae4337732a9b6f0b6d2156bd27e72 100755 (executable)
--- a/grade/import/csv/index.php
+++ b/grade/import/csv/index.php
@@ -266,9 +266,9 @@ if (($formdata = data_submitted()) && !empty($formdata->map)) {
 
                 foreach ($newgrades as $newgrade) {
 
-                    // check if grade_grades is locked and if so, abort
-                    if ($grade_grades = new grade_grades(array('itemid'=>$newgrade->itemid, 'userid'=>$studentid))) {
-                        if ($grade_grades->locked) {
+                    // check if grade_grade is locked and if so, abort
+                    if ($grade_grade = new grade_grade(array('itemid'=>$newgrade->itemid, 'userid'=>$studentid))) {
+                        if ($grade_grade->locked) {
                             // individual grade locked
                             $status = false;
                             import_cleanup($importcode);

diff --git a/grade/import/xml/index.php b/grade/import/xml/index.php
index 8f7c9e86494bdf6d7459d27da3ed953d83a2a9ab..9eb04004c0eb587a8584dc28976c987a03565187 100755 (executable)
--- a/grade/import/xml/index.php
+++ b/grade/import/xml/index.php
@@ -96,9 +96,9 @@ if ( $formdata = $mform->get_data()) {
                 break 3;
             }
 
-            // check if grade_grades is locked and if so, abort
-            if ($grade_grades = new grade_grades(array('itemid'=>$gradeitem->id, 'userid'=>$result['#']['student'][0]['#']))) {
-                if ($grade_grades->locked) {
+            // check if grade_grade is locked and if so, abort
+            if ($grade_grade = new grade_grade(array('itemid'=>$gradeitem->id, 'userid'=>$result['#']['student'][0]['#']))) {
+                if ($grade_grade->locked) {
                     // individual grade locked, abort
                     $status = false;
                     notify(get_string('gradegradeslocked', 'grades'));

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index 203d176af2f7999ef138a3d8f5043dd0aa795668..a662ea7a51b4ab9f58e7792a65bf5e3ddaebae14 100644 (file)
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -172,7 +172,7 @@ class grade_report_grader extends grade_report {
             }
 
             // Get the grade object to compare old value with new value, the grade might not exist yet
-            $grade = new grade_grades(array('userid'=>$userid, 'itemid'=>$grade_item->id));
+            $grade = new grade_grade(array('userid'=>$userid, 'itemid'=>$grade_item->id));
 
             if ($data_type == 'feedback') {
                 if ($text = $grade->load_text()) {
@@ -620,13 +620,13 @@ class grade_report_grader extends grade_report {
                 if (isset($this->finalgrades[$userid][$item->id])) {
                     $gradeval = $this->finalgrades[$userid][$item->id]->finalgrade;
 
-                    $grade = new grade_grades($this->finalgrades[$userid][$item->id], false);
+                    $grade = new grade_grade($this->finalgrades[$userid][$item->id], false);
                     $grade->feedback = stripslashes_safe($this->finalgrades[$userid][$item->id]->feedback);
                     $grade->feedbackformat = $this->finalgrades[$userid][$item->id]->feedbackformat;
 
                 } else {
                     $gradeval = null;
-                    $grade = new grade_grades(array('userid' => $userid, 'itemid' => $item->id), false);
+                    $grade = new grade_grade(array('userid' => $userid, 'itemid' => $item->id), false);
                     $grade->feedback = '';
                 }
 
@@ -638,7 +638,7 @@ class grade_report_grader extends grade_report {
 
                 // emulate grade element
                 $grade->courseid = $this->courseid;
-                $grade->grade_item = $item; // this may speedup is_hidden() and other grade_grades methods
+                $grade->grade_item = $item; // this may speedup is_hidden() and other grade_grade methods
                 $element = array ('eid'=>'g'.$grade->id, 'object'=>$grade, 'type'=>'grade');
 
                 // Do not show any icons if no grade (no record in DB to match)
@@ -713,7 +713,7 @@ class grade_report_grader extends grade_report {
 
                     if ($gradedisplaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE) {
                         if (!is_null($gradeval)) {
-                            $gradeval = grade_grades::standardise_score($gradeval, $grademin, $grademax, 0, 100);
+                            $gradeval = grade_grade::standardise_score($gradeval, $grademin, $grademax, 0, 100);
                         }
                         $percentsign = '%';
                     }
@@ -732,7 +732,7 @@ class grade_report_grader extends grade_report {
                     if ($gradedisplaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_LETTER) {
                         $letters = grade_report::get_grade_letters();
                         if (!is_null($gradeval)) {
-                            $studentshtml .= grade_grades::get_letter($letters, $gradeval, $grademin, $grademax);
+                            $studentshtml .= grade_grade::get_letter($letters, $gradeval, $grademin, $grademax);
                         }
                     } else if ($item->scaleid && !empty($scales_array[$item->scaleid])
                                 && $gradedisplaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_REAL) {
@@ -853,11 +853,11 @@ class grade_report_grader extends grade_report {
                     }
 
                     if ($displaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE) {
-                        $gradeval = grade_grades::standardise_score($rawvalue, $item->grademin, $item->grademax, 0, 100);
+                        $gradeval = grade_grade::standardise_score($rawvalue, $item->grademin, $item->grademax, 0, 100);
                         $gradehtml = round($gradeval, $decimalpoints) . '%';
                     } elseif ($displaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_LETTER) {
                         $letters = grade_report::get_grade_letters();
-                        $gradehtml = grade_grades::get_letter($letters, $gradeval, $item->grademin, $item->grademax);
+                        $gradehtml = grade_grade::get_letter($letters, $gradeval, $item->grademin, $item->grademax);
                     }
 
                     $groupavghtml .= '<td>'.$gradehtml.'</td>';
@@ -949,11 +949,11 @@ class grade_report_grader extends grade_report {
                     }
 
                     if ($displaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_PERCENTAGE) {
-                        $gradeval = grade_grades::standardise_score($rawvalue, $item->grademin, $item->grademax, 0, 100);
+                        $gradeval = grade_grade::standardise_score($rawvalue, $item->grademin, $item->grademax, 0, 100);
                         $gradehtml = round($gradeval, $decimalpoints) . '%';
                     } elseif ($displaytype == GRADE_REPORT_GRADE_DISPLAY_TYPE_LETTER) {
                         $letters = grade_report::get_grade_letters();
-                        $gradehtml = grade_grades::get_letter($letters, $gradeval, $item->grademin, $item->grademax);
+                        $gradehtml = grade_grade::get_letter($letters, $gradeval, $item->grademin, $item->grademax);
                     }
 
                     $gradeavghtml .= '<td>'.$gradehtml.'</td>';
@@ -1158,7 +1158,7 @@ class grade_report_grader extends grade_report {
 
         // Icons shown when edit mode is on
         if ($USER->gradeediting) {
-            // Edit icon (except for grade_grades)
+            // Edit icon (except for grade_grade)
             if ($edit_icon) {
                 $html .= $edit_icon;
             }

diff --git a/grade/report/user/lib.php b/grade/report/user/lib.php
index 3b8e21c26c5e2c69415bc98b5dfd38a060d0e5e8..deca3792ae3054d2ca0815c455da890509497127 100644 (file)
--- a/grade/report/user/lib.php
+++ b/grade/report/user/lib.php
@@ -106,8 +106,8 @@ class grade_report_user extends grade_report {
 
                 $params->itemid = $grade_item->id;
                 $params->userid = $this->user->id;
-                $grade_grades = new grade_grades($params);
-                $grade_text = $grade_grades->load_text();
+                $grade_grade = new grade_grade($params);
+                $grade_text = $grade_grade->load_text();
 
                 /// prints mod icon if available
                 if ($grade_item->itemtype == 'mod') {
@@ -137,23 +137,23 @@ class grade_report_user extends grade_report {
                         $scales = explode(",", $scale->scale);
                         // reindex because scale is off 1
                         // invalid grade if gradeval < 1
-                        if ((int) $grade_grades->finalgrade < 1) {
+                        if ((int) $grade_grade->finalgrade < 1) {
                             $data[] = '-';
                         } else {
-                            $data[] = $scales[$grade_grades->finalgrade-1];
+                            $data[] = $scales[$grade_grade->finalgrade-1];
                         }
                     }
                 } else {
                     // normal grade, or text, just display
-                    $data[] = $this->get_grade_clean($grade_grades->finalgrade);
+                    $data[] = $this->get_grade_clean($grade_grade->finalgrade);
                 }
 
                 /// prints percentage
 
                 if ($grade_item->gradetype == GRADE_TYPE_VALUE) {
                     // processing numeric grade
-                    if ($grade_grades->finalgrade) {
-                        $percentage = $this->get_grade_clean(($grade_grades->finalgrade / $grade_item->grademax) * 100).'%';
+                    if ($grade_grade->finalgrade) {
+                        $percentage = $this->get_grade_clean(($grade_grade->finalgrade / $grade_item->grademax) * 100).'%';
                     } else {
                         $percentage = '-';
                     }
@@ -162,7 +162,7 @@ class grade_report_user extends grade_report {
                     // processing scale grade
                     $scale = get_record('scale', 'id', $grade_item->scaleid);
                     $scalevals = explode(",", $scale->scale);
-                    $percentage = $this->get_grade_clean(($grade_grades->finalgrade) / count($scalevals) * 100).'%';
+                    $percentage = $this->get_grade_clean(($grade_grade->finalgrade) / count($scalevals) * 100).'%';
 
                 } else {
                     // text grade
@@ -172,11 +172,11 @@ class grade_report_user extends grade_report {
                 $data[] = $percentage;
 
                 /// prints rank
-                if ($grade_grades->finalgrade) {
+                if ($grade_grade->finalgrade) {
                     /// find the number of users with a higher grade
                     $sql = "SELECT COUNT(DISTINCT(userid))
                             FROM {$CFG->prefix}grade_grades
-                            WHERE finalgrade > $grade_grades->finalgrade
+                            WHERE finalgrade > $grade_grade->finalgrade
                             AND itemid = $grade_item->id";
                     $rank = count_records_sql($sql) + 1;
 

diff --git a/lib/grade/grade_category.php b/lib/grade/grade_category.php
index be253c55fa6a4bca5ae33398fb53da88133384d2..ad2ffb7bee74e9dce9fe0aaebb025da27da40314 100644 (file)
--- a/lib/grade/grade_category.php
+++ b/lib/grade/grade_category.php
@@ -387,12 +387,12 @@ class grade_category extends grade_object {
         }
 
         if ($oldgrade) {
-            $grade = new grade_grades($oldgrade, false);
+            $grade = new grade_grade($oldgrade, false);
             $grade->grade_item =& $this->grade_item;
 
         } else {
             // insert final grade - it will be needed later anyway
-            $grade = new grade_grades(array('itemid'=>$this->grade_item->id, 'userid'=>$userid), false);
+            $grade = new grade_grade(array('itemid'=>$this->grade_item->id, 'userid'=>$userid), false);
             $grade->insert('system');
             $grade->grade_item =& $this->grade_item;
 
@@ -430,7 +430,7 @@ class grade_category extends grade_object {
                 unset($grade_values[$k]);
                 continue;
             }
-            $grade_values[$k] = grade_grades::standardise_score($v, $items[$k]->grademin, $items[$k]->grademax, 0, 1);
+            $grade_values[$k] = grade_grade::standardise_score($v, $items[$k]->grademin, $items[$k]->grademax, 0, 1);
         }
 
         //limit and sort
@@ -570,7 +570,7 @@ class grade_category extends grade_object {
         $grade->rawscaleid  = $this->grade_item->scaleid;
 
         // recalculate the rawgrade back to requested range
-        $grade->rawgrade = grade_grades::standardise_score($rawgrade, 0, 1, $grade->rawgrademin, $grade->rawgrademax);
+        $grade->rawgrade = grade_grade::standardise_score($rawgrade, 0, 1, $grade->rawgrademin, $grade->rawgrademax);
 
         // calculate final grade
         $grade->finalgrade = $this->grade_item->adjust_grade($grade->rawgrade, $grade->rawgrademin, $grade->rawgrademax);

diff --git a/lib/grade/grade_grades.php b/lib/grade/grade_grade.php
similarity index 81%
rename from lib/grade/grade_grades.php
rename to lib/grade/grade_grade.php
index 68a5238ca6deacab9e6af8c14a9a0af535fb8cd9..eb070d28135c580813e84ae073b7f3f05542f523 100644 (file)
--- a/lib/grade/grade_grades.php
+++ b/lib/grade/grade_grade.php
@@ -25,7 +25,7 @@
 
 require_once('grade_object.php');
 
-class grade_grades extends grade_object {
+class grade_grade extends grade_object {
 
     /**
      * The DB table.
@@ -37,7 +37,7 @@ class grade_grades extends grade_object {
      * Array of class variables that are not part of the DB table fields
      * @var array $nonfields
      */
-    var $nonfields = array('table', 'nonfields', 'required_fields', 'grade_grades_text', 'grade_item');
+    var $nonfields = array('table', 'nonfields', 'required_fields', 'grade_grade_text', 'grade_item');
 
     /**
      * The id of the grade_item this grade belongs to.
@@ -91,9 +91,9 @@ class grade_grades extends grade_object {
      * Additional textual information about this grade. It can be automatically generated
      * from the module or entered manually by the teacher. This is kept in its own table
      * for efficiency reasons, so it is encapsulated in its own object, and included in this grade object.
-     * @var object $grade_grades_text
+     * @var object $grade_grade_text
      */
-    var $grade_grades_text;
+    var $grade_grade_text;
 
     /**
      * The final value of this grade.
@@ -132,7 +132,7 @@ class grade_grades extends grade_object {
     var $overridden = 0;
 
     /**
-     * Loads the grade_grades_text object linked to this grade (through the intersection of itemid and userid), and
+     * Loads the grade_grade_text object linked to this grade (through the intersection of itemid and userid), and
      * saves it as a class variable for this final object.
      * @return object
      */
@@ -141,11 +141,11 @@ class grade_grades extends grade_object {
             return false; // text can not be attached to non existing grade
         }
 
-        if (empty($this->grade_grades_text->id)) {
-            $this->grade_grades_text = grade_grades_text::fetch(array('gradeid'=>$this->id));
+        if (empty($this->grade_grade_text->id)) {
+            $this->grade_grade_text = grade_grade_text::fetch(array('gradeid'=>$this->id));
         }
 
-        return $this->grade_grades_text;
+        return $this->grade_grade_text;
     }
 
     /**
@@ -304,25 +304,25 @@ class grade_grades extends grade_object {
     }
 
     /**
-     * Finds and returns a grade_grades instance based on params.
+     * Finds and returns a grade_grade instance based on params.
      * @static
      *
      * @param array $params associative arrays varname=>value
-     * @return object grade_grades instance or false if none found.
+     * @return object grade_grade instance or false if none found.
      */
     function fetch($params) {
-        return grade_object::fetch_helper('grade_grades', 'grade_grades', $params);
+        return grade_object::fetch_helper('grade_grades', 'grade_grade', $params);
     }
 
     /**
-     * Finds and returns all grade_grades instances based on params.
+     * Finds and returns all grade_grade instances based on params.
      * @static
      *
      * @param array $params associative arrays varname=>value
-     * @return array array of grade_grades insatnces or false if none found.
+     * @return array array of grade_grade insatnces or false if none found.
      */
     function fetch_all($params) {
-        return grade_object::fetch_all_helper('grade_grades', 'grade_grades', $params);
+        return grade_object::fetch_all_helper('grade_grades', 'grade_grade', $params);
     }
 
 
@@ -339,7 +339,7 @@ class grade_grades extends grade_object {
     }
 
     /**
-     * Updates this grade with the given textual information. This will create a new grade_grades_text entry
+     * Updates this grade with the given textual information. This will create a new grade_grade_text entry
      * if none was previously in DB for this raw grade, or will update the existing one.
      * @param string $information Manual information from the teacher. Could be a code like 'mi'
      * @param int $informationformat Text format for the information
@@ -348,23 +348,23 @@ class grade_grades extends grade_object {
     function update_information($information, $informationformat) {
         $this->load_text();
 
-        if (empty($this->grade_grades_text->id)) {
-            $this->grade_grades_text = new grade_grades_text();
+        if (empty($this->grade_grade_text->id)) {
+            $this->grade_grade_text = new grade_grade_text();
 
-            $this->grade_grades_text->gradeid           = $this->id;
-            $this->grade_grades_text->userid            = $this->userid;
-            $this->grade_grades_text->information       = $information;
-            $this->grade_grades_text->informationformat = $informationformat;
+            $this->grade_grade_text->gradeid           = $this->id;
+            $this->grade_grade_text->userid            = $this->userid;
+            $this->grade_grade_text->information       = $information;
+            $this->grade_grade_text->informationformat = $informationformat;
 
-            return $this->grade_grades_text->insert();
+            return $this->grade_grade_text->insert();
 
         } else {
-            if ($this->grade_grades_text->information != $information
-              or $this->grade_grades_text->informationformat != $informationformat) {
+            if ($this->grade_grade_text->information != $information
+              or $this->grade_grade_text->informationformat != $informationformat) {
 
-                $this->grade_grades_text->information       = $information;
-                $this->grade_grades_text->informationformat = $informationformat;
-                return  $this->grade_grades_text->update();
+                $this->grade_grade_text->information       = $information;
+                $this->grade_grade_text->informationformat = $informationformat;
+                return  $this->grade_grade_text->update();
             } else {
                 return true;
             }
@@ -372,7 +372,7 @@ class grade_grades extends grade_object {
     }
 
     /**
-     * Updates this grade with the given textual information. This will create a new grade_grades_text entry
+     * Updates this grade with the given textual information. This will create a new grade_grade_text entry
      * if none was previously in DB for this raw grade, or will update the existing one.
      * @param string $feedback Manual feedback from the teacher. Could be a code like 'mi'
      * @param int $feedbackformat Text format for the feedback
@@ -387,25 +387,25 @@ class grade_grades extends grade_object {
             $usermodified = $USER->id;
         }
 
-        if (empty($this->grade_grades_text->id)) {
-            $this->grade_grades_text = new grade_grades_text();
+        if (empty($this->grade_grade_text->id)) {
+            $this->grade_grade_text = new grade_grade_text();
 
-            $this->grade_grades_text->gradeid        = $this->id;
-            $this->grade_grades_text->feedback       = $feedback;
-            $this->grade_grades_text->feedbackformat = $feedbackformat;
-            $this->grade_grades_text->usermodified   = $usermodified;
+            $this->grade_grade_text->gradeid        = $this->id;
+            $this->grade_grade_text->feedback       = $feedback;
+            $this->grade_grade_text->feedbackformat = $feedbackformat;
+            $this->grade_grade_text->usermodified   = $usermodified;
 
-            return $this->grade_grades_text->insert();
+            return $this->grade_grade_text->insert();
 
         } else {
-            if ($this->grade_grades_text->feedback != $feedback
-              or $this->grade_grades_text->feedbackformat != $feedbackformat) {
+            if ($this->grade_grade_text->feedback != $feedback
+              or $this->grade_grade_text->feedbackformat != $feedbackformat) {
 
-                $this->grade_grades_text->feedback       = $feedback;
-                $this->grade_grades_text->feedbackformat = $feedbackformat;
-                $this->grade_grades_text->usermodified   = $usermodified;
+                $this->grade_grade_text->feedback       = $feedback;
+                $this->grade_grade_text->feedbackformat = $feedbackformat;
+                $this->grade_grade_text->usermodified   = $usermodified;
 
-                return  $this->grade_grades_text->update();
+                return  $this->grade_grade_text->update();
             } else {
                 return true;
             }
@@ -447,7 +447,7 @@ class grade_grades extends grade_object {
     function get_letter($letters, $gradevalue=null, $grademin=null, $grademax=null) {
         if (is_null($grademin) || is_null($grademax)) {
             if (!isset($this)) {
-                debugging("Tried to call grade_grades::get_letter statically without giving an explicit grademin or grademax!");
+                debugging("Tried to call grade_grade::get_letter statically without giving an explicit grademin or grademax!");
                 return false;
             }
             $this->load_grade_item();
@@ -457,13 +457,13 @@ class grade_grades extends grade_object {
 
         if (is_null($gradevalue)) {
             if (!isset($this)) {
-                debugging("Tried to call grade_grades::get_letter statically without giving an explicit gradevalue!");
+                debugging("Tried to call grade_grade::get_letter statically without giving an explicit gradevalue!");
                 return false;
             }
             $gradevalue = $this->finalgrade;
         }
         // Standardise grade first
-        $grade = grade_grades::standardise_score($gradevalue, $grademin, $grademax, 0, 100);
+        $grade = grade_grade::standardise_score($gradevalue, $grademin, $grademax, 0, 100);
 
         // Sort the letters by descending boundaries (100-0)
         krsort($letters);

diff --git a/lib/grade/grade_grades_text.php b/lib/grade/grade_grade_text.php
similarity index 88%
rename from lib/grade/grade_grades_text.php
rename to lib/grade/grade_grade_text.php
index 02dd303ade30145987618f30698f80c19459d957..0db4c2ed96d683e72f4db04d0d7ff33551e6790f 100644 (file)
--- a/lib/grade/grade_grades_text.php
+++ b/lib/grade/grade_grade_text.php
@@ -29,7 +29,7 @@ require_once('grade_object.php');
  * A text string used to compute the value displayed by a grade_item.
  * There can be only one grade_text per grade_item (one-to-one).
  */
-class grade_grades_text extends grade_object {
+class grade_grade_text extends grade_object {
     /**
      * DB Table (used by grade_object).
      * @var string $table
@@ -43,7 +43,7 @@ class grade_grades_text extends grade_object {
     var $nonfields = array('table', 'required_fields', 'nonfields');
 
     /**
-     * The grade_grades.id this text refers to.
+     * The grade_grade.id this text refers to.
      * @var int $itemid
      */
     var $gradeid;
@@ -79,25 +79,25 @@ class grade_grades_text extends grade_object {
     var $usermodified;
 
     /**
-     * Finds and returns a grade_grades_text instance based on params.
+     * Finds and returns a grade_grade_text instance based on params.
      * @static
      *
      * @param array $params associative arrays varname=>value
-     * @return object grade_grades_text instance or false if none found.
+     * @return object grade_grade_text instance or false if none found.
      */
     function fetch($params) {
-        return grade_object::fetch_helper('grade_grades_text', 'grade_grades_text', $params);
+        return grade_object::fetch_helper('grade_grades_text', 'grade_grade_text', $params);
     }
 
     /**
-     * Finds and returns all grade_grades_text instances based on params.
+     * Finds and returns all grade_grade_text instances based on params.
      * @static
      *
      * @param array $params associative arrays varname=>value
-     * @return array array of grade_grades_text insatnces or false if none found.
+     * @return array array of grade_grade_text insatnces or false if none found.
      */
     function fetch_all($params) {
-        return grade_object::fetch_all_helper('grade_grades_text', 'grade_grades_text', $params);
+        return grade_object::fetch_all_helper('grade_grades_text', 'grade_grade_text', $params);
     }
 
 }

diff --git a/lib/grade/grade_item.php b/lib/grade/grade_item.php
index 745cc399433a16c54c4fef99ce6318683c19ec4f..cc688811be227f72c8d3e3900ea5fec523bad764 100644 (file)
--- a/lib/grade/grade_item.php
+++ b/lib/grade/grade_item.php
@@ -306,7 +306,7 @@ class grade_item extends grade_object {
 
         $this->force_regrading();
 
-        if ($grades = grade_grades::fetch_all(array('itemid'=>$this->id))) {
+        if ($grades = grade_grade::fetch_all(array('itemid'=>$this->id))) {
             foreach ($grades as $grade) {
                 $grade->delete($source);
             }
@@ -389,7 +389,7 @@ class grade_item extends grade_object {
         }
 
         if (!empty($userid)) {
-            if ($grade = grade_grades::fetch(array('itemid'=>$this->id, 'userid'=>$userid))) {
+            if ($grade = grade_grade::fetch(array('itemid'=>$this->id, 'userid'=>$userid))) {
                 $grade->grade_item =& $this; // prevent db fetching of cached grade_item
                 return $grade->is_locked();
             }
@@ -422,7 +422,7 @@ class grade_item extends grade_object {
             $result = true;
             $grades = $this->get_final();
             foreach($grades as $g) {
-                $grade = new grade_grades($g, false);
+                $grade = new grade_grade($g, false);
                 $grade->grade_item =& $this;
                 if (!$grade->set_locked(true)) {
                     $result = false;
@@ -446,7 +446,7 @@ class grade_item extends grade_object {
 
             // this could be improved with direct SQL update
             $result = true;
-            if ($grades = grade_grades::fetch_all(array('itemid'=>$this->id))) {
+            if ($grades = grade_grade::fetch_all(array('itemid'=>$this->id))) {
                 foreach($grades as $grade) {
                     $grade->grade_item =& $this;
 
@@ -517,7 +517,7 @@ class grade_item extends grade_object {
         }
 
         if (!empty($userid)) {
-            if ($grade = grade_grades::fetch(array('itemid'=>$this->id, 'userid'=>$userid))) {
+            if ($grade = grade_grade::fetch(array('itemid'=>$this->id, 'userid'=>$userid))) {
                 $grade->grade_item =& $this; // prevent db fetching of cached grade_item
                 return $grade->is_hidden();
             }
@@ -535,7 +535,7 @@ class grade_item extends grade_object {
         $this->hidden = $hidden;
         $this->update();
 
-        if ($grades = grade_grades::fetch_all(array('itemid'=>$this->id))) {
+        if ($grades = grade_grade::fetch_all(array('itemid'=>$this->id))) {
             foreach($grades as $grade) {
                 $grade->grade_item =& $this;
                 $grade->set_hidden($hidden);
@@ -612,7 +612,7 @@ class grade_item extends grade_object {
                         continue;
                     }
 
-                    $grade = new grade_grades($grade_record, false);
+                    $grade = new grade_grade($grade_record, false);
                     $grade->finalgrade = $this->adjust_grade($grade->rawgrade, $grade->rawgrademin, $grade->rawgrademax);
 
                     if ($grade_record->finalgrade !== $grade->finalgrade) {
@@ -658,7 +658,7 @@ class grade_item extends grade_object {
             // Standardise score to the new grade range
             // NOTE: this is not compatible with current assignment grading
             if ($rawmin != $this->grademin or $rawmax != $this->grademax) {
-                $rawgrade = grade_grades::standardise_score($rawgrade, $rawmin, $rawmax, $this->grademin, $this->grademax);
+                $rawgrade = grade_grade::standardise_score($rawgrade, $rawmin, $rawmax, $this->grademin, $this->grademax);
             }
 
             // Apply other grade_item factors
@@ -683,7 +683,7 @@ class grade_item extends grade_object {
             // Convert scale if needed
             // NOTE: this is not compatible with current assignment grading
             if ($rawmin != $this->grademin or $rawmax != $this->grademax) {
-                $rawgrade = grade_grades::standardise_score($rawgrade, $rawmin, $rawmax, $this->grademin, $this->grademax);
+                $rawgrade = grade_grade::standardise_score($rawgrade, $rawmin, $rawmax, $this->grademin, $this->grademax);
             }
 
             return (int)bounded_number(0, round($rawgrade+0.00001), $this->grademax);
@@ -1127,8 +1127,8 @@ class grade_item extends grade_object {
             return false;
         }
 
-        if (!$grade = grade_grades::fetch(array('itemid'=>$this->id, 'userid'=>$userid))) {
-            $grade = new grade_grades(array('itemid'=>$this->id, 'userid'=>$userid), false);
+        if (!$grade = grade_grade::fetch(array('itemid'=>$this->id, 'userid'=>$userid))) {
+            $grade = new grade_grade(array('itemid'=>$this->id, 'userid'=>$userid), false);
         }
 
         $grade->grade_item =& $this; // prevent db fetching of this grade_item
@@ -1238,8 +1238,8 @@ class grade_item extends grade_object {
             return false;
         }
 
-        if (!$grade = grade_grades::fetch(array('itemid'=>$this->id, 'userid'=>$userid))) {
-            $grade = new grade_grades(array('itemid'=>$this->id, 'userid'=>$userid), false);
+        if (!$grade = grade_grade::fetch(array('itemid'=>$this->id, 'userid'=>$userid))) {
+            $grade = new grade_grade(array('itemid'=>$this->id, 'userid'=>$userid), false);
         }
 
         $grade->grade_item =& $this; // prevent db fetching of this grade_item
@@ -1434,11 +1434,11 @@ class grade_item extends grade_object {
 
         // insert final grade - will be needed later anyway
         if ($oldgrade) {
-            $grade = new grade_grades($oldgrade, false); // fetching from db is not needed
+            $grade = new grade_grade($oldgrade, false); // fetching from db is not needed
             $grade->grade_item =& $this;
 
         } else {
-            $grade = new grade_grades(array('itemid'=>$this->id, 'userid'=>$userid), false);
+            $grade = new grade_grade(array('itemid'=>$this->id, 'userid'=>$userid), false);
             $grade->insert('system');
             $grade->grade_item =& $this;
 

diff --git a/lib/grade/grade_tree.php b/lib/grade/grade_tree.php
index 1a1e9a13723bd282498f9bc2491a43aeeae67134..bbcb8e8fec48e5d26eeb12dacabaeb5d34d2ca06 100644 (file)
--- a/lib/grade/grade_tree.php
+++ b/lib/grade/grade_tree.php
@@ -209,14 +209,14 @@ class grade_tree {
         if (strpos($eid, 'g') === 0) {
             // it is a grade  construct a new object
             $id = (int)substr($eid, 1);
-            if (!$grade = grade_grades::fetch(array('id'=>$id))) {
+            if (!$grade = grade_grade::fetch(array('id'=>$id))) {
                 return null;
             }
             //extra security check - the grade item must be in this tree
             if (!$item_el = $this->locate_element('i'.$grade->itemid)) {
                 return null;
             }
-            $grade->grade_item =& $item_el['object']; // this may speedup grade_grades methods!
+            $grade->grade_item =& $item_el['object']; // this may speedup grade_grade methods!
             return array('eid'=>'g'.$id,'object'=>$grade, 'type'=>'grade');
         }
 

diff --git a/lib/grade/simpletest/testgradecategory.php b/lib/grade/simpletest/testgradecategory.php
index aaa69bd845b6788d3d5164b968cc00e922debc20..77f4721df77af965049ae5937770d1b2a7b04906 100755 (executable)
--- a/lib/grade/simpletest/testgradecategory.php
+++ b/lib/grade/simpletest/testgradecategory.php
@@ -344,7 +344,7 @@ class grade_category_test extends grade_test {
     }
 
     function generate_random_raw_grade($item, $userid) {
-        $grade = new grade_grades();
+        $grade = new grade_grade();
         $grade->itemid = $item->id;
         $grade->userid = $userid;
         $grade->grademin = 0;
@@ -370,7 +370,9 @@ class grade_category_test extends grade_test {
         $category->keephigh = 1;
         $category->droplow = 0;
         $category->apply_limit_rules($grades);
-        $this->assertEqual(array(9.4743), $grades);
+        $this->assertEqual(count($grades), 1);
+        $grade = reset($grades);
+        $this->assertEqual(9.4743, $grade);
     }
 
     function test_grade_category_set_parent() {

diff --git a/lib/grade/simpletest/testgradegrades.php b/lib/grade/simpletest/testgradegrades.php
index ae84379e1a9cb3ae7ca632ecb59ef236305494e7..f99bebc3b707acb0de54f3f932f8473464e86e56 100755 (executable)
--- a/lib/grade/simpletest/testgradegrades.php
+++ b/lib/grade/simpletest/testgradegrades.php
@@ -37,9 +37,9 @@ if (!defined('MOODLE_INTERNAL')) {
 
 require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php');
 
-class grade_grades_test extends grade_test {
+class grade_grade_test extends grade_test {
 
-    function test_grade_grades_construct() {
+    function test_grade_grade_construct() {
         $params = new stdClass();
 
         $params->itemid = $this->grade_items[0]->id;
@@ -48,53 +48,53 @@ class grade_grades_test extends grade_test {
         $params->rawgrademax = 110;
         $params->rawgrademin = 18;
 
-        $grade_grades = new grade_grades($params, false);
-        $this->assertEqual($params->itemid, $grade_grades->itemid);
-        $this->assertEqual($params->rawgrade, $grade_grades->rawgrade);
+        $grade_grade = new grade_grade($params, false);
+        $this->assertEqual($params->itemid, $grade_grade->itemid);
+        $this->assertEqual($params->rawgrade, $grade_grade->rawgrade);
     }
 
-    function test_grade_grades_insert() {
-        $grade_grades = new grade_grades();
-        $this->assertTrue(method_exists($grade_grades, 'insert'));
+    function test_grade_grade_insert() {
+        $grade_grade = new grade_grade();
+        $this->assertTrue(method_exists($grade_grade, 'insert'));
 
-        $grade_grades->itemid = $this->grade_items[0]->id;
-        $grade_grades->userid = 1;
-        $grade_grades->rawgrade = 88;
-        $grade_grades->rawgrademax = 110;
-        $grade_grades->rawgrademin = 18;
+        $grade_grade->itemid = $this->grade_items[0]->id;
+        $grade_grade->userid = 1;
+        $grade_grade->rawgrade = 88;
+        $grade_grade->rawgrademax = 110;
+        $grade_grade->rawgrademin = 18;
 
         // Check the grade_item's needsupdate variable first
-        $grade_grades->load_grade_item();
-        $this->assertFalse($grade_grades->grade_item->needsupdate);
+        $grade_grade->load_grade_item();
+        $this->assertFalse($grade_grade->grade_item->needsupdate);
 
-        $grade_grades->insert();
+        $grade_grade->insert();
 
-        $last_grade_grades = end($this->grade_grades);
+        $last_grade_grade = end($this->grade_grades);
 
-        $this->assertEqual($grade_grades->id, $last_grade_grades->id + 1);
-        $this->assertFalse(empty($grade_grades->timecreated));
-        $this->assertFalse(empty($grade_grades->timemodified));
+        $this->assertEqual($grade_grade->id, $last_grade_grade->id + 1);
+        $this->assertFalse(empty($grade_grade->timecreated));
+        $this->assertFalse(empty($grade_grade->timemodified));
     }
 
-    function test_grade_grades_update() {
-        $grade_grades = new grade_grades($this->grade_grades[0]);
-        $this->assertTrue(method_exists($grade_grades, 'update'));
+    function test_grade_grade_update() {
+        $grade_grade = new grade_grade($this->grade_grades[0]);
+        $this->assertTrue(method_exists($grade_grade, 'update'));
     }
 
-    function test_grade_grades_fetch() {
-        $grade_grades = new grade_grades();
-        $this->assertTrue(method_exists($grade_grades, 'fetch'));
+    function test_grade_grade_fetch() {
+        $grade_grade = new grade_grade();
+        $this->assertTrue(method_exists($grade_grade, 'fetch'));
 
-        $grades = grade_grades::fetch(array('id'=>$this->grade_grades[0]->id));
+        $grades = grade_grade::fetch(array('id'=>$this->grade_grades[0]->id));
         $this->assertEqual($this->grade_grades[0]->id, $grades->id);
         $this->assertEqual($this->grade_grades[0]->rawgrade, $grades->rawgrade);
     }
 
-    function test_grade_grades_fetch_all() {
-        $grade_grades = new grade_grades();
-        $this->assertTrue(method_exists($grade_grades, 'fetch_all'));
+    function test_grade_grade_fetch_all() {
+        $grade_grade = new grade_grade();
+        $this->assertTrue(method_exists($grade_grade, 'fetch_all'));
 
-        $grades = grade_grades::fetch_all(array());
+        $grades = grade_grade::fetch_all(array());
         $this->assertEqual(count($this->grade_grades), count($grades));
     }
 
@@ -107,34 +107,34 @@ class grade_grades_test extends grade_test {
     }
 
     function test_grade_load_text() {
-        $grade_grades = new grade_grades($this->grade_grades[0]);
-        $this->assertTrue(method_exists($grade_grades, 'load_text'));
-        $this->assertNull($grade_grades->grade_grades_text);
-        $this->assertNotNull($grade_grades->load_text());
-        $this->assertNotNull($grade_grades->grade_grades_text);
-        $this->assertEqual($this->grade_grades_text[0]->id, $grade_grades->grade_grades_text->id);
+        $grade_grade = new grade_grade($this->grade_grades[0]);
+        $this->assertTrue(method_exists($grade_grade, 'load_text'));
+        $this->assertNull($grade_grade->grade_grade_text);
+        $this->assertNotNull($grade_grade->load_text());
+        $this->assertNotNull($grade_grade->grade_grade_text);
+        $this->assertEqual($this->grade_grades_text[0]->id, $grade_grade->grade_grade_text->id);
     }
 
-    function test_grade_grades_load_grade_item() {
-        $grade_grades = new grade_grades($this->grade_grades[0]);
-        $this->assertTrue(method_exists($grade_grades, 'load_grade_item'));
-        $this->assertNull($grade_grades->grade_item);
-        $this->assertTrue($grade_grades->itemid);
-        $this->assertNotNull($grade_grades->load_grade_item());
-        $this->assertNotNull($grade_grades->grade_item);
-        $this->assertEqual($this->grade_items[0]->id, $grade_grades->grade_item->id);
+    function test_grade_grade_load_grade_item() {
+        $grade_grade = new grade_grade($this->grade_grades[0]);
+        $this->assertTrue(method_exists($grade_grade, 'load_grade_item'));
+        $this->assertNull($grade_grade->grade_item);
+        $this->assertTrue($grade_grade->itemid);
+        $this->assertNotNull($grade_grade->load_grade_item());
+        $this->assertNotNull($grade_grade->grade_item);
+        $this->assertEqual($this->grade_items[0]->id, $grade_grade->grade_item->id);
     }
 
 
-    function test_grade_grades_standardise_score() {
-        $this->assertEqual(4, round(grade_grades::standardise_score(6, 0, 7, 0, 5)));
-        $this->assertEqual(40, grade_grades::standardise_score(50, 30, 80, 0, 100));
+    function test_grade_grade_standardise_score() {
+        $this->assertEqual(4, round(grade_grade::standardise_score(6, 0, 7, 0, 5)));
+        $this->assertEqual(40, grade_grade::standardise_score(50, 30, 80, 0, 100));
     }
 
 
-    function test_grade_grades_set_locked() {
+    function test_grade_grade_set_locked() {
         $grade_item = new grade_item($this->grade_items[0]);
-        $grade = new grade_grades($grade_item->get_final(1));
+        $grade = new grade_grade($grade_item->get_final(1));
         $this->assertTrue(method_exists($grade, 'set_locked'));
 
         $this->assertTrue(empty($grade_item->locked));
@@ -146,19 +146,19 @@ class grade_grades_test extends grade_test {
         $this->assertTrue(empty($grade->locked));
 
         $this->assertTrue($grade_item->set_locked(true));
-        $grade = new grade_grades($grade_item->get_final(1));
+        $grade = new grade_grade($grade_item->get_final(1));
 
         $this->assertFalse(empty($grade->locked));
         $this->assertFalse($grade->set_locked(false));
 
         $this->assertTrue($grade_item->set_locked(false));
-        $grade = new grade_grades($grade_item->get_final(1));
+        $grade = new grade_grade($grade_item->get_final(1));
 
         $this->assertTrue($grade->set_locked(false));
     }
 
-    function test_grade_grades_is_locked() {
-        $grade = new grade_grades($this->grade_grades[0]);
+    function test_grade_grade_is_locked() {
+        $grade = new grade_grade($this->grade_grades[0]);
         $this->assertTrue(method_exists($grade, 'is_locked'));
 
         $this->assertFalse($grade->is_locked());
@@ -166,9 +166,9 @@ class grade_grades_test extends grade_test {
         $this->assertTrue($grade->is_locked());
     }
 
-    function test_grade_grades_set_hidden() {
+    function test_grade_grade_set_hidden() {
         $grade_item = new grade_item($this->grade_items[0]);
-        $grade = new grade_grades($grade_item->get_final(1));
+        $grade = new grade_grade($grade_item->get_final(1));
         $this->assertTrue(method_exists($grade, 'set_hidden'));
 
         $this->assertEqual(0, $grade_item->hidden);
@@ -181,8 +181,8 @@ class grade_grades_test extends grade_test {
         $this->assertEqual(1, $grade->hidden);
     }
 
-    function test_grade_grades_is_hidden() {
-        $grade = new grade_grades($this->grade_grades[0]);
+    function test_grade_grade_is_hidden() {
+        $grade = new grade_grade($this->grade_grades[0]);
         $this->assertTrue(method_exists($grade, 'is_hidden'));
 
         $this->assertFalse($grade->is_hidden());

diff --git a/lib/grade/simpletest/testgradegradestext.php b/lib/grade/simpletest/testgradegradestext.php
index b576b89db976abbd39294e3e3080b7b4175a2862..2077a5ce478f773a3b503058b4f8d1a13f889782 100755 (executable)
--- a/lib/grade/simpletest/testgradegradestext.php
+++ b/lib/grade/simpletest/testgradegradestext.php
@@ -39,7 +39,7 @@ require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php');
 
 class grade_text_test extends grade_test {
 
-    function test_grade_grades_text_construct() {
+    function test_grade_grade_text_construct() {
         $params = new stdClass();
 
         $params->gradeid = $this->grade_grades[0]->id;
@@ -48,69 +48,69 @@ class grade_text_test extends grade_test {
         $params->feedback = 'Good, but not good enough..';
         $params->feedbackformat = FORMAT_PLAIN;
 
-        $grade_grades_text = new grade_grades_text($params, false);
-        $this->assertEqual($params->gradeid, $grade_grades_text->gradeid);
-        $this->assertEqual($params->information, $grade_grades_text->information);
-        $this->assertEqual($params->informationformat, $grade_grades_text->informationformat);
-        $this->assertEqual($params->feedback, $grade_grades_text->feedback);
-        $this->assertEqual($params->feedbackformat, $grade_grades_text->feedbackformat);
+        $grade_grade_text = new grade_grade_text($params, false);
+        $this->assertEqual($params->gradeid, $grade_grade_text->gradeid);
+        $this->assertEqual($params->information, $grade_grade_text->information);
+        $this->assertEqual($params->informationformat, $grade_grade_text->informationformat);
+        $this->assertEqual($params->feedback, $grade_grade_text->feedback);
+        $this->assertEqual($params->feedbackformat, $grade_grade_text->feedbackformat);
     }
 
-    function test_grade_grades_text_insert() {
+    function test_grade_grade_text_insert() {
         global $USER;
 
-        $grade_grades_text = new grade_grades_text();
-        $this->assertTrue(method_exists($grade_grades_text, 'insert'));
+        $grade_grade_text = new grade_grade_text();
+        $this->assertTrue(method_exists($grade_grade_text, 'insert'));
 
-        $grade_grades_text->gradeid = $this->grade_grades[0]->id;
-        $grade_grades_text->information = 'Thumbs down';
-        $grade_grades_text->informationformat = FORMAT_PLAIN;
-        $grade_grades_text->feedback = 'Good, but not good enough..';
-        $grade_grades_text->feedbackformat = FORMAT_PLAIN;
-        $grade_grades_text->usermodified = $USER->id;
+        $grade_grade_text->gradeid = $this->grade_grades[0]->id;
+        $grade_grade_text->information = 'Thumbs down';
+        $grade_grade_text->informationformat = FORMAT_PLAIN;
+        $grade_grade_text->feedback = 'Good, but not good enough..';
+        $grade_grade_text->feedbackformat = FORMAT_PLAIN;
+        $grade_grade_text->usermodified = $USER->id;
 
-        $grade_grades_text->insert();
+        $grade_grade_text->insert();
 
-        $last_grade_grades_text = end($this->grade_grades_text);
+        $last_grade_grade_text = end($this->grade_grades_text);
 
-        $this->assertEqual($grade_grades_text->id, $last_grade_grades_text->id + 1);
-        $this->assertFalse(empty($grade_grades_text->timecreated));
-        $this->assertFalse(empty($grade_grades_text->timemodified));
-        $this->assertEqual($USER->id, $grade_grades_text->usermodified);
+        $this->assertEqual($grade_grade_text->id, $last_grade_grade_text->id + 1);
+        $this->assertFalse(empty($grade_grade_text->timecreated));
+        $this->assertFalse(empty($grade_grade_text->timemodified));
+        $this->assertEqual($USER->id, $grade_grade_text->usermodified);
     }
 
-    function test_grade_grades_text_update() {
-        $grade_grades_text = new grade_grades_text($this->grade_grades_text[0]);
-        $this->assertTrue(method_exists($grade_grades_text, 'update'));
+    function test_grade_grade_text_update() {
+        $grade_grade_text = new grade_grade_text($this->grade_grades_text[0]);
+        $this->assertTrue(method_exists($grade_grade_text, 'update'));
 
-        $this->assertTrue($grade_grades_text->update(89));
+        $this->assertTrue($grade_grade_text->update(89));
         $information = get_field('grade_grades_text', 'information', 'id', $this->grade_grades_text[0]->id);
-        $this->assertEqual($grade_grades_text->information, $information);
+        $this->assertEqual($grade_grade_text->information, $information);
     }
 
-    function test_grade_grades_text_delete() {
-        $grade_grades_text = new grade_grades_text($this->grade_grades_text[0]);
-        $this->assertTrue(method_exists($grade_grades_text, 'delete'));
+    function test_grade_grade_text_delete() {
+        $grade_grade_text = new grade_grade_text($this->grade_grades_text[0]);
+        $this->assertTrue(method_exists($grade_grade_text, 'delete'));
 
-        $this->assertTrue($grade_grades_text->delete());
-        $this->assertFalse(get_record('grade_grades_text', 'id', $grade_grades_text->id));
+        $this->assertTrue($grade_grade_text->delete());
+        $this->assertFalse(get_record('grade_grades_text', 'id', $grade_grade_text->id));
     }
 
-    function test_grade_grades_text_fetch() {
-        $grade_grades_text = new grade_grades_text();
-        $this->assertTrue(method_exists($grade_grades_text, 'fetch'));
+    function test_grade_grade_text_fetch() {
+        $grade_grade_text = new grade_grade_text();
+        $this->assertTrue(method_exists($grade_grade_text, 'fetch'));
 
-        $grade_grades_text = grade_grades_text::fetch(array('id'=>$this->grade_grades_text[0]->id));
-        $this->assertEqual($this->grade_grades_text[0]->id, $grade_grades_text->id);
-        $this->assertEqual($this->grade_grades_text[0]->information, $grade_grades_text->information);
+        $grade_grade_text = grade_grade_text::fetch(array('id'=>$this->grade_grades_text[0]->id));
+        $this->assertEqual($this->grade_grades_text[0]->id, $grade_grade_text->id);
+        $this->assertEqual($this->grade_grades_text[0]->information, $grade_grade_text->information);
     }
 
-    function test_grade_grades_text_fetch_all() {
-        $grade_grades_text = new grade_grades_text();
-        $this->assertTrue(method_exists($grade_grades_text, 'fetch_all'));
+    function test_grade_grade_text_fetch_all() {
+        $grade_grade_text = new grade_grade_text();
+        $this->assertTrue(method_exists($grade_grade_text, 'fetch_all'));
 
-        $grade_grades_texts = grade_grades_text::fetch_all(array());
-        $this->assertEqual(count($this->grade_grades_text[0]), count($grade_grades_texts));
+        $grade_grade_texts = grade_grade_text::fetch_all(array());
+        $this->assertEqual(count($this->grade_grades_text[0]), count($grade_grade_texts));
     }
 }
 ?>

diff --git a/lib/grade/simpletest/testgradeitem.php b/lib/grade/simpletest/testgradeitem.php
index 933db6d2774060bc32aca9ca85a8abdb190fe569..855df9e289110ed6c9d529ced58299438a4ee817 100755 (executable)
--- a/lib/grade/simpletest/testgradeitem.php
+++ b/lib/grade/simpletest/testgradeitem.php
@@ -364,18 +364,18 @@ class grade_item_test extends grade_test {
         $grade_item = new grade_item($this->grade_items[0]);
         $this->assertTrue(method_exists($grade_item, 'set_locked'));
 
-        $grade = new grade_grades($grade_item->get_final(1));
+        $grade = new grade_grade($grade_item->get_final(1));
         $this->assertTrue(empty($grade_item->locked));
         $this->assertTrue(empty($grade->locked));
 
         $this->assertTrue($grade_item->set_locked(true));
-        $grade = new grade_grades($grade_item->get_final(1));
+        $grade = new grade_grade($grade_item->get_final(1));
 
         $this->assertFalse(empty($grade_item->locked));
         $this->assertFalse(empty($grade->locked)); // individual grades should be locked too
 
         $this->assertTrue($grade_item->set_locked(false));
-        $grade = new grade_grades($grade_item->get_final(1));
+        $grade = new grade_grade($grade_item->get_final(1));
 
         $this->assertTrue(empty($grade_item->locked));
         $this->assertTrue(empty($grade->locked)); // individual grades should be unlocked too
@@ -399,12 +399,12 @@ class grade_item_test extends grade_test {
         $grade_item = new grade_item($this->grade_items[0]);
         $this->assertTrue(method_exists($grade_item, 'set_hidden'));
 
-        $grade = new grade_grades($grade_item->get_final(1));
+        $grade = new grade_grade($grade_item->get_final(1));
         $this->assertEqual(0, $grade_item->hidden);
         $this->assertEqual(0, $grade->hidden);
 
         $grade_item->set_hidden(666);
-        $grade = new grade_grades($grade_item->get_final(1));
+        $grade = new grade_grade($grade_item->get_final(1));
 
         $this->assertEqual(666, $grade_item->hidden);
         $this->assertEqual(666, $grade->hidden);
@@ -508,21 +508,21 @@ class grade_item_test extends grade_test {
         $grade_item = new grade_item($this->grade_items[1]);
         $this->assertTrue(method_exists($grade_item, 'compute'));
 
-        $grade_grades = grade_grades::fetch(array('id'=>$this->grade_grades[3]->id));
-        $grade_grades->delete();
-        $grade_grades = grade_grades::fetch(array('id'=>$this->grade_grades[4]->id));
-        $grade_grades->delete();
-        $grade_grades = grade_grades::fetch(array('id'=>$this->grade_grades[5]->id));
-        $grade_grades->delete();
+        $grade_grade = grade_grade::fetch(array('id'=>$this->grade_grades[3]->id));
+        $grade_grade->delete();
+        $grade_grade = grade_grade::fetch(array('id'=>$this->grade_grades[4]->id));
+        $grade_grade->delete();
+        $grade_grade = grade_grade::fetch(array('id'=>$this->grade_grades[5]->id));
+        $grade_grade->delete();
 
         $grade_item->compute();
 
-        $grade_grades = grade_grades::fetch(array('userid'=>$this->grade_grades[3]->userid, 'itemid'=>$this->grade_grades[3]->itemid));
-        $this->assertEqual($this->grade_grades[3]->finalgrade, $grade_grades->finalgrade);
-        $grade_grades = grade_grades::fetch(array('userid'=>$this->grade_grades[4]->userid, 'itemid'=>$this->grade_grades[4]->itemid));
-        $this->assertEqual($this->grade_grades[4]->finalgrade, $grade_grades->finalgrade);
-        $grade_grades = grade_grades::fetch(array('userid'=>$this->grade_grades[5]->userid, 'itemid'=>$this->grade_grades[5]->itemid));
-        $this->assertEqual($this->grade_grades[5]->finalgrade, $grade_grades->finalgrade);
+        $grade_grade = grade_grade::fetch(array('userid'=>$this->grade_grades[3]->userid, 'itemid'=>$this->grade_grades[3]->itemid));
+        $this->assertEqual($this->grade_grades[3]->finalgrade, $grade_grade->finalgrade);
+        $grade_grade = grade_grade::fetch(array('userid'=>$this->grade_grades[4]->userid, 'itemid'=>$this->grade_grades[4]->itemid));
+        $this->assertEqual($this->grade_grades[4]->finalgrade, $grade_grade->finalgrade);
+        $grade_grade = grade_grade::fetch(array('userid'=>$this->grade_grades[5]->userid, 'itemid'=>$this->grade_grades[5]->itemid));
+        $this->assertEqual($this->grade_grades[5]->finalgrade, $grade_grade->finalgrade);
     }
 
 }

diff --git a/lib/gradelib.php b/lib/gradelib.php
index 0c6d42079752509cef8f56c4e2c22d9cfb92e867..e0176899324d5d60eb0f80e348ad89f916a6a14d 100644 (file)
--- a/lib/gradelib.php
+++ b/lib/gradelib.php
@@ -86,10 +86,10 @@ define('GRADE_REPORT_PREFERENCE_UNUSED', -1);
 
 require_once($CFG->libdir . '/grade/grade_category.php');
 require_once($CFG->libdir . '/grade/grade_item.php');
-require_once($CFG->libdir . '/grade/grade_grades.php');
+require_once($CFG->libdir . '/grade/grade_grade.php');
 require_once($CFG->libdir . '/grade/grade_scale.php');
 require_once($CFG->libdir . '/grade/grade_outcome.php');
-require_once($CFG->libdir . '/grade/grade_grades_text.php');
+require_once($CFG->libdir . '/grade/grade_grade_text.php');
 require_once($CFG->libdir . '/grade/grade_tree.php');
 
 /***** PUBLIC GRADE API *****/
@@ -598,7 +598,7 @@ function grade_update_mod_grades($modinstance) {
 function grade_get_legacy_grade_item($modinstance, $grademax, $scaleid) {
 
     // does it already exist?
-    if ($grade_items = grade_grades::fetch_all(array('courseid'=>$modinstance->course, 'itemtype'=>'mod', 'itemmodule'=>$modinstance->modname, 'iteminstance'=>$modinstance->id, 'itemnumber'=>0))) {
+    if ($grade_items = grade_grade::fetch_all(array('courseid'=>$modinstance->course, 'itemtype'=>'mod', 'itemmodule'=>$modinstance->modname, 'iteminstance'=>$modinstance->id, 'itemnumber'=>0))) {
         if (count($grade_items) > 1) {
             debugging('Multiple legacy grade_items found.');
             return false;