MDL-64644 completion: set status correctly in provider

ralferlebach · Jan 23, 2019 · 6ff8d31 · 6ff8d31
1 parent aaf7228
commit 6ff8d31
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/completion/classes/privacy/provider.php b/completion/classes/privacy/provider.php
@@ -166,12 +166,19 @@ public static function get_course_completion_info(\stdClass $user, \stdClass $co
         }
 
         $coursecomplete = $completioninfo->is_course_complete($user->id);
-        $criteriacomplete = $completioninfo->count_course_user_data($user->id);
-        $ccompletion = new \completion_completion(['userid' => $user->id, 'course' => $course->id]);
 
-        $status = ($coursecomplete) ? get_string('complete') : '';
-        $status = (!$criteriacomplete && !$ccompletion->timestarted) ? get_string('notyetstarted', 'completion') :
-                get_string('inprogress', 'completion');
+        if ($coursecomplete) {
+            $status = get_string('complete');
+        } else {
+            $criteriacomplete = $completioninfo->count_course_user_data($user->id);
+            $ccompletion = new \completion_completion(['userid' => $user->id, 'course' => $course->id]);
+
+            if (!$criteriacomplete && !$ccompletion->timestarted) {
+                $status = get_string('notyetstarted', 'completion');
+            } else {
+                $status = get_string('inprogress', 'completion');
+            }
+        }
 
         $completions = $completioninfo->get_completions($user->id);
         $overall = get_string('nocriteriaset', 'completion');