Merge pull request #35 from bdecentgmbh/dev

Merge to main for release

.github/workflows/moodle-ci.yml

@@ -30,6 +30,9 @@ jobs:
       fail-fast: false
       matrix:
        include:
+          - php: '8.1'
+            moodle-branch: 'MOODLE_403_STABLE'
+            database: 'pgsql'       
           - php: '8.0'
             moodle-branch: 'MOODLE_402_STABLE'
             database: 'pgsql'
@@ -42,9 +45,6 @@ jobs:
           - php: '7.4'
             moodle-branch: 'MOODLE_401_STABLE'
             database: 'pgsql'
-          - php: '7.4'
-            moodle-branch: 'MOODLE_400_STABLE'
-            database: 'mariadb'
 
     steps:
       - name: Check out repository code

classes/automation/instances.php

@@ -425,6 +425,9 @@ public function find_user_completion_conditions($conditions, $instancedata, $use
             if ($status <= 0 ) {
                 continue;
             }
+
+            $enabled++; // Increase enabled condition count.
+
             // Condition is only configured to verify the future enrolment.
             if ($status == condition_base::FUTURE && !$isnewuser) {
                 $userenroltime = $this->get_user_enrolment_createtime($userid, $instancedata->course);
@@ -435,8 +438,6 @@ public function find_user_completion_conditions($conditions, $instancedata, $use
                 }
             }
 
-            $enabled++; // Increase enabled condition count.
-
             if ($condition->is_user_completed($instancedata, $userid, $completion)) {
 
                 $result++; // Increase completed condition count for this user.

version.php

@@ -25,7 +25,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = 'mod_pulse';
-$plugin->version = 2023100706;
+$plugin->version = 2023100707;
 $plugin->requires = 2022112800; // Requires Moodle 4.1
 $plugin->release = 'v2.0';
 $plugin->maturity = MATURITY_STABLE;