diff --git a/classes/lib.php b/classes/lib.php index ec31776..6b1612c 100644 --- a/classes/lib.php +++ b/classes/lib.php @@ -886,6 +886,18 @@ public static function exportall($filename, $submissions) { if ($isturnitin) { $myxls->write_string(1, $i++, get_string('turnitin', 'report_assign')); } + $hasworflow = array_reduce($submissions, function($c, $it) { + return $c || $it->workflow !== '-'; + }, false); + $hasmarker = array_reduce($submissions, function($c, $it) { + return $c || $it->marker !== '-'; + }, false); + if($hasworflow) { + $myxls->write_string(1, $i++, get_string('workflow', 'report_assign')); + } + if($hasmarker) { + $myxls->write_string(1, $i++, get_string('allocatedmarker', 'report_assign')); + } $myxls->write_string(1, $i++, get_string('allocatedmarker', 'report_assign')); $myxls->write_string(1, $i++, get_string('modified')); $myxls->write_string(1, $i++, get_string('duedate', 'report_assign')); @@ -915,6 +927,12 @@ public static function exportall($filename, $submissions) { if ($isturnitin) { $myxls->write_string($row, $i++, isset($s->turnitin->similarityscore) ? $s->turnitin->similarityscore : '-'); } + if($hasworflow) { + $myxls->write_string($row, $i++, $s->workflow); + } + if($hasmarker) { + $myxls->write_string($row, $i++, $s->marker); + } $myxls->write_string($row, $i++, isset($s->grader) ? $s->grader : '-'); $myxls->write_string($row, $i++, $s->modified); $myxls->write_string($row, $i++, $s->duedate);