MDL-15498: Completion: added idnumber to progress report table (if enabled)

diff --git a/course/report/progress/index.php b/course/report/progress/index.php
index a54c4e6930fa26d1a352c7a40466b1c26988b56d..b7a9bcbbcd851095854c19035093d7875d1a88a7 100644 (file)
--- a/course/report/progress/index.php
+++ b/course/report/progress/index.php
@@ -18,6 +18,9 @@ $format=optional_param('format','',PARAM_ALPHA);
 $excel=$format=='excelcsv';
 $csv=$format=='csv' || $excel;
 
+// Whether to show idnumber
+$idnumbers=$CFG->grade_report_showuseridnumber;
+
 function csv_quote($value) {
     global $excel;
     if($excel) {
@@ -112,6 +115,15 @@ if(!$csv) {
             get_string('lastname');
     }
     print '</th>';
+    
+    if($idnumbers) {
+        print '<th>'.get_string('idnumber').'</th>';        
+    }
+    
+} else {
+    if($idnumbers) {
+        print $sep;
+    }
 }
 
 // Activities
@@ -152,9 +164,15 @@ foreach($progress as $user) {
     // User name
     if($csv) {
         print csv_quote(fullname($user));
+        if($idnumbers) {
+            print $sep.csv_quote($user->idnumber);
+        }
     } else {
         print '<tr><th scope="row"><a href="'.$CFG->wwwroot.'/user/view.php?id='.
             $user->id.'&amp;course='.$course->id.'">'.fullname($user).'</a></th>';
+        if($idnumbers) {
+            print '<td>'.htmlspecialchars($user->idnumber).'</td>';
+        }
     }
 
     // Progress for each activity

diff --git a/lib/completionlib.php b/lib/completionlib.php
index 0e39b09581dd6383a5ff7e7681afbea80828e299..203f6d27a666ef31dba0128d386a671ffa86ab6c 100644 (file)
--- a/lib/completionlib.php
+++ b/lib/completionlib.php
@@ -569,7 +569,7 @@ class completion_info {
             $roles=array();
         }
         $users=get_role_users($roles,get_context_instance(CONTEXT_COURSE,$this->course->id),true,
-            'u.id,u.firstname,u.lastname',
+            'u.id,u.firstname,u.lastname,u.idnumber',
             $sortfirstname ? 'u.firstname ASC' : 'u.lastname ASC',true,$groupid);
         $users=$users ? $users : array(); // In case it returns false
         return $users;
@@ -588,7 +588,7 @@ class completion_info {
      * @param bool $sortfirstname If true, sort by first name, otherwise sort by
      *   last name
      * @param int $groupid Group ID or 0 (default)/false for all groups
-     * @return Array of user objects (like mdl_user id, firstname, lastname)
+     * @return Array of user objects (like mdl_user id, firstname, lastname, idnumber)
      *   containing an additional ->progress array of coursemoduleid => completionstate
      */
     public function get_progress_all($sortfirstname=false,$groupid=0) {