From 12eb2c2bf4e3421c27f90b06a9d2e03a6b795cce Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Wed, 29 May 2019 13:38:41 +0100 Subject: [PATCH] MDL-65731 quiz manual grading: fix ambiguous order by idnumber --- mod/quiz/report/grading/report.php | 3 +++ mod/quiz/report/grading/tests/behat/grading.feature | 11 +++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/mod/quiz/report/grading/report.php b/mod/quiz/report/grading/report.php index c4e843fb7cf..39c0c407d77 100644 --- a/mod/quiz/report/grading/report.php +++ b/mod/quiz/report/grading/report.php @@ -551,6 +551,9 @@ class quiz_grading_report extends quiz_default_report { case "studentfirstname": $orderby = "u.firstname, u.lastname"; break; + case "idnumber": + $orderby = "u.idnumber"; + break; } } diff --git a/mod/quiz/report/grading/tests/behat/grading.feature b/mod/quiz/report/grading/tests/behat/grading.feature index 840902b045f..e2d793bdfe4 100644 --- a/mod/quiz/report/grading/tests/behat/grading.feature +++ b/mod/quiz/report/grading/tests/behat/grading.feature @@ -1,4 +1,4 @@ -@mod @mod_quiz +@mod @mod_quiz @quiz @quiz_grading Feature: Basic use of the Manual grading report In order to easily find students attempts that need manual grading As a teacher @@ -50,8 +50,15 @@ Feature: Basic use of the Manual grading report And "Short answer 001" row "To grade" column of "questionstograde" table should contain "0" And "Short answer 001" row "Already graded" column of "questionstograde" table should contain "0" - # Adjust the mark for Student1. + # Go to the grading page. And I click on "update grades" "link" in the "Short answer 001" "table_row" + And I should see "Grading attempts 1 to 1 of 1" + + # Test the display options. + And I set the field "Order attempts" to "By student id number" + And I press "Change options" + + # Adjust the mark for Student1. And I set the field "Comment" to "I have adjusted your mark to 0.6" And I set the field "Mark" to "0.6" And I press "Save and go to next page"