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

Merge branch 'MDL-46861_27_STABLE' of https://github.com/Lightwork-Marking/moodle into MOODLE_27_STABLE

Browse Source
This commit is contained in:
Marina Glancy
2014-09-01 16:07:05 +08:00
parent c8782c56d7 62ff078fcf
commit ecd01922e9
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/classes/grading_external.php
+1
View File
@@ -101,6 +101,7 @@ class core_grading_external extends external_api {
$area['cmid'] = $cmid;
$area['contextid'] = $context->id;
$area['component'] = $componentname;
$area['areaname'] = $params['areaname'];
$area['activemethod'] = $gradingmanager->get_active_method();
$area['definitions'] = array();
lib/tests/grading_externallib_test.php
+5 -3
View File
@@ -141,6 +141,7 @@ class core_grading_externallib_testcase extends externallib_advanced_testcase {
$cmids = array ($cm->cmid);
$areaname = 'submissions';
$result = core_grading_external::get_definitions($cmids, $areaname);
$result = external_api::clean_returnvalue(core_grading_external::get_definitions_returns(), $result);
$this->assertEquals(1, count($result['areas']));
$this->assertEquals(1, count($result['areas'][0]['definitions']));
@@ -285,6 +286,7 @@ class core_grading_externallib_testcase extends externallib_advanced_testcase {
// Call the external function.
$result = core_grading_external::get_gradingform_instances($definitionid, 0);
$result = external_api::clean_returnvalue(core_grading_external::get_gradingform_instances_returns(), $result);
$this->assertEquals(1, count($result['instances']));
$this->assertEquals($USER->id, $result['instances'][0]['raterid']);
@@ -294,8 +296,8 @@ class core_grading_externallib_testcase extends externallib_advanced_testcase {
$this->assertEquals(1, count($result['instances'][0]['rubric']));
$this->assertEquals(1, count($result['instances'][0]['rubric']['criteria']));
$criteria = $result['instances'][0]['rubric']['criteria'];
$this->assertEquals($criterionid, $criteria[$criterionid]['criterionid']);
$this->assertEquals($levelid, $criteria[$criterionid]['levelid']);
$this->assertEquals('excellent work', $criteria[$criterionid]['remark']);
$this->assertEquals($criterionid, $criteria[0]['criterionid']);
$this->assertEquals($levelid, $criteria[0]['levelid']);
$this->assertEquals('excellent work', $criteria[0]['remark']);
}
}