mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

MDL-75274 gradereport_grader: Fix sorting of grade items.

Browse Source 
Seems that baseurl is rewritten causing toggling of ordering
not work
This commit is contained in:
Ilya Tregubov 2023-04-05 11:23:32 +08:00 committed by Mathew May
parent cfbb0ea4d5
commit 277b55199e
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grade/lib.php
View File

@ -2556,7 +2556,7 @@ class grade_structure {
// Sorting item.
if ($baseurl) {
$sortlink = $baseurl;
$sortlink = clone($baseurl);
if (isset($element['object']->id)) {
$sortlink->param('sortitemid', $element['object']->id);
} else if ($element['type'] == 'userfield') {

35
grade/report/grader/tests/behat/sort_gradeitems_user_fields.feature
View File

@ -42,7 +42,7 @@ Feature: We can sort grades/user fields on the grader report
And I log in as "teacher1"
@javascript
Scenario: Sort grades or user fields on grader report
Scenario: Sort grades or user fields on grader report by using cell action menu
When I am on "Course 1" course homepage with editing mode on
And I navigate to "View > Grader report" in the course gradebook
# Default sorting is lastname ascending.
@ -77,6 +77,39 @@ Feature: We can sort grades/user fields on the grader report
Then "StudentA 2" "table_row" should appear before "StudentC 3" "table_row"
And "StudentC 3" "table_row" should appear before "StudentD 1" "table_row"
And "StudentD 1" "table_row" should appear before "StudentB 4" "table_row"
@javascript
Scenario: Sort grades or user fields on grader report by using element header
When I am on "Course 1" course homepage with editing mode on
And I navigate to "View > Grader report" in the course gradebook
# Default sorting is lastname ascending.
And "StudentD 1" "table_row" should appear before "StudentA 2" "table_row"
And "StudentA 2" "table_row" should appear before "StudentC 3" "table_row"
And "StudentC 3" "table_row" should appear before "StudentB 4" "table_row"
# Sort by grades in ascending order.
And I click on "Test assignment name 1" "link" in the "region-main" "region"
And I wait until the page is ready
Then "StudentD 1" "table_row" should appear before "StudentB 4" "table_row"
And "StudentB 4" "table_row" should appear before "StudentC 3" "table_row"
And "StudentC 3" "table_row" should appear before "StudentA 2" "table_row"
# Sort by grades in descending order.
And I click on "Test assignment name 1" "link" in the "region-main" "region"
And I wait until the page is ready
Then "StudentA 2" "table_row" should appear before "StudentC 3" "table_row"
And "StudentC 3" "table_row" should appear before "StudentB 4" "table_row"
And "StudentB 4" "table_row" should appear before "StudentD 1" "table_row"
# Sort by email in ascending order.
And I click on "Email address" "link" in the "region-main" "region"
And I wait until the page is ready
Then "StudentB 4" "table_row" should appear before "StudentD 1" "table_row"
And "StudentD 1" "table_row" should appear before "StudentC 3" "table_row"
And "StudentC 3" "table_row" should appear before "StudentA 2" "table_row"
# Sort by email in descending order.
And I click on "Email address" "link" in the "region-main" "region"
And I wait until the page is ready
Then "StudentA 2" "table_row" should appear before "StudentC 3" "table_row"
And "StudentC 3" "table_row" should appear before "StudentD 1" "table_row"
And "StudentD 1" "table_row" should appear before "StudentB 4" "table_row"
# Sort by firstname in ascending order.
And I click on "First name" "link"
And I wait until the page is ready