L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-82681 mod_assign: Reset Marker and Suspended participants filters

Browse Source 
Extends the functionality of the 'Clear all' filters option to reset
the new 'Marker' and 'Suspended participants' filters on the
assignment submissions page.
This commit is contained in:
Mihail Geshoski
2024-09-19 23:17:01 +08:00
parent 9265ab5ca8
commit a97231fc06
4 changed files with 72 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/classes/output/grading_actionmenu.php
+2
View File
@@ -126,6 +126,8 @@ class grading_actionmenu implements templatable, renderable {
'group' => 0,
'status' => '',
'workflowfilter' => '',
'markingallocationfilter' => '',
'suspendedparticipantsfilter' => 0,
]);
$data['pagereset'] = $url->out(false);
}
mod/assign/tests/behat/filter_by_marker.feature
+39
View File
@@ -118,3 +118,42 @@ Feature: In an assignment, teachers can filter displayed submissions by assigned
| -2- |
| Student 1 |
| Student 2 |
@javascript
Scenario: The applied marker filter can be reset using the 'Clear all' option
Given I am on the "Test assignment name" "assign activity editing" page logged in as teacher1
And I expand all fieldsets
And I set the field "Use marking workflow" to "Yes"
And I set the field "Use marking allocation" to "Yes"
And I press "Save and display"
And I am on the "Test assignment name" "assign activity" page
And I change window size to "large"
And I go to "Student 1" "Test assignment name" activity advanced grading page
# Allocate Marker 1 as the marker of Student 1.
And I set the field "allocatedmarker" to "Marker 1"
And I set the field "Notify student" to "0"
And I press "Save changes"
And I follow "View all submissions"
# Ensure the 'Clear all' option is not available until the marker filter has been applied.
And "Clear all" "link" should not exist in the ".tertiary-navigation" "css_element"
# Set the Marker filter to 'Marker 1'.
And I click on "Advanced" "button" in the ".tertiary-navigation" "css_element"
And I set the field "Marker" in the ".extrafilters .dropdown-menu" "css_element" to "Marker 1"
And I click on "Apply" "button" in the ".extrafilters .dropdown-menu" "css_element"
# Ensure only Student 1 is now displayed in the submissions table.
And the following should exist in the "submissions" table:
| -2- |
| Student 1 |
And the following should not exist in the "submissions" table:
| -2- |
| Student 2 |
# Ensure the 'Clear all' option is now available.
And "Clear all" "link" should exist in the ".tertiary-navigation" "css_element"
# Ensure the marker filter is reset when the 'Clear All' option is triggered.
When I click on "Clear all" "link" in the ".tertiary-navigation" "css_element"
Then the following should exist in the "submissions" table:
| -2- |
| Student 1 |
| Student 2 |
And I click on "Advanced" "button" in the ".tertiary-navigation" "css_element"
And the field "Marker" matches value "No filter"
mod/assign/tests/behat/filter_by_marking_workflow.feature
+1 -1
View File
@@ -138,7 +138,7 @@ Feature: In an assignment, teachers can filter displayed submissions by marking
And I set the field "Marking state" in the ".extrafilters .dropdown-menu" "css_element" to "In marking"
And I click on "Apply" "button" in the ".extrafilters .dropdown-menu" "css_element"
# Ensure only Student 2 is now displayed in the submissions table.
Then the following should exist in the "submissions" table:
And the following should exist in the "submissions" table:
| -2- |
| Student 2 |
And the following should not exist in the "submissions" table:
mod/assign/tests/behat/filter_suspended_participants.feature
+30
View File
@@ -96,3 +96,33 @@ Feature: In an assignment, teachers can include or exclude submissions from susp
And the following should not exist in the "submissions" table:
| -2- |
| Student 2 |
@javascript
Scenario: The applied suspended participants filter can be reset using the 'Clear all' option
Given I am on the "Test assignment name" Activity page logged in as teacher1
And I navigate to "Submissions" in current page administration
And I change window size to "large"
# Ensure the 'Clear all' option is not available until the suspended participants filter has been applied.
And "Clear all" "link" should not exist in the ".tertiary-navigation" "css_element"
# Set to include submissions from suspended participants.
And I click on "Advanced" "button" in the ".tertiary-navigation" "css_element"
And I click on "Include suspended participants" "checkbox" in the ".extrafilters .dropdown-menu" "css_element"
And the field "Include suspended participants" matches value "1"
And I click on "Apply" "button" in the ".extrafilters .dropdown-menu" "css_element"
# Ensure that the suspended Student 2 is now also displayed in the submissions table.
And the following should exist in the "submissions" table:
| -2- |
| Student 1 |
| Student 2 |
# Ensure the 'Clear all' option is now available.
And "Clear all" "link" should exist in the ".tertiary-navigation" "css_element"
# Ensure the marker filter is reset when the 'Clear All' option is triggered.
When I click on "Clear all" "link" in the ".tertiary-navigation" "css_element"
Then the following should exist in the "submissions" table:
| -2- |
| Student 1 |
And the following should not exist in the "submissions" table:
| -2- |
| Student 2 |
And I click on "Advanced" "button" in the ".tertiary-navigation" "css_element"
And the field "Include suspended participants" matches value ""