WebSVN – Moodle – Diff – /lib/grade/grade_item.php

      * @param string $groupsql SQL to limit the query by group
      * @param array $params SQL params for $groupsql
      * @param string $groupwheresql Where conditions for $groupsql
      * @return int The number of hidden grades
      */
-    public function has_hidden_grades($groupsql="", array $params=null, $groupwheresql="") {
+    public function has_hidden_grades($groupsql="", ?array $params=null, $groupwheresql="") {
         global $DB;
         $params = (array)$params;
         $params['itemid'] = $this->id;
      */
     public function is_aggregate_item() {
         return ($this->is_category_item() || $this->is_course_item());
+    }
+    /**
+     * Returns whether the item is gradable or not. It's considered gradable when there is at least one gradeitem
+     * set as GRADE_TYPE_VALUE or GRADE_TYPE_SCALE.
+     *
+     * @return bool
+     */
+    public function is_gradable(): bool {
+        return $this->gradetype == GRADE_TYPE_VALUE || $this->gradetype == GRADE_TYPE_SCALE;
+    }
     /**
      * Returns the grade item associated with the course
+     *
      * @param int $courseid
         } else if ($grade_category = $this->load_item_category()) {
             $params = array();
             //only items with numeric or scale values can be aggregated
-            if ($this->gradetype != GRADE_TYPE_VALUE and $this->gradetype != GRADE_TYPE_SCALE) {
+            if (!$this->is_gradable()) {
                 $this->dependson_cache = array();
                 return $this->dependson_cache;
         } else {
             //keep original graded date
+        }
         // end of hack alert
+        // Only reset the deducted mark if the grade has changed.
+        if ($grade->timemodified !== $oldgrade->timemodified) {
+            $grade->deductedmark = 0;
+        }
         $gradechanged = false;
         if (empty($grade->id)) {
             $result = (bool)$grade->insert($source, $isbulkupdate);
         return $result;
+    }
+    /**
+     * Update penalty value for given user
+     *
+     * @param int $userid The graded user
+     * @param float $deductedmark The mark deducted from final grade
+     */
+    public function update_deducted_mark(int $userid, float $deductedmark): void {
+        $grade = new grade_grade([
+                'itemid' => $this->id,
+                'userid' => $userid,
+            ]);
+        $grade->deductedmark = $deductedmark;
+        $grade->update();
+    }
     /**
      * Calculates final grade values using the formula in the calculation property.
      * The parameters are taken from final grades of grade items in current course only.
+     *
         // this itemid is added so that we use only one query for source and final grades
         $gis = array_merge($useditems, array($this->id));
         list($usql, $params) = $DB->get_in_or_equal($gis);
         if ($userid) {
-            $usersql = "AND g.userid=?";
+            $usersql = "AND userid=?";
             $params[] = $userid;
         } else {
             $usersql = "";
         }
-        $grade_inst = new grade_grade();
+        $gradeinst = new grade_grade();
-        $fields = 'g.'.implode(',g.', $grade_inst->required_fields);
-        $params[] = $this->courseid;
-        $sql = "SELECT $fields
-                  FROM {grade_grades} g, {grade_items} gi
+        $fields = implode(',', $gradeinst->required_fields);
                  WHERE gi.id = g.itemid AND gi.id $usql $usersql AND gi.courseid=?
-                 ORDER BY g.userid";
+        $params[] = $this->courseid;
         $return = true;
         // group the grades by userid and use formula on the group
-        $rs = $DB->get_recordset_sql($sql, $params);
+        $rs = $DB->get_recordset_select('grade_grades', "itemid $usql $usersql", $params, 'userid', $fields);

Proyectos de Subversion Moodle

(root)/lib/grade/grade_item.php – Rev 1 → 1441