mirror of
https://github.com/moodle/moodle.git
synced 2025-04-20 16:04:25 +02:00
Merge branch 'MDL-58613-master-workshopfullname' of git://github.com/mudrd8mz/moodle
This commit is contained in:
commit
dd9c469ffc
@ -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]);
|
||||
|
Loading…
x
Reference in New Issue
Block a user