From b5166147fe68d8c195f610c7ec2e04cae4af8d4a Mon Sep 17 00:00:00 2001
From: dahoud <41957584+DahoudG@users.noreply.github.com>
Date: Thu, 16 Apr 2026 12:03:44 +0000
Subject: [PATCH] =?UTF-8?q?fix(org-liste):=20afficher=20la=20localisation?=
 =?UTF-8?q?=20r=C3=A9elle=20(ville,=20pays)=20au=20lieu=20d'un=20tiret?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

La colonne 'Localisation' dans le DataTable des organisations affichait un
tiret hardcodé (<span>—</span>) — placeholder jamais remplacé par les données.

Fix : affiche ville + pays depuis le DTO, triable par ville.
Si aucune donnée → tiret gris en fallback.
---
 .../pages/secure/organisation/liste.xhtml     | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/META-INF/resources/pages/secure/organisation/liste.xhtml b/src/main/resources/META-INF/resources/pages/secure/organisation/liste.xhtml
index d36a995..3a28ce6 100644
--- a/src/main/resources/META-INF/resources/pages/secure/organisation/liste.xhtml
+++ b/src/main/resources/META-INF/resources/pages/secure/organisation/liste.xhtml
@@ -195,11 +195,21 @@
                         </p:column>
 
                         <!-- Localisation -->
-                        <p:column headerText="Localisation" style="width: 13rem;">
-                            <div class="flex align-items-center text-500 text-sm">
-                                <i class="pi pi-map-marker text-400 mr-1"></i>
-                                <span>—</span>
-                            </div>
+                        <p:column headerText="Localisation" sortBy="#{org.ville}" style="width: 13rem;">
+                            <h:panelGroup rendered="#{not empty org.ville or not empty org.pays}">
+                                <div class="flex align-items-center text-sm">
+                                    <i class="pi pi-map-marker text-primary mr-1"></i>
+                                    <div>
+                                        <span class="text-900">#{org.ville}</span>
+                                        <h:panelGroup rendered="#{not empty org.pays}">
+                                            <span class="text-500">, #{org.pays}</span>
+                                        </h:panelGroup>
+                                    </div>
+                                </div>
+                            </h:panelGroup>
+                            <h:panelGroup rendered="#{empty org.ville and empty org.pays}">
+                                <span class="text-400 text-sm">—</span>
+                            </h:panelGroup>
                         </p:column>
 
                         <!-- Membres -->