Merge branch 'MDL-74478-master' of https://github.com/mihailges/moodle

moodle · Apr 28, 2022 · c62fc00 · c62fc00
2 parents 44d39bf + d27e7e1
commit c62fc00
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 5 deletions.
diff --git a/badges/criteria/award_criteria_activity.php b/badges/criteria/award_criteria_activity.php
@@ -248,8 +248,11 @@ public function get_completed_criteria_sql() {
             if (!empty($moduledata)) {
                 $extraon = implode(' OR ', $moduledata);
                 $join = " JOIN {course_modules_completion} cmc ON cmc.userid = u.id AND
-                          ( cmc.completionstate = :completionpass OR cmc.completionstate = :completioncomplete ) AND ({$extraon})";
+                          ( cmc.completionstate = :completionfail OR
+                          cmc.completionstate = :completionpass OR
+                          cmc.completionstate = :completioncomplete ) AND ({$extraon})";
                 $params["completionpass"] = COMPLETION_COMPLETE_PASS;
+                $params["completionfail"] = COMPLETION_COMPLETE_FAIL;
                 $params["completioncomplete"] = COMPLETION_COMPLETE;
             }
             return array($join, $where, $params);
@@ -259,10 +262,12 @@ public function get_completed_criteria_sql() {
                           cmc{$param['module']}.userid = u.id AND
                           cmc{$param['module']}.coursemoduleid = :completedmodule{$param['module']} AND
                           ( cmc{$param['module']}.completionstate = :completionpass{$param['module']} OR
+                            cmc{$param['module']}.completionstate = :completionfail{$param['module']} OR
                             cmc{$param['module']}.completionstate = :completioncomplete{$param['module']} )";
                 $where .= " AND cmc{$param['module']}.coursemoduleid IS NOT NULL ";
                 $params["completedmodule{$param['module']}"] = $param['module'];
                 $params["completionpass{$param['module']}"] = COMPLETION_COMPLETE_PASS;
+                $params["completionfail{$param['module']}"] = COMPLETION_COMPLETE_FAIL;
                 $params["completioncomplete{$param['module']}"] = COMPLETION_COMPLETE;
             }
             return array($join, $where, $params);

diff --git a/badges/tests/behat/criteria_activity.feature b/badges/tests/behat/criteria_activity.feature
@@ -8,6 +8,7 @@ Feature: Award badges based on activity completion
     Given the following "users" exist:
       | username | firstname | lastname | email                |
       | student1 | Student   | 1        | student1@example.com |
+      | student2 | Student   | 1        | student2@example.com |
       | teacher1 | Teacher   | 1        | teacher1@example.com |
     And the following "courses" exist:
       | fullname | shortname | category | enablecompletion |
@@ -16,6 +17,7 @@ Feature: Award badges based on activity completion
       | user     | course | role           |
       | teacher1 | C1     | editingteacher |
       | student1 | C1     | student        |
+      | student2 | C1     | student        |
     And the following config values are set as admin:
       | grade_item_advanced | hiddenuntil |
     And the following "question categories" exist:
@@ -33,6 +35,9 @@ Feature: Award badges based on activity completion
     And user "student1" has attempted "Test quiz name" with responses:
       | slot | response |
       |   1  | False    |
+    And user "student2" has attempted "Test quiz name" with responses:
+      | slot | response |
+      |   1  | False    |
     And I log in as "teacher1"
     And I am on "Course 1" course homepage
     And I change window size to "large"
@@ -42,17 +47,21 @@ Feature: Award badges based on activity completion
       | Description | Course badge description |
     And I upload "badges/tests/behat/badge.png" file to "Image" filemanager
     And I press "Create badge"
+
+  Scenario: Student earns a badge using activity completion, but does not get passing grade
+    Given I am on the "Course 1" course page logged in as teacher1
+    And I navigate to "Badges" in current page administration
+    And I press "Manage badges"
+    And I follow "Course Badge"
+    And I select "Criteria" from the "jump" singleselect
     And I set the field "type" to "Activity completion"
     And I set the field "Quiz - Test quiz name" to "1"
     And I press "Save"
     And I press "Enable access"
     And I press "Continue"
     And I should see "Recipients (0)"
     And I log out
-
-  Scenario: Student earns a badge using activity completion, but does not get passing grade
-    Given I log in as "student1"
-    And I am on "Course 1" course homepage
+    And I am on the "Course 1" course page logged in as student1
     And the "Receive a grade" completion condition of "Test quiz name" is displayed as "done"
     And the "Receive a passing grade" completion condition of "Test quiz name" is displayed as "failed"
     And the "Receive a pass grade or complete all available attempts" completion condition of "Test quiz name" is displayed as "todo"
@@ -68,3 +77,48 @@ Feature: Award badges based on activity completion
     And I navigate to "Badges > Manage badges" in current page administration
     And I follow "Course Badge"
     Then I should see "Recipients (1)"
+
+  Scenario Outline: Previously graded pass/fail students should earn a badge after enabling a badge
+    Given I am on the "Course 1" course page logged in as teacher1
+    And I navigate to "Badges" in current page administration
+    And I press "Manage badges"
+    And I follow "Course Badge"
+    And I select "Criteria" from the "jump" singleselect
+    And I set the field "type" to "Activity completion"
+    And I click on "Expand all" "link"
+    And I set the field "Quiz - Test quiz name" to "1"
+    And I set the field "<aggregationcriteria>" to "1"
+    And I press "Save"
+
+    # Fail grade with student2
+    And I am on the "Course 1" course page logged in as student2
+    And I am on the "Test quiz name" "quiz activity" page
+    And I press "Re-attempt quiz"
+    And I set the field "False" to "1"
+    And I press "Finish attempt ..."
+    And I press "Submit all and finish"
+    And I click on "Submit all and finish" "button" in the "Confirmation" "dialogue"
+    And I log out
+
+    # Pass grade with student1
+    And I am on the "Course 1" course page logged in as student1
+    And I am on the "Test quiz name" "quiz activity" page
+    And I press "Re-attempt quiz"
+    And I set the field "False" to "0"
+    And I press "Finish attempt ..."
+    And I press "Submit all and finish"
+    And I click on "Submit all and finish" "button" in the "Confirmation" "dialogue"
+    And I log out
+
+    # Enable badge access once all students have completed an activity.
+    And I am on the "Course 1" course page logged in as teacher1
+    And I navigate to "Badges > Manage badges" in current page administration
+    And I follow "Course Badge"
+    When I press "Enable access"
+    And I press "Continue"
+    Then I should see "Recipients (2)"
+
+    Examples:
+      | aggregationcriteria                         |
+      | Any of the selected activities is complete  |
+      | All of the selected activities are complete |