Merge branch 'MDL-58613-31-workshopfullname' of git://github.com/mudrd8mz/moodle into MOODLE_31_STABLE

This commit is contained in:
Jake Dallimore
2017-04-21 10:27:56 +08:00
+8 -7
View File
@@ -164,13 +164,14 @@ class workshop_random_allocator implements workshop_allocator {
// by reviewer
$result->log(get_string('numofdeallocatedassessment', 'workshopallocation_random', count($delassessments)), 'info');
foreach ($delassessments as $delassessmentkey => $delassessmentid) {
$a = new stdclass();
$a->authorname = fullname((object)array(
'lastname' => $assessments[$delassessmentid]->authorlastname,
'firstname' => $assessments[$delassessmentid]->authorfirstname));
$a->reviewername = fullname((object)array(
'lastname' => $assessments[$delassessmentid]->reviewerlastname,
'firstname' => $assessments[$delassessmentid]->reviewerfirstname));
$author = (object) [];
$reviewer = (object) [];
username_load_fields_from_object($author, $assessments[$delassessmentid], 'author');
username_load_fields_from_object($reviewer, $assessments[$delassessmentid], 'reviewer');
$a = [
'authorname' => fullname($author),
'reviewername' => fullname($reviewer),
];
if (!is_null($assessments[$delassessmentid]->grade)) {
$result->log(get_string('allocationdeallocategraded', 'workshopallocation_random', $a), 'error', 1);
unset($delassessments[$delassessmentkey]);