From 3799627bf1581e78bfb4e8ff99c6f5ee1f524285 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 19 Aug 2021 21:50:52 +0200
Subject: [PATCH] rdv: twig layout and field formatting

---
 .../Resources/views/Calendar/list.html.twig   | 35 ++++++++++---------
 .../Resources/views/Calendar/show.html.twig   | 17 ++++++---
 .../translations/messages.fr.yml              |  4 ++-
 3 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
index c7ad42343..9c2b93811 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig
@@ -24,22 +24,25 @@
         <div class="item-bloc">
             <div class="item-row main">
                 <div class="item-col">
-                                        
-                    {% if calendar.startDate %}
-                        <h3>{{ calendar.startDate|format_datetime('long') }} </h3>
-                    {% endif %}
-                   
-                    {% if calendar.endDate %}
-                        <h3>{{ calendar.endDate|format_datetime('long') }}</h3>
-                    {% endif %}
-                    
 
-                    <div class="duration">
-                        <p>
-                            <i class="fa fa-fw fa-hourglass-end"></i>
-                            {{ calendar.endDate.diff(calendar.startDate)|date("%H:%M")}}
-                        </p>
-                    </div>
+
+                    {% if calendar.startDate and calendar.endDate %}
+                        {% if calendar.endDate.diff(calendar.startDate).days >= 1 %}
+                            <h3>{{ "From the day"|trans }} {{ calendar.startDate|format_datetime('medium', 'short') }} </h3>
+                            <h3>{{ "to the day"|trans }} {{ calendar.endDate|format_datetime('medium', 'short') }}</h3>
+                        {% else %}
+                            <h3>{{ calendar.startDate|format_date('full') }} </h3>
+                            <h3>{{ calendar.startDate|format_datetime('none', 'short', locale='fr') }} - {{ calendar.endDate|format_datetime('none', 'short', locale='fr') }}</h3>
+
+                            <div class="duration">
+                                <p>
+                                    <i class="fa fa-fw fa-hourglass-end"></i>
+                                    {{ calendar.endDate.diff(calendar.startDate)|date("%H:%M")}}
+                                </p>
+                            </div>
+                        {% endif %}
+
+                    {% endif %}
 
                     {% if context == 'user' and calendar.accompanyingPeriod is not empty %}
                       <div class="accompanyingPeriodLink" style="margin-top: 1rem">
@@ -66,7 +69,7 @@
                         
                         {% if calendar.mainUser is not empty %}
                         <li>
-                            <b>{{ 'main user concerned'|trans }}{{ calendar.mainUser.usernameCanonical }}</b>
+                            <b>{{ 'main user concerned'|trans }}: {{ calendar.mainUser.usernameCanonical }}</b>
                         </li>
                         {% endif %}
 
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
index f6df7ccdf..efab85442 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
@@ -11,11 +11,18 @@
 
 <h2 class="chill-red">{{ 'Calendar data'|trans }}</h2>
 
-    <dt class="inline">{{ 'start date'|trans }}</dt>
-    <dd>{{ entity.startDate|format_datetime('long') }}</dd>
-
-    <dt class="inline">{{ 'end date'|trans }}</dt>
-    <dd>{{ entity.endDate|format_datetime('long') }}</dd>
+    {% if entity.endDate.diff(entity.startDate).days >= 1 %}
+        <dt>{{ "From the day"|trans }} {{ entity.startDate|format_datetime('medium', 'short') }}
+        {{ "to the day"|trans }} {{ entity.endDate|format_datetime('medium', 'short') }}
+        </dt>
+        <dd></dd>
+    {% else %}
+        <dt>
+        {{ entity.startDate|format_date('full') }},
+        {{ entity.startDate|format_datetime('none', 'short', locale='fr') }} - {{ entity.endDate|format_datetime('none', 'short', locale='fr') }}
+        </dt>
+        <dd></dd>
+    {% endif %}
 
     <dt class="inline">{{ 'cancel reason'|trans }}</dt>
     <dd>
diff --git a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
index e111f3c12..f95b27cb8 100644
--- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
@@ -6,7 +6,7 @@ Are you sure you want to remove the calendar item?: Êtes-vous sûr de vouloir s
 Concerned groups: Parties concernées
 Calendar data: Données du rendez-vous
 Update calendar: Modifier le rendez-vous
-main user concerned: Utilisateur principal
+main user concerned: Utilisateur concerné
 Main user: Utilisateur principal
 Calendar item creation: Création du rendez-vous
 start date: début du rendez-vous
@@ -20,3 +20,5 @@ Cancel reason: Motif d'annulation
 Add a new calendar: Ajouter un nouveau rendez-vous
 "Success : calendar item updated!": "Rendez-vous mis à jour"
 The calendar item has been successfully removed.: Le rendez-vous a été supprimé
+From the day: Du
+to the day: au
\ No newline at end of file