From fe09ccbaed3b97ae525fa120fe8993ff0b77a2b7 Mon Sep 17 00:00:00 2001 From: Martin Dougiamas Date: Tue, 11 May 2010 02:27:22 +0000 Subject: [PATCH] MDL-22185 I missed some field name changes (date) --- lib/completion/completion_criteria.php | 2 +- lib/completion/completion_criteria_activity.php | 2 +- lib/completion/completion_criteria_duration.php | 2 +- lib/completion/completion_criteria_grade.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/completion/completion_criteria.php b/lib/completion/completion_criteria.php index 0a13e5acfa3..293d318dd55 100644 --- a/lib/completion/completion_criteria.php +++ b/lib/completion/completion_criteria.php @@ -72,7 +72,7 @@ abstract class completion_criteria extends data_object { * Array of required table fields, must start with 'id'. * @var array $required_fields */ - public $required_fields = array('id', 'course', 'criteriatype', 'module', 'moduleinstance', 'courseinstance', 'enrolperiod', 'date', 'gradepass', 'role'); + public $required_fields = array('id', 'course', 'criteriatype', 'module', 'moduleinstance', 'courseinstance', 'enrolperiod', 'timeend', 'gradepass', 'role'); /** * Course id diff --git a/lib/completion/completion_criteria_activity.php b/lib/completion/completion_criteria_activity.php index eeda08008b6..7f072b405d1 100644 --- a/lib/completion/completion_criteria_activity.php +++ b/lib/completion/completion_criteria_activity.php @@ -193,7 +193,7 @@ class completion_criteria_activity extends completion_criteria { $sql = ' SELECT DISTINCT c.id AS course, - cr.date AS date, + cr.timeend AS date, cr.id AS criteriaid, ra.userid AS userid, mc.timemodified AS timecompleted diff --git a/lib/completion/completion_criteria_duration.php b/lib/completion/completion_criteria_duration.php index 01df38ab99f..43ee857c278 100644 --- a/lib/completion/completion_criteria_duration.php +++ b/lib/completion/completion_criteria_duration.php @@ -175,7 +175,7 @@ class completion_criteria_duration extends completion_criteria { $sql = ' SELECT DISTINCT c.id AS course, - cr.date AS date, + cr.timeend AS date, cr.id AS criteriaid, ra.userid AS userid, (ra.timestart + cr.enrolperiod) AS timecompleted diff --git a/lib/completion/completion_criteria_grade.php b/lib/completion/completion_criteria_grade.php index 87338cbc7ee..985942a2c38 100644 --- a/lib/completion/completion_criteria_grade.php +++ b/lib/completion/completion_criteria_grade.php @@ -177,7 +177,7 @@ class completion_criteria_grade extends completion_criteria { $sql = ' SELECT DISTINCT c.id AS course, - cr.date AS date, + cr.timeend AS date, cr.id AS criteriaid, ra.userid AS userid, gg.finalgrade AS gradefinal,