Merge pull request #274 from catalyst/add-username-column

Add username column

Author: Peterburnett

attendees.php

@@ -55,7 +55,18 @@
 
 // Load attendees.
 $attendees = facetoface_get_attendees($session->id);
-
+// Preload user records for attendees (single query to avoid N+1).
+$users = [];
+if (!empty($attendees)) {
+    $userids = array_map(function ($a) {
+        return $a->id;
+    }, $attendees);
+    $userids = array_unique($userids);
+    if (!empty($userids)) {
+        // Fetch only the fields we need (id and username).
+        $users = $DB->get_records_list('user', 'id', $userids, '', 'id, username');
+    }
+}
 // Load cancellations.
 $cancellations = facetoface_get_cancellations($session->id);
 
@@ -246,7 +257,14 @@
         $table = new html_table();
         $table->head = [get_string('name')];
         $table->align = ['left'];
-        $table->size = ['100%'];
+        $table->size = ['70%'];
+
+        $showusername = facetoface_should_attendees_show_usernames();
+        if ($showusername) {
+            $table->head[] = get_string('username');
+            $table->align[] = 'left';
+            $table->size[] = '30%';
+        }
 
         if ($takeattendance) {
             $table->head[] = get_string('currentstatus', 'facetoface');
@@ -270,8 +288,16 @@
         foreach ($attendees as $attendee) {
             $data = [];
             $attendeeurl = new moodle_url('/user/view.php', ['id' => $attendee->id, 'course' => $course->id]);
+            // Show name.
             $data[] = html_writer::link($attendeeurl, format_string(fullname($attendee)));
 
+            // Show username.
+            if ($showusername) {
+                $user = $users[$attendee->id] ?? null;
+                $username = $user ? $user->username : '';
+                $data[] = format_string($username);
+            }
+
             if ($takeattendance) {
                 // Show current status.
                 $data[] = get_string('status_' . facetoface_get_status($attendee->statuscode), 'facetoface');

lang/en/facetoface.php

@@ -420,6 +420,8 @@
 $string['setting:addchangemanageremaildefault'] = 'Ask users for their manager\'s email address.';
 $string['setting:attendeesexportfields'] = 'Select the fields to be included in a session\'s exported list of attendees. This will be in addition to the attendee\'s first and last name.';
 $string['setting:attendeesexportfields_caption'] = 'Attendees export fields';
+$string['setting:attendeesshowusernames'] = 'If enabled, attendee usernames will appear alongside full names in the table, provided the necessary identity settings are properly configured.';
+$string['setting:attendeesshowusernames_caption'] = 'Show usernames in attendees table.';
 $string['setting:cancelrestriction'] = 'Minimum time before a session that students can cancel their booking. Within this period, cancellations are not allowed.';
 $string['setting:cancelrestriction_caption'] = 'Cancellation restriction';
 $string['setting:defaultcancellationinstrmngr'] = 'Default cancellation message sent to managers.';

lib.php

@@ -1430,6 +1430,7 @@ function facetoface_download_attendees($facetofacename, $session, $attendees, $f
     $timenow = time();
     $timeformat = str_replace(' ', '_', get_string('strftimedate', 'langconfig'));
     $downloadfilename = clean_filename($facetofacename . '_' . userdate($timenow, $timeformat));
+    $showusername = facetoface_should_attendees_show_usernames();
 
     $dateformat = 0;
     if ('ods' === $format) {
@@ -1486,6 +1487,10 @@ function facetoface_download_attendees($facetofacename, $session, $attendees, $f
         }
         $worksheet->write_string($row, $column++, $fieldname, ['bold' => 1, 'border' => 1]);
     }
+    // Username.
+    if ($showusername) {
+        $worksheet->write_string($row, $column++, get_string('username'), ['bold' => 1, 'border' => 1]);
+    }
     // Current status.
     $worksheet->write_string($row, $column++, get_string('currentstatus', 'facetoface'), ['bold' => 1, 'border' => 1]);
 
@@ -1565,6 +1570,9 @@ function facetoface_download_attendees($facetofacename, $session, $attendees, $f
                 $worksheet->write_string($row, $column++, $data, $format);
             }
         }
+        if ($showusername) {
+            $worksheet->write_string($row, $column++, $user->username, ['border' => 1, 'v_align' => 'top']);
+        }
         $worksheet->write_string(
             $row,
             $column++,
@@ -4757,6 +4765,21 @@ function facetoface_enrol_user($context, $courseid, $userid): bool {
     return true;
 }
 
+/**
+ * Check if usernames should be shown in the attendees table.
+ *
+ * @return bool true if usernames can be displayed, false otherwise
+ */
+function facetoface_should_attendees_show_usernames(): bool {
+    global $CFG;
+
+    $protectusernames = $CFG->protectusernames;
+    $attendeesshowusernames = get_config('facetoface', 'attendeesshowusernames');
+    $showidentity = !empty($CFG->showuseridentity) && in_array('username', explode(',', $CFG->showuseridentity));
+
+    return $attendeesshowusernames && $showidentity && !$protectusernames;
+}
+
 /**
  * Facetoface assignment candidates
  *

settings.php

@@ -101,6 +101,13 @@
     0
 ));
 
+$settings->add(new admin_setting_configcheckbox(
+    'facetoface/attendeesshowusernames',
+    get_string('setting:attendeesshowusernames_caption', 'mod_facetoface'),
+    get_string('setting:attendeesshowusernames', 'mod_facetoface'),
+    0
+));
+
 $settings->add(new admin_setting_heading(
     'facetoface/manageremail_header',
     get_string('manageremailheading', 'facetoface'),

version.php

@@ -31,8 +31,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2025112400;
-$plugin->release   = 2025112400;
+$plugin->version   = 2025112600;
+$plugin->release   = 2025112600;
 $plugin->requires  = 2023100900;  // Requires 4.3.
 $plugin->component = 'mod_facetoface';
 $plugin->maturity  = MATURITY_STABLE;