Merge pull request #3699 from NoelDeMartin/MOBILE-4345

MOBILE-4345 quiz: Fix sequential navigation

Author: dpalou

src/addons/mod/quiz/pages/player/player.ts

@@ -531,6 +531,14 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy, CanLeave {
             return;
         }
 
+        // @todo MOBILE-4350: This is called before getting the attempt data in sequential quizzes as a workaround for a bug
+        // in the LMS. Once the bug has been fixed, this should be reverted.
+        if (this.isSequential) {
+            await CoreUtils.ignoreErrors(
+                AddonModQuiz.logViewAttempt(this.attempt.id, page, this.preflightData, this.offline, this.quiz),
+            );
+        }
+
         const data = await AddonModQuiz.getAttemptData(this.attempt.id, page, this.preflightData, {
             cmId: this.quiz.coursemodule,
             readingStrategy: this.offline ? CoreSitesReadingStrategy.PREFER_CACHE : CoreSitesReadingStrategy.ONLY_NETWORK,
@@ -559,9 +567,12 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy, CanLeave {
         });
 
         // Mark the page as viewed.
-        CoreUtils.ignoreErrors(
-            AddonModQuiz.logViewAttempt(this.attempt.id, page, this.preflightData, this.offline, this.quiz),
-        );
+        if (!this.isSequential) {
+            // @todo MOBILE-4350: Undo workaround.
+            CoreUtils.ignoreErrors(
+                AddonModQuiz.logViewAttempt(this.attempt.id, page, this.preflightData, this.offline, this.quiz),
+            );
+        }
 
         // Start looking for changes.
         this.autoSave.startCheckChangesProcess(this.quiz, this.attempt, this.preflightData, this.offline);

src/addons/mod/quiz/tests/behat/quiz_navigation.feature

@@ -15,27 +15,39 @@ Feature: Attempt a quiz in app
       | user     | course | role    |
       | student1 | C1     | student |
     And the following "activities" exist:
-      | activity   | name   | intro              | course | idnumber |
-      | quiz       | Quiz 1 | Quiz 1 description | C1     | quiz1    |
+      | activity   | name   | intro              | course | idnumber | navmethod  |
+      | quiz       | Quiz 1 | Quiz 1 description | C1     | quiz1    | free       |
+      | quiz       | Quiz 2 | Quiz 2 description | C1     | quiz2    | sequential |
     And the following "question categories" exist:
       | contextlevel | reference | name           |
       | Course       | C1        | Test questions |
     And the following "questions" exist:
       | questioncategory | qtype       | name  | questiontext                |
       | Test questions   | truefalse   | TF1   | Text of the first question  |
       | Test questions   | truefalse   | TF2   | Text of the second question |
+      | Test questions   | truefalse   | TF3   | Text of the third question |
     And quiz "Quiz 1" contains the following questions:
       | question | page |
       | TF1      | 1    |
       | TF2      | 2    |
+    And quiz "Quiz 2" contains the following questions:
+      | question | page |
+      | TF1      | 1    |
+      | TF2      | 2    |
+      | TF3      | 3    |
 
   Scenario: Next and previous navigation
     Given I entered the quiz activity "Quiz 1" on course "Course 1" as "student1" in the app
     And I press "Attempt quiz now" in the app
     Then I should find "Text of the first question" in the app
     But I should not find "Text of the second question" in the app
 
-    When I press "Next" in the app
+    When I press "Open navigation popover" in the app
+    Then I should find "Question 1" in the app
+    And I should find "Question 2" in the app
+
+    When I press "Close" in the app
+    And I press "Next" in the app
     Then I should find "Text of the second question" in the app
     But I should not find "Text of the first question" in the app
 
@@ -54,6 +66,8 @@ Feature: Attempt a quiz in app
     When I press "Next" in the app
     And I press "Submit" in the app
     Then I should find "Summary of attempt" in the app
+    And I should find "Not yet answered" within "1" "ion-item" in the app
+    And I should find "Not yet answered" within "2" "ion-item" in the app
 
     When I press "Not yet answered" within "2" "ion-item" in the app
     Then I should find "Text of the second question" in the app
@@ -69,3 +83,57 @@ Feature: Attempt a quiz in app
     When I press "Submit all and finish" in the app
     And I press "OK" near "Once you submit" in the app
     Then I should find "Review" in the app
+    And I should find "Text of the first question" in the app
+    And I should find "Text of the second question" in the app
+
+  Scenario: Sequential navigation
+    Given I entered the quiz activity "Quiz 2" on course "Course 1" as "student1" in the app
+    And I press "Attempt quiz now" in the app
+    Then I should find "Text of the first question" in the app
+    But I should not find "Text of the second question" in the app
+    And I should not find "Text of the third question" in the app
+
+    When I press "Open navigation popover" in the app
+    Then I should find "Question 1" in the app
+    But I should not find "Question 2" in the app
+    And I should not find "Question 3" in the app
+
+    When I press "Close" in the app
+    And I press "Next" in the app
+    Then I should find "Text of the second question" in the app
+    But I should not find "Text of the first question" in the app
+    And I should not find "Text of the third question" in the app
+    And I should not find "Previous" in the app
+
+    When I press "Open navigation popover" in the app
+    Then I should find "Question 2" in the app
+    But I should not find "Question 1" in the app
+    And I should not find "Question 3" in the app
+
+    When I press "Close" in the app
+    And I press "Next" in the app
+    Then I should find "Text of the third question" in the app
+    But I should not find "Text of the first question" in the app
+    And I should not find "Text of the second question" in the app
+    And I should not find "Previous" in the app
+
+    When I press "Open navigation popover" in the app
+    Then I should find "Question 3" in the app
+    But I should not find "Question 1" in the app
+    And I should not find "Question 2" in the app
+
+    When I press "Close" in the app
+    And I press "Submit" in the app
+    Then I should find "Summary of attempt" in the app
+    # @todo MOBILE-4350: Uncomment these.
+    # And I should find "Not yet answered" within "1" "ion-item" in the app
+    # And I should find "Not yet answered" within "2" "ion-item" in the app
+    # And I should find "Not yet answered" within "3" "ion-item" in the app
+
+    When I press "Submit all and finish" in the app
+    And I press "OK" near "Once you submit" in the app
+    Then I should find "Review" in the app
+    # @todo MOBILE-4350: Uncomment these.
+    # And I should find "Text of the first question" in the app
+    # And I should find "Text of the second question" in the app
+    # And I should find "Text of the third question" in the app