From ad72904aa9af471d6608e895367e9f87932c1722 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 27 Sep 2021 15:12:50 +0200
Subject: [PATCH] resume accourse: simplify alerts with simple link to edit
 page

---
 .../_join_household.html.twig                 | 49 ++++---------
 .../AccompanyingCourse/_still_draft.html.twig | 16 +++++
 .../_warning_address.html.twig                | 70 +++++--------------
 .../views/AccompanyingCourse/index.html.twig  | 38 ++++------
 .../translations/messages.fr.yml              |  2 +-
 5 files changed, 59 insertions(+), 116 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_still_draft.html.twig

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig
index c57d12f1e..7ef2de466 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig
@@ -1,41 +1,16 @@
-<div class="border border-warning">
-    <div class="alert alert-warning alert-with-actions mb-0">
-        <div class="message">
-            {{ 'Some peoples does not belong to any household currently. Add them to an household soon'|trans }}
-        </div>
-        <ul class="record_actions">
-            <li>
-                <button class="btn btn-chill-beige" data-bs-toggle="collapse" href="#withoutHouseholdList">
-                    <i class="fa fa-fw fa-caret-down"></i><span class="">{{ 'Add to household now'|trans }}</span>
-                </button>
-            </li>
-        </ul>
-    </div>
-
-    <div id="withoutHouseholdList" class="collapse p-3">
-        <form method="GET"
-              action="{{ path('chill_person_household_members_editor') }}">
-
-            <h3>{{ 'household.Select people to move'|trans }}</h3>
-            <ul>
-                {% for p in withoutHousehold %}
-                    <li>
-                        <input type="checkbox" name="persons[]" value="{{ p.id }}" checked />
-                        {{ p|chill_entity_render_box }}
-                    </li>
-                {% endfor %}
-            </ul>
-
-            <input type="hidden" name="expand_suggestions" value="true" />
-            <input type="hidden" name="returnPath" value="{{ app.request.requestUri|escape('html_attr') }}" />
-            <input type="hidden" name="accompanying_period_id" value="{{ accompanyingCourse.id }}" />
-            <ul class="record_actions mb-0">
+<div class="alert alert-warning alert-with-actions">
+    <div class="float-button bottom"><div class="box">
+        <div class="action">
+            <ul class="record_actions">
                 <li>
-                    <button type="submit" class="btn btn-edit">
-                        {{ 'household.Household editor'|trans }}
-                    </button>
+                    <a class="btn btn-sm btn-update change-icon"
+                       href="{{ path('chill_person_accompanying_course_edit', { 'accompanying_period_id': accompanyingCourse.id, '_fragment': 'section-10' }) }}">
+                        <i class="fa fa-fw fa-crosshairs"></i>
+                        Corriger
+                    </a>
                 </li>
             </ul>
-        </form>
-    </div>
+        </div>
+        {{ 'Some peoples does not belong to any household currently. Add them to an household soon'|trans }}
+    </div></div>
 </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_still_draft.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_still_draft.html.twig
new file mode 100644
index 000000000..8e843e284
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_still_draft.html.twig
@@ -0,0 +1,16 @@
+<div class="alert alert-warning">
+    <div class="float-button bottom"><div class="box">
+            <div class="action">
+                <ul class="record_actions">
+                    <li>
+                        <a class="btn btn-sm btn-update change-icon"
+                           href="{{ path('chill_person_accompanying_course_edit', { 'accompanying_period_id': accompanyingCourse.id, '_fragment': 'section-100' } ) }}">
+                            <i class="fa fa-fw fa-crosshairs"></i>
+                            {{ 'Edit & activate accompanying course'|trans }}
+                        </a>
+                    </li>
+                </ul>
+            </div>
+            <p>{{ 'This accompanying course is still a draft'|trans }}</p>
+        </div></div>
+</div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_warning_address.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_warning_address.html.twig
index 490a91b59..f04a8a376 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_warning_address.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_warning_address.html.twig
@@ -1,61 +1,23 @@
 {%- set countPersonLocation = accompanyingCourse.availablePersonLocation|length -%}
-{%- set hasPersonLocation = countPersonLocation|length > 0 -%}
-{% macro quickLocationForm(accompanyingCourse, person, whichButton) %}
-    <form method="PATCH" action="{{ path('chill_api_single_accompanying_course__entity', {'id': accompanyingCourse.id, '_format': 'json'}) }}" class="quickLocationForm">
-        <input type="hidden" name="personLocation" value="{{ person.id }}" />
-        <input type="hidden" name="periodId" value="{{ accompanyingCourse.id }}" />
-        {% if whichButton == 'string' %}
-        <button type="submit" class="btn btn-chill-pink">
-            <span class="text-light">{{ 'Locate by'|trans }} {{ person|chill_entity_render_string }}</span>
-        </button>
-        {% elseif whichButton == 'icon' %}
-            <button type="submit" class="btn btn-sm btn-secondary">
-                <i class="fa fa-map-marker"></i>
-            </button>
-        {% endif %}
-    </form>
-{% endmacro %}
-<div class="border border-danger">
-    <div class="alert alert-danger {% if hasPersonLocation %}alert-with-actions{% endif %} mb-0">
-        <div class="message">
-            {{ 'This course is located at a temporarily address. You should locate this course to an user'|trans }}
-            {% if not hasPersonLocation %}
-            {{ 'Associate at least one member with an household, and set an address to this household'|trans }}
-            {% endif %}
-        </div>
-
-        {% if 1 == countPersonLocation %}
+{%- set hasPersonLocation = countPersonLocation > 0 -%}
+<div class="alert alert-danger {% if hasPersonLocation %}alert-with-actions{% endif %}">
+    <div class="float-button bottom"><div class="box">
+        <div class="action">
             <ul class="record_actions">
                 <li>
