fix the display of completion conditions on the course page

Refs #86

classes/completion/custom_completion.php

@@ -54,7 +54,7 @@ public function get_state(string $rule): int {
         // Check if the referenced course is completed.
         $coursecompletion = new \completion_completion(['userid' => $this->userid, 'course' => $subcourse->refcourse]);
 
-        return $coursecompletion->is_complete();
+        return $coursecompletion->is_complete() ? COMPLETION_COMPLETE : COMPLETION_INCOMPLETE;
     }
 
     /**
@@ -78,6 +78,10 @@ public function get_custom_rule_descriptions(): array {
      * @return array
      */
     public function get_sort_order(): array {
-        return ['completioncourse'];
+        return [
+            'completionview',
+            'completionusegrade',
+            'completioncourse',
+        ];
     }
 }

lib.php

@@ -364,7 +364,8 @@ function subcourse_get_coursemodule_info($coursemodule) {
     global $CFG, $DB;
 
     $subcourse = $DB->get_record('subcourse', ['id' => $coursemodule->instance],
-        'id, name, intro, introformat, instantredirect, blankwindow, coursepageprintgrade, coursepageprintprogress');
+        'id, name, intro, introformat, instantredirect, blankwindow, coursepageprintgrade, coursepageprintprogress, ' .
+            'completioncourse');
 
     if (!$subcourse) {
         return null;
@@ -387,6 +388,10 @@ function subcourse_get_coursemodule_info($coursemodule) {
         $info->content = format_module_intro('subcourse', $subcourse, $coursemodule->id, false);
     }
 
+    if ($coursemodule->completion == COMPLETION_TRACKING_AUTOMATIC) {
+        $info->customdata->customcompletionrules['completioncourse'] = $subcourse->completioncourse;
+    }
+
     return $info;
 }
 
@@ -433,7 +438,7 @@ function subcourse_update_grades($subcourse, $userid=0, $nullifnone=true) {
         // Prevent empty referenced course id coding error.
         return GRADE_UPDATE_FAILED;
     }
-    
+
     if ($refgrades && $refgrades->grades) {
         if (!empty($refgrades->localremotescale)) {
             // Unable to fetch remote grades - local scale is used in the remote course.