From 4de1e57764aa8e0973473658e6fa1d59fd841afc Mon Sep 17 00:00:00 2001
From: florimondmanca <florimond.manca@fairness.coop>
Date: Mon, 12 Feb 2024 17:06:29 +0100
Subject: [PATCH] Remet le champ Commentaire dans FairCalendar

---
 .../Controller/FairCalendarController.ts      | 20 ++++++++++---------
 src/assets/lib/lazy/eventCalendar.js          | 14 +++++++++++--
 .../pages/faircalendar/_event_list.njk        |  4 +++-
 .../pages/faircalendar/events/_form.njk       | 11 +++++++---
 src/translations/fr-FR.ftl                    |  2 +-
 5 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/src/Infrastructure/FairCalendar/Controller/FairCalendarController.ts b/src/Infrastructure/FairCalendar/Controller/FairCalendarController.ts
index d4b53815..ce78f67b 100644
--- a/src/Infrastructure/FairCalendar/Controller/FairCalendarController.ts
+++ b/src/Infrastructure/FairCalendar/Controller/FairCalendarController.ts
@@ -87,21 +87,23 @@ export class FairCalendarController {
         })}`;
       }
 
+      const extendedProps: Record<string, any> = {
+        summary: event.summary
+      };
+
+      if (event.id) {
+        extendedProps.url = this.resolver.resolve('faircalendar_events_edit', {
+          id: event.id
+        });
+      }
+
       return {
         // See: https://fullcalendar.io/docs/event-object
         type: fcEventType,
         start: event.date,
         end: event.date,
         title,
-        ...(event.id
-          ? {
-              extendedProps: {
-                url: this.resolver.resolve('faircalendar_events_edit', {
-                  id: event.id
-                })
-              }
-            }
-          : {}),
+        extendedProps,
         textColor: `var(--event-${fcEventType}-text)`,
         backgroundColor: `var(--event-${fcEventType}-background)`,
         borderColor: `var(--event-${fcEventType}-border)`
diff --git a/src/assets/lib/lazy/eventCalendar.js b/src/assets/lib/lazy/eventCalendar.js
index 8d825297..992c3da0 100644
--- a/src/assets/lib/lazy/eventCalendar.js
+++ b/src/assets/lib/lazy/eventCalendar.js
@@ -29,12 +29,22 @@ export function createCalendar(target, date, events, goToEventCreate) {
         eventDurationEditable: false,
         // TODO: add testid on days
         eventContent: ({ event }) => {
-          const url = event.extendedProps.url;
+          const { url, summary } = event.extendedProps;
+
           if (url) {
             return {
-              html: `<a href="${url}">${event.title}</a>`
+              html: `<a href="${url}" ${
+                summary ? 'title="' + summary + '"' : ''
+              }>${event.title}</a>`
+            };
+          }
+
+          if (summary) {
+            return {
+              html: `<span title="${summary}">${event.title}</span>`
             };
           }
+
           return event.title;
         },
         dateClick: ({ event, date }) => {
diff --git a/src/templates/pages/faircalendar/_event_list.njk b/src/templates/pages/faircalendar/_event_list.njk
index 3ab4f1dc..07d57e16 100644
--- a/src/templates/pages/faircalendar/_event_list.njk
+++ b/src/templates/pages/faircalendar/_event_list.njk
@@ -39,9 +39,11 @@
                                     {% for event in dayEvents %}
                                         <li class="ec-event" style="background-color: {{ event.backgroundColor }}; color: {{ event.textColor }}; border: 1px solid {{ event.borderColor }};">
                                             {% if event.extendedProps.url %}
-                                                <a href="{{ event.extendedProps.url }}">
+                                                <a href="{{ event.extendedProps.url }}" {% if event.extendedProps.summary %}title="{{ event.extendedProps.summary }}"{% endif %}>
                                                     {{ event.title }}
                                                 </a>
+                                            {% elseif event.extendedProps.summary %}
+                                                <span title="{{ event.extendedProps.summary }}">{{ event.title }}</span>
                                             {% else %}
                                                 {{ event.title }}
                                             {% endif %}
diff --git a/src/templates/pages/faircalendar/events/_form.njk b/src/templates/pages/faircalendar/events/_form.njk
index 938e0920..552c5ab0 100644
--- a/src/templates/pages/faircalendar/events/_form.njk
+++ b/src/templates/pages/faircalendar/events/_form.njk
@@ -2,7 +2,7 @@
 {% import 'macros/icons.njk' as icons %}
 {% from 'macros/attr.njk' import render_attr %}
 
-{% macro event_form(event, types, projects, tasks, times, startDate, endDate, attr=null) %}
+{% macro event_form(event, types, projects, tasks, times, startDate=null, endDate=null, attr=null) %}
 
 {% set isNotMission = event and event.type != 'mission' %}
 
@@ -48,8 +48,13 @@
             </div>
         </div>
 
-        <input type="hidden" name="startDate" value="{{ startDate }}T00:00:00">
-        <input type="hidden" name="endDate" value="{{ endDate }}T00:00:00">
+        <div class="pc-input-group">
+            <label for="summary" class="pc-label">{{ 'faircalendar-summary-title'|trans }}</label>
+            <input name="summary" id="summary" {% if event %}value="{{ event.summary }}"{% endif %}>
+        </div>
+
+        {% if startDate %}<input type="hidden" name="startDate" value="{{ startDate }}T00:00:00">{% endif %}
+        {% if endDate %}<input type="hidden" name="endDate" value="{{ endDate }}T00:00:00">{% endif %}
 
         {{ buttons.save(attr={type: 'submit'}) }}
     </form>
diff --git a/src/translations/fr-FR.ftl b/src/translations/fr-FR.ftl
index 5f177464..e47940ff 100644
--- a/src/translations/fr-FR.ftl
+++ b/src/translations/fr-FR.ftl
@@ -64,6 +64,7 @@ faircalendar-type-option = {$type ->
 faircalendar-taskId-title = Mission
 faircalendar-projectId-title = Projet
 faircalendar-time-title = Temps passé
+faircalendar-summary-title = Commentaire
 faircalendar-filters-month-title = Mois
 faircalendar-filters-year-title = Année
 faircalendar-filters-userId-title = Coopérateur·ice - salarié·e
@@ -107,7 +108,6 @@ profile-password = Mot de passe
 
 people-title = FairRH
 
-
 leaves-title = Congés
 leaves-user = Coopérateur·ice - salarié·e
 leaves-period = Période