mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 12:40:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-79493-master' of https://github.com/ilyatregubov/moodle

Browse Source
This commit is contained in:
Huong Nguyen 2023-09-27 13:37:25 +07:00
commit 48f29f73e0
No known key found for this signature in database
GPG Key ID: 40D88AB693A3E72A
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
grade/edit/tree/lib.php
View File

@ -276,7 +276,7 @@ class grade_edit_tree {
}
$categoryrow->attributes['data-aggregation'] = $category->aggregation;
$categoryrow->attributes['data-grademax'] = $category->grade_item->grademax;
$categoryrow->attributes['data-aggregationcoef'] = $category->grade_item->aggregationcoef;
$categoryrow->attributes['data-aggregationcoef'] = floatval($category->grade_item->aggregationcoef);
$categoryrow->attributes['data-itemid'] = $category->grade_item->id;
$categoryrow->attributes['data-hidden'] = 'false';
foreach ($rowclasses as $class) {
@ -350,7 +350,7 @@ class grade_edit_tree {
} else {
$gradeitemrow->attributes['data-parent-category'] = $parent_eid;
$gradeitemrow->attributes['data-grademax'] = $object->grademax;
$gradeitemrow->attributes['data-aggregationcoef'] = $object->aggregationcoef;
$gradeitemrow->attributes['data-aggregationcoef'] = floatval($object->aggregationcoef);
}
foreach ($rowclasses as $class) {
$gradeitemrow->attributes['class'] .= ' ' . $class;

3
grade/tests/behat/grade_edit_tree_bulk_actions.feature
View File

@ -253,7 +253,8 @@ Feature: Teachers can perform bulk actions on grade items and categories in the
And I press tab
And the focused element is "Move" "button" in the "Move items" "dialogue"
When I press the enter key
And I wait to be redirected
And I wait until the page is ready
And I wait "2" seconds
And I press tab key in "region-main" "region"
# Confirm that 'Grade item 1' and 'Grade item 2' have been moved to 'Category 3'
And I click on grade item menu "Grade item 1" of type "gradeitem" on "setup" page