Use fullname() functions for quiz reports

diff --git a/mod/quiz/report/fullstat/report.php b/mod/quiz/report/fullstat/report.php
index f46b13ed67e76b278d589eca991b8292eb2dd337..192c313c7f1bb7a9eebfee56c512c5ee672c476c 100755 (executable)
--- 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 aaa9b64f506c644ad9bda5c9e75a807066775841..1250d0f8e133af9795eabc5e79a95794069da805 100644 (file)
--- 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, 
                                     "<a href=\"$CFG->wwwroot/user/view.php?id=$grade->userid&course=$course->id\">".
-                                    "$grade->firstname $grade->lastname</a>", 
+                                    fullname($grade).'</a>', 
                                     "$userattempts", round($grade->grade,0));
         }
 

diff --git a/mod/quiz/report/simplestat/report.php b/mod/quiz/report/simplestat/report.php
index c1edd3522a6e7022bfc89662c10e60bb5edc64ac..5b4ce5f55def2eb1fbba08eb31a22ddc41b1f295 100644 (file)
--- 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 "<tr>";
-            echo "<td><b>$datum->firstname $datum->lastname</b></td>";
+            echo "<td><b>".fullname($datum)."</b></td>";
             if ($datum->grades) {
                 foreach ($datum->grades as $key => $grade) {
                     if (isset($grade)) {