moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-69956-311' of https://github.com/dcai/moodle into MOODLE_311_STABLE

Browse source
This commit is contained in:
Víctor Déniz 2021-05-01 13:42:48 +01:00 • committed by Eloy Lafuente (stronk7)
commit 2f2f1e6798
3 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
grade/grading/form/guide/classes/grades/grader/gradingpanel/external/fetch.php vendored
View file

@ -156,6 +156,9 @@ class fetch extends external_api {
$hasgrade = $gradeitem->user_has_grade($gradeduser); $hasgrade = $gradeitem->user_has_grade($gradeduser);
$grade = $gradeitem->get_grade_for_user($gradeduser, $USER); $grade = $gradeitem->get_grade_for_user($gradeduser, $USER);
$instance = $gradeitem->get_advanced_grading_instance($USER, $grade); $instance = $gradeitem->get_advanced_grading_instance($USER, $grade);
if (!$instance) {
throw new moodle_exception('error:gradingunavailable', 'grading');
}
$controller = $instance->get_controller(); $controller = $instance->get_controller();
$definition = $controller->get_definition(); $definition = $controller->get_definition();
$fillings = $instance->get_guide_filling(); $fillings = $instance->get_guide_filling();

4
grade/grading/form/rubric/classes/grades/grader/gradingpanel/external/fetch.php vendored
View file

@ -149,6 +149,10 @@ class fetch extends external_api {
$hasgrade = $gradeitem->user_has_grade($gradeduser); $hasgrade = $gradeitem->user_has_grade($gradeduser);
$grade = $gradeitem->get_grade_for_user($gradeduser, $USER); $grade = $gradeitem->get_grade_for_user($gradeduser, $USER);
$instance = $gradeitem->get_advanced_grading_instance($USER, $grade); $instance = $gradeitem->get_advanced_grading_instance($USER, $grade);
if (!$instance) {
throw new moodle_exception('error:gradingunavailable', 'grading');
}
$controller = $instance->get_controller(); $controller = $instance->get_controller();
$definition = $controller->get_definition(); $definition = $controller->get_definition();
$fillings = $instance->get_rubric_filling(); $fillings = $instance->get_rubric_filling();

1
lang/en/grading.php
View file

@ -95,3 +95,4 @@ $string['templatetypeown'] = 'Own form';
$string['templatetypeshared'] = 'Shared template'; $string['templatetypeshared'] = 'Shared template';
$string['templatesource'] = 'Location: {$a->component} ({$a->area})'; $string['templatesource'] = 'Location: {$a->component} ({$a->area})';
$string['error:notinrange'] = 'Invalid grade \'{$a->grade}\' provided. Grades must be between 0 and {$a->maxgrade}.'; $string['error:notinrange'] = 'Invalid grade \'{$a->grade}\' provided. Grades must be between 0 and {$a->maxgrade}.';
$string['error:gradingunavailable'] = 'The advanced grading method is not correctly set. Please check the whole forum grading options in the forum settings.';