From 471838be7b371e1da5334297a1e695fde4d4060f Mon Sep 17 00:00:00 2001
From: Amaia Anabitarte <amaia@moodle.com>
Date: Fri, 24 Nov 2023 16:30:53 +0100
Subject: [PATCH] MDL-80234 mod_scorm: Saved passed status requirement

---
 .../behat/default_activity_completion.feature | 34 +++++++++++++++++++
 mod/scorm/mod_form.php                        |  8 ++---
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/completion/tests/behat/default_activity_completion.feature b/completion/tests/behat/default_activity_completion.feature
index e74420d301c..92ddb9946fa 100644
--- a/completion/tests/behat/default_activity_completion.feature
+++ b/completion/tests/behat/default_activity_completion.feature
@@ -48,3 +48,37 @@ Feature: Allow teachers to edit the default activity completion rules in a cours
     And I should see "Student must receive a grade to complete this activity" in the "//div[contains(concat(' ', normalize-space(@class), ' '), ' row ')][.//*[text() = 'Assignments']]" "xpath_element"
     And I should see "Student must make a submission" in the "//div[contains(concat(' ', normalize-space(@class), ' '), ' row ')][.//*[text() = 'Assignments']]" "xpath_element"
     And I should not see "Completion expected on" in the "//div[contains(concat(' ', normalize-space(@class), ' '), ' row ')][.//*[text() = 'Assignments']]" "xpath_element"
+
+  @javascript
+  Scenario: Course activity completion default rules for SCORM
+    Given the following "courses" exist:
+      | fullname | shortname | category | enablecompletion |
+      | Course 1 | C1        | 0        | 1                |
+    And the following "users" exist:
+      | username | firstname | lastname | email |
+      | teacher1 | Teacher | Frist | teacher1@example.com |
+    And the following "course enrolments" exist:
+      | user     | course | role           |
+      | teacher1 | C1     | editingteacher |
+    And I am on the "Course 1" course page logged in as teacher1
+    When I navigate to "Course completion" in current page administration
+    And I select "Default activity completion" from the "Course completion tertiary navigation" singleselect
+    And I click on "SCORM packages" "checkbox"
+    And I click on "Edit" "button"
+    # Check Passed option.
+    And I set the following fields to these values:
+      | completion | Show activity as complete when conditions are met|
+      | completionstatusrequired[2] | 1 |
+    And I click on "Save changes" "button"
+    Then I should see "Changes saved"
+    And I should see "Student must achieve at least one of the following statuses: Passed, Completed"
+    And I navigate to "Course completion" in current page administration
+    And I select "Default activity completion" from the "Course completion tertiary navigation" singleselect
+    And I click on "SCORM packages" "checkbox"
+    And I click on "Edit" "button"
+    # Uncheck Pass option.
+    And I set the following fields to these values:
+      | completionstatusrequired[2] | 0 |
+    And I click on "Save changes" "button"
+    Then I should see "Changes saved"
+    And I should see "Student must achieve at least one of the following statuses: Completed"
diff --git a/mod/scorm/mod_form.php b/mod/scorm/mod_form.php
index b45ef67ced0..96746e49a71 100644
--- a/mod/scorm/mod_form.php
+++ b/mod/scorm/mod_form.php
@@ -333,16 +333,16 @@ class mod_scorm_mod_form extends moodleform_mod {
 
         // Set some completion default data.
         $cvalues = array();
-        if (empty($this->_instance)) {
-            // When in add mode, set a default completion rule that requires the SCORM's status be set to "Completed".
-            $cvalues[4] = 1;
-        } else if (!empty($defaultvalues['completionstatusrequired']) && !is_array($defaultvalues['completionstatusrequired'])) {
+        if (!empty($defaultvalues['completionstatusrequired']) && !is_array($defaultvalues['completionstatusrequired'])) {
             // Unpack values.
             foreach (scorm_status_options() as $key => $value) {
                 if (($defaultvalues['completionstatusrequired'] & $key) == $key) {
                     $cvalues[$key] = 1;
                 }
             }
+        } else if (empty($this->_instance)) {
+            // When in add mode, set a default completion rule that requires the SCORM's status be set to "Completed".
+            $cvalues[4] = 1;
         }
         if (!empty($cvalues)) {
             $defaultvalues['completionstatusrequired'] = $cvalues;