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

Merge branch 'MDL-75588-401' of https://github.com/HuongNV13/moodle into MOODLE_401_STABLE

Browse Source
This commit is contained in:
Sara Arjona 2022-12-07 19:31:11 +01:00
commit d8f2ead786
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mod/assign/locallib.php
View File

@ -2955,9 +2955,16 @@ class assign {
// If the conditions are met, allow another attempt.
if ($submission) {
$this->reopen_submission_if_required($grade->userid,
$isreopened = $this->reopen_submission_if_required($grade->userid,
$submission,
$reopenattempt);
if ($isreopened) {
$completion = new completion_info($this->get_course());
if ($completion->is_enabled($this->get_course_module()) &&
$this->get_instance()->completionsubmit) {
$completion->update_state($this->get_course_module(), COMPLETION_INCOMPLETE, $grade->userid);
}
}
}
return true;

37
mod/assign/tests/behat/assign_activity_completion.feature
View File

@ -25,6 +25,19 @@ Feature: View activity completion in the assignment activity
| completion | 1 |
| grade[modgrade_type] | point |
| grade[modgrade_point] | 100 |
And the following "activity" exists:
| activity | assign |
| course | C1 |
| idnumber | mh2 |
| name | Music history 2 |
| section | 1 |
| assignsubmission_onlinetext_enabled | 1 |
| attemptreopenmethod | manual |
| maxattempts | -1 |
| completion | 2 |
| completionsubmit | 1 |
| grade[modgrade_type] | point |
| grade[modgrade_point] | 100 |
@javascript
Scenario: The manual completion button will be shown on the course page if the Show activity completion conditions is set to Yes
@ -123,3 +136,27 @@ Feature: View activity completion in the assignment activity
Then the "View" completion condition of "Music history" is displayed as "done"
And the "Make a submission" completion condition of "Music history" is displayed as "done"
And the "Receive a grade" completion condition of "Music history" is displayed as "done"
@javascript
Scenario: Automatic completion items should reset when a new attempt is manually given.
Given I am on the "Music history 2" "assign activity" page logged in as student1
And the "Make a submission" completion condition of "Music history 2" is displayed as "todo"
And I press "Add submission"
And I set the field "Online text" to "History of playing with drumsticks reversed"
And I press "Save changes"
And I press "Submit assignment"
And I press "Continue"
And the "Make a submission" completion condition of "Music history 2" is displayed as "done"
And I log out
And I am on the "Music history 2" "assign activity" page logged in as teacher1
And I follow "View all submissions"
And I click on "Grade" "link" in the "Vinnie Student1" "table_row"
And I set the field "Grade out of 100" to "33"
And I set the field "Notify student" to "0"
And I set the field "Allow another attempt" to "Yes"
And I press "Save changes"
And I log out
When I am on the "Music history 2" "assign activity" page logged in as student1
And I should see "Reopened"
And "Add a new attempt based on previous submission" "button" should exist
Then the "Make a submission" completion condition of "Music history 2" is displayed as "todo"