mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 20:50:21 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-74274-master' of https://github.com/peterRd/moodle

Browse Source
This commit is contained in:
Jun Pataleta 2022-03-24 16:33:39 +08:00
commit 2bce5d8be5
2 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mod/lesson/locallib.php
View File

@ -4255,6 +4255,9 @@ abstract class lesson_page extends lesson_base {
$result->newpageid = LESSON_NEXTPAGE;
} else if ($this->lesson->maxattempts > 1) { // don't bother with message if only one attempt
$result->attemptsremaining = $this->lesson->maxattempts - $nattempts;
if ($result->attemptsremaining == 0) {
$result->maxattemptsreached = true;
}
}
}
}

58
mod/lesson/tests/behat/lesson_navigation.feature
View File

@ -133,6 +133,64 @@ Feature: In a lesson activity, students can navigate through a series of pages i
And I press "Continue"
And I should see "Congratulations - end of lesson reached"
Scenario: Student reattempts a question until out of attempts with specific jumps
Given the following "activities" exist:
| activity | name | intro | course | idnumber |
| lesson | Test lesson name | Test lesson description | C1 | lesson1 |
And I am on the "Test lesson name" "lesson activity" page
And I navigate to "Settings" in current page administration
And I set the following fields to these values:
| id_review | Yes |
| id_maxattempts | 3 |
And I press "Save and return to course"
And I follow "Test lesson name"
And I follow "Add a question page"
And I set the following fields to these values:
| id_qtype | True/false |
And I press "Add a question page"
And I set the following fields to these values:
| Page title | Test question |
| Page contents | Test content 1 |
| id_answer_editor_0 | right |
| id_answer_editor_1 | wrong |
And I press "Save page"
And I select "Add a question page" from the "qtype" singleselect
And I set the field "Select a question type" to "True/false"
And I press "Add a question page"
And I set the following fields to these values:
| Page title | Test question 2 |
| Page contents | Test content 2 |
| id_answer_editor_0 | right |
| id_jumpto_0 | Test question |
| id_answer_editor_1 | wrong |
| id_jumpto_1 | Test question |
And I press "Save page"
And I log out
When I am on the "Test lesson name" "lesson activity" page logged in as student1
Then I should see "Test content 1"
And I set the following fields to these values:
| right | 1 |
And I press "Submit"
And I should see "Test content 2"
And I set the following fields to these values:
| wrong | 1 |
And I press "Submit"
And I should see "You have 2 attempt(s) remaining"
And I press "Yes, I'd like to try again"
And I should see "Test content 2"
And I set the following fields to these values:
| wrong | 1 |
And I press "Submit"
And I should see "You have 1 attempt(s) remaining"
And I press "Yes, I'd like to try again"
And I should see "Test content 2"
And I set the following fields to these values:
| wrong | 1 |
And I press "Submit"
And I should not see "Yes, I'd like to try again"
And I press "Continue"
And I should see "Test content 1"
Scenario: Student should not see remaining attempts notification if maximum number of attempts is set to unlimited
Given the following "activities" exist:
| activity | name | intro | course | idnumber |