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

MDL-78768 grade: fix import multiple new grade items

Browse Source 
Prior to this change, when importing grades from .csv (or another
method) and you choose to map the grades to a 'New grade item', you get
the following error message:
```
"Mapping collision detected - two fields maps to the same grade item
new."
```
A workaround existed that required users to import one column at a time,
which was cumbersome.

This change fixes importing multiple new grade items and adds a behat
test.

Co-authored-by: hehe009 <[email protected]>
Signed-off-by: Daniel Ziegenberg <[email protected]>
This commit is contained in:
Daniel Ziegenberg
2024-05-17 21:22:09 +02:00
co-authored by hehe009
parent bcae2164ac
commit 4b9de301c3
3 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grade/import/csv/classes/load_data.php
+2 -2
View File
@@ -476,8 +476,8 @@ class gradeimport_csv_load_data {
// Check for mapto collisions.
$maperrors = array();
foreach ($map as $i => $j) {
if ($j == 0) {
// You can have multiple ignores.
if (($j == 0) || ($j == 'new')) {
// You can have multiple ignores or multiple new grade items.
continue;
} else {
if (!isset($maperrors[$j])) {
grade/tests/behat/grade_import.feature
+30 -10
View File
@@ -21,20 +21,19 @@ Feature: An admin can import grades into gradebook using a CSV file
| student2 | C1 | student |
| student3 | C1 | student |
And the following "grade item" exists:
| course | C1 |
| itemname | Manual item 1 |
| grademin | 10 |
| grademax | 500 |
| course | C1 |
| itemname | Manual item 1 |
| grademin | 10 |
| grademax | 500 |
And the following "grade grades" exist:
| gradeitem | user | grade |
| Manual item 1 | student1 | 50.00 |
| Manual item 1 | student2 | 50.00 |
| Manual item 1 | student3 | 50.00 |
@javascript
Scenario: Max grade of grade item is respected when importing grades
Given I am on the "Course 1" "Course" page logged in as "teacher1"
And I navigate to "More > Import" in the course gradebook
And I navigate to "CSV file" import page in the course gradebook
And I upload "grade/tests/fixtures/grade_import_grademax.csv" file to "File" filemanager
And I click on "Upload grades" "button"
And I set the field "Map from" to "Email address"
@@ -62,7 +61,28 @@ Feature: An admin can import grades into gradebook using a CSV file
And I should see "Grade import success"
And I click on "Continue" "button"
Then the following should exist in the "user-grades" table:
| -1- | -1- | -3- | -4- |
| Student 1 | student1@example.com | 400.00 | 400.00 |
| Student 2 | student2@example.com | 50.00 | 50.00 |
| Student 3 | student3@example.com | 50.00 | 50.00 |
| -1- | -1- | -3- | -4- |
| Student 1 | student1@example.com | 400.00 | 400.00 |
| Student 2 | student2@example.com | 50.00 | 50.00 |
| Student 3 | student3@example.com | 50.00 | 50.00 |
Scenario: Importing grades with multiple new mappings
Given I am on the "Course 1" "Course" page logged in as "teacher1"
And I navigate to "CSV file" import page in the course gradebook
And I upload "grade/tests/fixtures/grade_import_multiple_mappings.csv" file to "File" filemanager
And I click on "Upload grades" "button"
And I set the following fields to these values:
| Map from | Email address |
| Map to | Email address |
| Grade A | New grade item |
| Grade B | New grade item |
| Grade C | New grade item |
| Grade D | New grade item |
And I click on "Upload grades" "button"
And I should see "Grade import success"
And I click on "Continue" "button"
Then the following should exist in the "user-grades" table:
| -1- | -1- | -3- | -4- | -5- | -6- | -7- | -8- |
| Student 1 | student1@example.com | 50.00 | 11.00 | 12.00 | 13.00 | 14.00 | 100.00 |
| Student 2 | student2@example.com | 50.00 | 21.00 | 22.00 | 23.00 | 24.00 | 140.00 |
| Student 3 | student3@example.com | 50.00 | 31.00 | 32.00 | 33.00 | 34.00 | 180.00 |
grade/tests/fixtures/grade_import_multiple_mappings.csv
Vendored
+4
View File
@@ -0,0 +1,4 @@
First name,Last name,Email address,Grade A,Grade B,Grade C,Grade D
Student,1,[email protected],11,12,13,14
Student,2,[email protected],21,22,23,24
Student,3,[email protected],31,32,33,34
1 First name Last name Email address Grade A Grade B Grade C Grade D
2 Student 1 [email protected] 11 12 13 14
3 Student 2 [email protected] 21 22 23 24
4 Student 3 [email protected] 31 32 33 34