From 34af401a98cb9f41987ef2fd75d81ed59364ac29 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 29 Jun 2021 17:37:58 +0200
Subject: [PATCH] accompanying period: add items in the summary page

---
 .../views/AccompanyingPeriod/list.html.twig   | 59 ++++++++++++++-----
 .../translations/messages.fr.yml              |  3 +
 2 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig
index 0a237c2c9..4c9c89cce 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig
@@ -8,7 +8,6 @@
 
 <h1>{{ 'Accompanying period list'|trans }}</h1>
 
-
     {% for accompanying_period in accompanying_periods %}
     <div class="flex-table">
         <div class="item-bloc">
@@ -16,8 +15,25 @@
                 <div class="item-col">
                     {{'period'|trans}} <b>#{{ accompanying_period.id }}</b>
                     {% if accompanying_period.emergency %}
-                    <span class="badge badge-secondary">
-                        {{- 'Emergency'|trans -}}
+                    &nbsp;
+                    <span class="badge badge-primary">
+                        {{- 'Emergency'|trans|upper -}}
+                    </span>
+                    {% endif %}
+                    {% if accompanying_period.confidential %}
+                    &nbsp;
+                    <span class="badge badge-primary">
+                        {{- 'Confidential'|trans|upper -}}
+                    </span>
+                    {% endif %}
+                    {% if accompanying_period.step == 'DRAFT' %}
+                    &nbsp;
+                    <span class="badge badge-primary">
+                        {{- 'Draft'|trans|upper -}}
+                    </span>
+                    {% else %}
+                    <span class="badge badge-primary">
+                        {{- 'Confirmed'|trans|upper -}}
                     </span>
                     {% endif %}
                 </div>
@@ -51,8 +67,8 @@
 
                 {% endif %}
             </div>
-            <div class="item-row">
 
+                <div class="item-col">
                     <h3>{{ 'Participants'|trans }}</h3>
                     {% if accompanying_period.participations.count > 0 %}
                         {% for p in accompanying_period.participations %}
@@ -65,20 +81,31 @@
                     {% else %}
                         <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
                     {% endif %}
-            </div>
-            <div class="item-col">
-                <h3>{{ 'Requestor'|trans }}</h3>
-                {% if accompanying_period.requestorPerson is not null or accompanying_period.requestorThirdParty is not null %}
-                    {% if accompanying_period.requestorPerson is not null %}
-                    <p>{{ accompanying_period.requestorPerson.firstname ~ ' ' ~ accompanying_period.requestorPerson.lastname }}</p>
+                </div>
+                <div class="item-col">
+                    <h3>{{ 'Requestor'|trans }}</h3>
+                    {% if accompanying_period.requestorPerson is not null or accompanying_period.requestorThirdParty is not null %}
+                        {% if accompanying_period.requestorPerson is not null %}
+                        <p>{{ accompanying_period.requestorPerson.firstname ~ ' ' ~ accompanying_period.requestorPerson.lastname }}</p>
+                        {% endif %}
+                        {% if accompanying_period.requestorThirdParty is not null %}
+                        <p>{{ accompanying_period.requestorThirdParty.name }}</p>
+                        {% endif %}
+                    {% else %}
+                        <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
                     {% endif %}
-                    {% if accompanying_period.requestorThirdParty is not null %}
-                      <p>{{ accompanying_period.requestorThirdParty.name }}</p>
+                </div>
+
+                <div class="item-col">
+                    <h3>{{ 'Social issues'|trans }}</h3>
+                    {% if accompanying_period.socialIssues.count > 0 %}
+                        {% for si in accompanying_period.socialIssues %}
+                        <p>{{ si.title|localize_translatable_string }}</p>
+                        {% endfor %}
+                    {% else %}
+                        <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
                     {% endif %}
-                {% else %}
-                    <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
-                {% endif %}
-            </div>
+                </div>
 
             <div class="item-row">
                 <ul class="record_actions">
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 234eeb656..ec2fedd81 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -324,6 +324,9 @@ accompanying_period:
     dates_from_%opening_date%_to_%closing_date%: Ouvert du %opening_date% au %closing_date%
 occasional: ponctuel
 regular: régulier
+Confidential: confidentiel
+Draft: brouillon
+Confirmed: en file active
 
 # Accompanying Course
 Accompanying Course: Parcours d'accompagnement