From 6b7ed390a873ee68f06e194b9e949e69f371ec2d Mon Sep 17 00:00:00 2001
From: Matteo Gheza <matteo.gheza07@gmail.com>
Date: Tue, 23 Jan 2024 00:15:44 +0100
Subject: [PATCH] Add surname to user info and sort users by surname in
 disponibili() method Telegram

---
 backend/app/Telegram/WebhookController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/backend/app/Telegram/WebhookController.php b/backend/app/Telegram/WebhookController.php
index 5948a00..9d729ee 100644
--- a/backend/app/Telegram/WebhookController.php
+++ b/backend/app/Telegram/WebhookController.php
@@ -144,6 +144,7 @@ class WebhookController extends
         $this->replyToUserChat(
             "ℹ️ Informazioni sul profilo:".
             "\n<i>Nome:</i> <b>".$user["name"]."</b>".
+            (!empty($user["surname"])&& !is_null($user["surname"]) ? "\n<i>Cognome:</i> <b>".$user["surname"]."</b>" : "").
             "\n<i>Disponibile:</i> ".($user["available"] ? "<b>SI</b>" : "<b>NO</b>").
             "\n<i>Caposquadra:</i> ".($user["chief"] === 1 ? "<b>SI</b>" : "<b>NO</b>").
             "\n<i>Autista:</i> ".($user["driver"] === 1 ? "<b>SI</b>" : "<b>NO</b>").
@@ -202,13 +203,14 @@ class WebhookController extends
           ->orderBy('trainings', 'desc')
           ->orderBy('availability_minutes', 'desc')
           ->orderBy('name', 'asc')
+          ->orderBy('surname', 'asc')
           ->get();
         if(count($users) == 0) {
             $text = "⚠️ Nessun vigile attualmente disponibile.";
         } else {
             $text = "👨‍🚒 Elenco dei vigili attualmente disponibili:";
             foreach ($users as $user) {
-                $text .= "\n- <i>".$user->name."</i>";
+                $text .= "\n- <i>".(!empty($user->surname)&&!is_null($user->surname) ? $user->surname : "")." ".$user->name."</i>";
                 if($user->chief) $text .= " CS";
                 if($user->driver) $text .= " 🚒";
             }