From 643028ffd6fbff243507833837f3d2a9f4ac7a9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 3 Jun 2024 11:13:49 +0200
Subject: [PATCH] Update styles and markup for badges and ticket events

Updated the SCSS for badge components, including the introduction of a margin and specific font-weight for user-group badges. Additionally, changes have been made to the TicketApp store to comment out a specific condition. A few updates were made to the twig files in the ChillTicketBundle and ChillMainBundle to reflect these style changes.
---
 .../Resources/views/Entity/user_group.html.twig            | 2 +-
 .../Resources/public/chill/scss/badge.scss                 | 7 +++++++
 .../public/vuejs/TicketApp/store/modules/ticket.ts         | 3 ++-
 .../src/Resources/views/Ticket/list.html.twig              | 6 ++++--
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/user_group.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/user_group.html.twig
index 8504a88dd..cb6c3be40 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/user_group.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/user_group.html.twig
@@ -1 +1 @@
-<span class="badge" style="color: {{ user_group.foregroundColor }}; background-color: {{  user_group.backgroundColor }};">{{ user_group.label|localize_translatable_string }}</span>
+<span class="badge-user-group" style="color: {{ user_group.foregroundColor }}; background-color: {{  user_group.backgroundColor }};">{{ user_group.label|localize_translatable_string }}</span>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
index 072f13949..407a17f6d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
@@ -3,8 +3,11 @@
 */
 
 span.badge-user,
+span.badge-user-group,
 span.badge-person,
 span.badge-thirdparty {
+    margin-top: 0.2rem;
+    margin-bottom: 0.2rem;
     display: inline-block;
     padding: 0 0.5em !important;
     background-color: $white;
@@ -18,6 +21,10 @@ span.badge-thirdparty {
     }
 }
 
+span.badge-user-group {
+    font-weight: 600;
+}
+
 span.badge-user {
     border-bottom-width: 1px;
     &.system {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
index 430c7b320..2e1c53d42 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
@@ -47,10 +47,11 @@ export const moduleTicket: Module<State, RootState> = {
                     if (!result[datetime]) {
                         result[datetime] = [];
                     }
-
+                    /*
                     if (item.event_type === "add_addressee") {
                         result[datetime].push(item);
                     }
+                     */
                     return result;
                 },
                 {} as any
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig
index 6d25c5834..b4e58ca00 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig
@@ -66,9 +66,11 @@
                                         <div class="wl-col list">
                                             {% for d in ticket.currentAddressee %}
                                                 {% if d.isUser is defined and d.isUser %}
-                                                    {{ d|chill_entity_render_box }}
+                                                    <span class="badge-user">
+                                                        {{ d|chill_entity_render_box }}
+                                                    </span>
                                                 {% elseif d.isUserGroup is defined and d.isUserGroup %}
-                                                    {{ d|chill_entity_render_box }}
+                                                    {{ d|chill_entity_render_box() }}
                                                 {% endif %}
                                             {% endfor %}
                                         </div>