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

      * @var array $required_fields
      */
     public $required_fields = array('id', 'itemid', 'userid', 'rawgrade', 'rawgrademax', 'rawgrademin',
                                  'rawscaleid', 'usermodified', 'finalgrade', 'hidden', 'locked',
                                  'locktime', 'exported', 'overridden', 'excluded', 'timecreated',
-                                 'timemodified', 'aggregationstatus', 'aggregationweight');
+                                 'timemodified', 'aggregationstatus', 'aggregationweight', 'deductedmark');
     /**
      * Array of optional fields with default values (these should match db defaults)
      * @var array $optional_fields
      * label text.
      * @var string $label
      */
     public $label;
+    /** @var float $deductedmark mark deducted from final grade */
+    public float $deductedmark = 0;
+    /**
+     * Date when this grade was last graded.
+     * @var int $dategraded
+     */
+    public $dategraded = null;
     /**
      * Returns array of grades for given grade_item+users
+     *
      * @param grade_item $grade_item
     /**
      * Handles adding feedback files in the gradebook.
+     *
      * @param int|null $historyid
      */
-    protected function add_feedback_files(int $historyid = null) {
+    protected function add_feedback_files(?int $historyid = null) {
         global $CFG;
         // We only support feedback files for modules atm.
         if ($this->grade_item && $this->grade_item->is_external_item()) {
     /**
      * Handles updating feedback files in the gradebook.
+     *
      * @param int|null $historyid
      */
-    protected function update_feedback_files(int $historyid = null) {
+    protected function update_feedback_files(?int $historyid = null) {
         global $CFG;
         // We only support feedback files for modules atm.
         if ($this->grade_item && $this->grade_item->is_external_item()) {
      */
     public function get_context() {
         $this->load_grade_item();
         return $this->grade_item->get_context();
+    }
+    /**
+     * Whether the penalty is applied to this final grade.
+     *
+     * @return bool whether penalty is applied
+     */
+    public function is_penalty_applied_to_final_grade(): bool {
+        // Return false if the grade is overridden.
+        if ($this->is_overridden()) {
+            return false;
+        }
+        return $this->deductedmark > 0;
+    }
+}

Proyectos de Subversion Moodle

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