From: moodler Date: Tue, 18 May 2004 13:31:37 +0000 (+0000) Subject: Use fullname() functions for quiz reports X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=ffdd209ad222cccd4b50a716dc0ad1712384c3b9;p=moodle.git Use fullname() functions for quiz reports --- diff --git a/mod/quiz/report/fullstat/report.php b/mod/quiz/report/fullstat/report.php index f46b13ed67..192c313c7f 100755 --- a/mod/quiz/report/fullstat/report.php +++ b/mod/quiz/report/fullstat/report.php @@ -93,7 +93,7 @@ class quiz_report extends quiz_default_report { foreach($user_resps as $thiskey => $thisresp){ $userdata[$thisresp->userid][$thisresp->attemptno]['response'][$thisresp->question]=$thisresp->answer; $userdata[$thisresp->userid][$thisresp->attemptno]['grade']=$thisresp->sumgrades; - $userdata[$thisresp->userid][$thisresp->attemptno]['name']=$thisresp->lastname . ", " . $thisresp->firstname; + $userdata[$thisresp->userid][$thisresp->attemptno]['name']=fullname($thisresp); $userdata[$thisresp->userid][$thisresp->attemptno]['attemptid']=$thisresp->aid; } if($debug and !$download){ diff --git a/mod/quiz/report/overview/report.php b/mod/quiz/report/overview/report.php index aaa9b64f50..1250d0f8e1 100644 --- a/mod/quiz/report/overview/report.php +++ b/mod/quiz/report/overview/report.php @@ -102,7 +102,7 @@ class quiz_report extends quiz_default_report { $table->data[] = array ($picture, "wwwroot/user/view.php?id=$grade->userid&course=$course->id\">". - "$grade->firstname $grade->lastname", + fullname($grade).'', "$userattempts", round($grade->grade,0)); } diff --git a/mod/quiz/report/simplestat/report.php b/mod/quiz/report/simplestat/report.php index c1edd3522a..5b4ce5f55d 100644 --- a/mod/quiz/report/simplestat/report.php +++ b/mod/quiz/report/simplestat/report.php @@ -116,7 +116,7 @@ class quiz_report extends quiz_default_report { $row=1; foreach ($data as $userid => $datum) { - $myxls->write_string($row,0,"$datum->firstname $datum->lastname"); + $myxls->write_string($row,0,fullname($datum)); for ($i=1; $i<=$count; $i++) { if (isset($datum->grades[$i])) { $myxls->write_number($row,$i,$datum->grades[$i]); @@ -170,7 +170,7 @@ class quiz_report extends quiz_default_report { /// Print all the user data foreach ($data as $userid => $datum) { - echo "$datum->firstname $datum->lastname"; + echo fullname($datum); for ($i=1; $i<=$count; $i++) { echo "\t"; if (isset($datum->grades[$i])) { @@ -217,7 +217,7 @@ class quiz_report extends quiz_default_report { foreach ($data as $userid => $datum) { echo ""; - echo "$datum->firstname $datum->lastname"; + echo "".fullname($datum).""; if ($datum->grades) { foreach ($datum->grades as $key => $grade) { if (isset($grade)) {