From c55c9d73dfc6925e0652b6bf92e44fa560c1cc36 Mon Sep 17 00:00:00 2001 From: skodak Date: Tue, 18 Mar 2008 23:21:23 +0000 Subject: [PATCH] MDL-13899 feedback itself is a type of grading - date graded is now affected by feedback too; merged from MOODLE_19_STABLE --- lib/grade/grade_grade.php | 5 +++-- lib/grade/grade_item.php | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/grade/grade_grade.php b/lib/grade/grade_grade.php index b1fa4d985c..f23fd24320 100644 --- a/lib/grade/grade_grade.php +++ b/lib/grade/grade_grade.php @@ -715,8 +715,9 @@ class grade_grade extends grade_object { return $this->finalgrade >= $this->grade_item->gradepass; } - function insert($source=null) { - $this->timecreated = $this->timemodified = time(); + function insert($source=null) { + // TODO: dategraded hack - do not update times, they are used for submission and grading + //$this->timecreated = $this->timemodified = time(); return parent::insert($source); } diff --git a/lib/grade/grade_item.php b/lib/grade/grade_item.php index e70d535faa..9863ed8893 100644 --- a/lib/grade/grade_item.php +++ b/lib/grade/grade_item.php @@ -1538,8 +1538,8 @@ class grade_item extends grade_object { $grade->finalgrade = $this->adjust_raw_grade($grade->rawgrade, $grade->rawgrademin, $grade->rawgrademax); } - if (is_null($grade->rawgrade)) { - $grade->timemodified = null; // dategraded hack - not graded if no grade present, comments do not count here as grading + if (is_null($grade->rawgrade) and is_null($grade->feedback)) { + $grade->timemodified = null; //TODO: dategraded hack - feedback counts as grading too ;-) } if (empty($grade->id)) { -- 2.39.5