From cba8b02635e9c4b46d109711b7821ac60d9aeac5 Mon Sep 17 00:00:00 2001 From: Aaron Barnes Date: Fri, 27 Aug 2010 03:52:05 +0000 Subject: [PATCH] course completion: MDL-2631 Display completion status more accurately --- blocks/completionstatus/block_completionstatus.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/blocks/completionstatus/block_completionstatus.php b/blocks/completionstatus/block_completionstatus.php index 822a0728053..87b101c4917 100644 --- a/blocks/completionstatus/block_completionstatus.php +++ b/blocks/completionstatus/block_completionstatus.php @@ -157,6 +157,13 @@ class block_completionstatus extends block_base { // Is course complete? $coursecomplete = $info->is_course_complete($USER->id); + + // Load course completion + $params = array( + 'userid' => $USER->id, + 'course' => $COURSE->id + ); + $ccompletion = new completion_completion($params); // Has this user completed any criteria? $criteriacomplete = $info->count_course_user_data($USER->id); @@ -165,7 +172,7 @@ class block_completionstatus extends block_base { $this->content->text .= ''.get_string('pending', 'completion').''; } else if ($coursecomplete) { $this->content->text .= get_string('complete'); - } else if (!$criteriacomplete) { + } else if (!$criteriacomplete && !$ccompletion->timestarted) { $this->content->text .= ''.get_string('notyetstarted', 'completion').''; } else { $this->content->text .= ''.get_string('inprogress','completion').''; -- 2.43.0