Merge pull request #562 from armccoy/fix/breakout-human-names

Display user first/last name in breakout room participants selector
ncstate-delta · Jan 19, 2024 · 090eb08 · 090eb08
2 parents 54313db + 3a362ff
commit 090eb08
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/mod_form.php b/mod_form.php
@@ -422,7 +422,10 @@ public function definition() {
         // Getting Course participants.
         $courseparticipants = [];
         foreach ($participants as $participant) {
-            $courseparticipants[] = ['participantid' => $participant->id, 'participantemail' => $participant->email];
+            $courseparticipants[] = [
+                'participantid' => $participant->id,
+                'participantname' => fullname($participant) . ' <' . $participant->email . '>',
+            ];
         }
 
         // Getting Course groups.

diff --git a/templates/breakoutrooms_room_data.mustache b/templates/breakoutrooms_room_data.mustache
@@ -30,7 +30,7 @@
         "courseparticipants": [
             {
                 "participantid": "2",
-                "participantemail": "[email protected]",
+                "participantname": "John Doe",
                 "selected": true
             }
         ],

diff --git a/templates/breakoutrooms_room_datatoclone.mustache b/templates/breakoutrooms_room_datatoclone.mustache
@@ -30,7 +30,7 @@
         "courseparticipants": [
             {
                 "participantid": "2",
-                "participantemail": "[email protected]",
+                "participantname": "John Doe",
                 "selected": true
             }
         ],

diff --git a/templates/breakoutrooms_room_participants.mustache b/templates/breakoutrooms_room_participants.mustache
@@ -29,7 +29,7 @@
         "courseparticipants": [
             {
                 "participantid": "2",
-                "participantemail": "[email protected]",
+                "participantname": "John Doe",
                 "selected": true
             }
         ]
@@ -39,7 +39,7 @@
     <div class="card-body">
         <select id="participants-{{roomid}}" class="room-participants" name="{{toclone}}roomsparticipants[{{roomid}}][]" multiple>
             {{#courseparticipants}}
-            <option value="{{participantid}}" {{#selected}}selected{{/selected}}>{{participantemail}}</option>
+            <option value="{{participantid}}" {{#selected}}selected{{/selected}}>{{participantname}}</option>
             {{/courseparticipants}}
         </select>
     </div>

diff --git a/templates/breakoutrooms_rooms.mustache b/templates/breakoutrooms_rooms.mustache
@@ -33,7 +33,7 @@
                 "courseparticipants": [
                     {
                         "participantid": "2",
-                        "participantemail": "[email protected]",
+                        "participantname": "John Doe",
                         "selected": true
                     }
                 ],
@@ -52,7 +52,7 @@
                 "courseparticipants": [
                     {
                         "participantid": "2",
-                        "participantemail": "[email protected]"
+                        "participantname": "John Doe"
                     }
                 ],
                 "coursegroups": [