From 0306af1a0c58943c680ce918ed189dcaaed1e295 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 3 Mar 2025 13:10:04 +0100
Subject: [PATCH] template adjustments + add missing translations

---
 .../Resources/views/Calendar/_list.html.twig  | 20 ++++++++-----------
 .../translations/messages.fr.yml              |  2 ++
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
index 167341c23..4023931e3 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
@@ -13,7 +13,7 @@
                                 <div class="wl-col title">
                                     <p class="date-label">
                                         {% if calendar.status == 'canceled' %}
-                                            <span class="badge bg-danger">{{ 'chill_calendar.canceled'|trans }}</span>
+                                            <span class="badge rounded-pill bg-danger">{{ 'chill_calendar.canceled'|trans }}</span>
                                             <del>
                                         {% endif %}
                                         {% if context == 'person' and calendar.context == 'accompanying_period' %}
@@ -73,8 +73,7 @@
                     </div>
                 </div>
 
-                {% if calendar.comment.comment is not empty
-                    or calendar.users|length > 0
+                {% if calendar.users|length > 0
                     or calendar.thirdParties|length > 0
                     or calendar.users|length > 0 %}
                     <div class="item-row details separator">
@@ -113,12 +112,13 @@
                     </div>
                 {% endif %}
 
-                <div class="item-row separator column">
-                    <div>
-
-                        {{ include('@ChillCalendar/Calendar/_documents.twig.html') }}
+                {% if calendar.documents is not empty %}
+                    <div class="item-row separator column">
+                        <div>
+                            {{ include('@ChillCalendar/Calendar/_documents.twig.html') }}
+                        </div>
                     </div>
-                </div>
+                {% endif %}
 
                 {% if calendar.activity is not null %}
                     <div class="item-row separator">
@@ -235,10 +235,6 @@
                                class="btn btn-remove">{{ 'cancel'|trans }}</a>
                         </li>
                         {% endif %}
-                        <li>
-                            <a href="{{ chill_path_add_return_path('chill_calendar_calendar_cancel', { 'id': calendar.id } ) }}"
-                               class="btn btn-delete">{{ 'cancel'|trans }}</a>
-                        </li>
                         {% if is_granted('CHILL_CALENDAR_CALENDAR_DELETE', calendar) %}
                         <li>
                             <a href="{{ chill_path_add_return_path('chill_calendar_calendar_delete', { 'id': calendar.id } ) }}"
diff --git a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
index 527fabb12..22069c063 100644
--- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
@@ -44,6 +44,8 @@ crud:
         title_edit: Modifier le motif d'annulation
 
 chill_calendar:
+    canceled: Annulé
+    cancel_reason: Raison d'annulation
     cancel_calendar_item: Annuler rendez-vous
     calendar_canceled: Le rendez-vous a été annulé
     Document: Document d'un rendez-vous