-                    {{ _self.quickLocationForm(accompanyingCourse, accompanyingCourse.availablePersonLocation.first, 'string') }}
+                    <a class="btn btn-sm btn-update change-icon"
+                       href="{{ path('chill_person_accompanying_course_edit', { 'accompanying_period_id': accompanyingCourse.id, '_fragment': 'section-20' }) }}">
+                        <i class="fa fa-fw fa-crosshairs"></i>
+                        Corriger
+                    </a>
                 </li>
             </ul>
-        {% elseif 1 < countPersonLocation %}
-            <ul class="record_actions">
-                <li>
-                    <button class="btn btn-chill-pink" data-bs-toggle="collapse" href="#locateAtPerson">
-                        <i class="fa fa-fw fa-caret-down"></i><span class="text-light">{{ 'Choose a person to locate by'|trans }}</span>
-                    </button>
-                </li>
-            </ul>
-        {% endif %}
-    </div>
-
-    {% if 1 < countPersonLocation %}
-        <div id="locateAtPerson" class="collapse">
-               <p>{{ 'Locate by'|trans }}:</p>
-
-               <div class="flex-table mb-3">
-                   {% for p in accompanyingCourse.availablePersonLocation %}
-                       <div class="item-bloc">
-                         {{ p|chill_entity_render_box({
-                          'render': 'bloc', 'addLink': false, 'addInfo': true, 'addAltNames': false, 'customButtons': {
-                                 'replace': _self.quickLocationForm(accompanyingCourse, p, 'icon')
-                             }
-                         }) }}
-                       </div>
-                   {% endfor %}
-               </div>
         </div>
-    {% endif %}
+            <p>
+        {{ 'This course is located at a temporarily address. You should locate this course to an user'|trans }}</p>
+        {% if not hasPersonLocation %}
+            <p>
+            {{ 'Associate at least one member with an household, and set an address to this household'|trans }}</p>
+        {% endif %}
+    </div></div>
 </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index be66abe73..a063fbb34 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -23,20 +23,22 @@
 {% block content %}
 <div class="accompanyingcourse-resume">
 
-    {% if 'DRAFT' == accompanyingCourse.step %}
-        <div class="alert alert-danger flash_message mb-5">
-            <span>
-                {{ 'This accompanying course is still a draft'|trans }}
-                <a href="{{ path('chill_person_accompanying_course_edit', { 'accompanying_period_id': accompanyingCourse.id } ) }}">
-                    {{ 'Edit & activate accompanying course'|trans }}
-                </a>
-            </span>
-        </div>
-    {% endif %}
-
     <pre>WIP .. AccompanyingCourse Resume dashboard</pre>
 
-    {#
+    {% if 'DRAFT' == accompanyingCourse.step %}
+        {% include '@ChillPerson/AccompanyingCourse/_still_draft.html.twig' %}
+    {% endif %}
+    {% if 'DRAFT' != accompanyingCourse.step %}
+        {% if withoutHousehold|length > 0 %}
+            {% include '@ChillPerson/AccompanyingCourse/_join_household.html.twig' %}
+        {% endif %}
+    {% endif %}
+    {% if accompanyingCourse.locationStatus == 'address' or accompanyingCourse.locationStatus == 'none' %}
+        {% include '@ChillPerson/AccompanyingCourse/_warning_address.html.twig' %}
+    {% endif %}
+
+
+    {# DISABLED
     <h1>{{ 'Resume Accompanying Course'|trans }}</h1>
 
     <div class="associated-persons mb-5">
@@ -53,13 +55,6 @@
                 {% endif %}
             {% endfor %}
         </div>
-    #}
-        {% if 'DRAFT' != accompanyingCourse.step %}
-            {% if withoutHousehold|length > 0 %}
-                {% include '@ChillPerson/AccompanyingCourse/_join_household.html.twig' with {} %}
-            {% endif %}
-        {% endif %}
-    {#
     </div>
 
     <div class="location mb-5">
@@ -80,11 +75,6 @@
                 </div>
             </div>
         {% endif %}
-    #}
-        {% if accompanyingCourse.locationStatus == 'address' or accompanyingCourse.locationStatus == 'none' %}
-            {% include '@ChillPerson/AccompanyingCourse/_warning_address.html.twig' with {} %}
-        {% endif %}
-    {#
     </div>
 
     <div class="requestor mb-5">
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 8b6b6db58..f8c1207ee 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -186,7 +186,7 @@ No accompanying user: Aucun accompagnant
 No data given: Pas d'information
 Participants: Personnes impliquées
 Create an accompanying course: Créer un parcours
-This accompanying course is still a draft: Ce parcours est à l'état brouillon
+This accompanying course is still a draft: Ce parcours est encore à l'état brouillon.
 Associated peoples: Usagers concernés
 Resources: Interlocuteurs privilégiés
 Requestor: Demandeur