From 1965fc55f47211dc080adbad0561afad8b52aa12 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 6 Mar 2023 17:47:33 +0100
Subject: [PATCH] Fixed button DocumentActionsButtonsGroup display bug

- improve document table
- add a smallfont css classe to handle table style
when called from index or from show page
---
 .../vuejs/DocumentActionButtonsGroup.vue      |  2 +-
 .../views/Workflow/_attachment.html.twig      |  2 +-
 .../chill/scss/accompanying_period_work.scss  |  7 +++--
 .../AccompanyingCourseWork/_item.html.twig    |  3 +-
 .../_objectifs_results_evaluations.html.twig  | 31 +++++++------------
 .../AccompanyingCourseWork/index.html.twig    |  1 +
 .../views/Workflow/_evaluation.html.twig      |  2 +-
 .../Workflow/_evaluation_document.html.twig   |  2 +-
 8 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue
index 2cb5e64fe..88587e90f 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="'ready' === props.storedObject.status" class="dropdown">
+  <div v-if="'ready' === props.storedObject.status" class="btn-group">
     <button :class="Object.assign({'btn': true, 'btn-outline-primary': true, 'dropdown-toggle': true, 'btn-sm': props.small})" type="button" data-bs-toggle="dropdown" aria-expanded="false">
       Actions
     </button>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_attachment.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_attachment.html.twig
index 24cf3cab4..2a1041c6f 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_attachment.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_attachment.html.twig
@@ -72,7 +72,7 @@
                     </div>
                 </div>
                 <div class="item-row column">
-                    <table class="obj-res-eval my-3">
+                    <table class="obj-res-eval smallfont my-3">
                         <thead>
                         <tr><th class="obj"><h4 class="title_label">Objectif - motif - dispositif</h4></th>
                             <th class="res"><h4 class="title_label">Résultats - orientations</h4></th>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss
index eeb2eb2be..03bbcbcf2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss
@@ -20,9 +20,6 @@ div.accompanying-course-work {
                 margin: 0;
             }
         }
-        td {
-            font-size: 85%;
-        }
         td.obj,
         td.res {
             width: 50%;
@@ -37,6 +34,10 @@ div.accompanying-course-work {
         }
     }
 
+    .smallfont table.obj-res-eval td {
+        font-size: 85%;
+    }
+
     ul {
         &.goal_title,
         &.result_list,
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
index 8ab7a932c..94d31cb24 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
@@ -3,6 +3,7 @@
 #  - itemBlocClass: [uniq|colored|extended]
 #  - displayContent: [short|long] default: short
 #  - displayAction: [true|false] default: false
+#  - 'displayFontSmall': [true|false] default: false
 #}
 <div class="item-bloc{% if displayContent is defined %} {{ displayContent }}{% endif %}{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
 
@@ -110,7 +111,7 @@
     </div>
 
     {% if displayContent is not defined or displayContent == 'short' %}
-        <div class="item-row column">
+        <div class="item-row column smallfont">
             {% include 'ChillPersonBundle:AccompanyingCourseWork:_objectifs_results_evaluations.html.twig' with {
                 'displayContent': displayContent
             } %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
index 63e4ff638..0dd0cc84a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
@@ -130,27 +130,20 @@
                         {% import "@ChillDocStore/Macro/macro.html.twig" as m %}
                         {% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
 
-                        <div class="download mb-4 container">
-                            {% if e.documents|length > 0 %}
-
+                        {% if e.documents|length > 0 %}
+                            <table class="table mt-4 mx-auto">
                                 {% for d in e.documents %}
-                                    <div class="row">
-                                        <div class="col text-start">
-                                            {{ d.title }}
-                                        </div>
-                                        <div class="col-md-auto text-center">
-                                            {{ mm.mimeIcon(d.storedObject.type) }}
-                                        </div>
-                                        <div class="col col-lg-4 text-end">
-                                            {{ d.storedObject|chill_document_button_group(d.title, is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w), {'small': true}) }}
-                                        </div>
-                                    </div>
+                                    <tr class="border-0">
+                                        <td class="border-0">{{ d.title }}</td>
+                                        <td class="border-0">{{ mm.mimeIcon(d.storedObject.type) }}</td>
+                                        <td class="border-0 text-end">{{ d.storedObject|chill_document_button_group(d.title, is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w), {'small': true}) }}</td>
+                                    </tr>
                                 {% endfor %}
-
-                            {% else %}
-                                <span class="chill-no-data-statement">{{ 'No document found'|trans }}</span>
-                            {% endif %}
-                        </div>
+                            </table>
+                        {% else %}
+                            <span class="chill-no-data-statement">{{ 'No document found'|trans }}</span>
+                        {% endif %}
+                        
 
                     {% endif %}
                 </td>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig
index b12466e18..9214bd30d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig
@@ -25,6 +25,7 @@
                     {% include '@ChillPerson/AccompanyingCourseWork/_item.html.twig' with {
                         'displayAction': true,
                         'displayContent': 'short',
+                        'displayFontSmall': true,
                         'itemBlocClass': ''
                     } %}
                 {% endfor %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation.html.twig
index ca95760dd..b49455cfd 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation.html.twig
@@ -21,7 +21,7 @@
             </h2>
         </div>
         <div class="item-row column">
-            <table class="obj-res-eval my-3" style="font-size: 110% !important;">
+            <table class="obj-res-eval my-3">
                 <thead>
                     <tr>
                         <th class="eval">
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
index e5d8f9c9a..691a903ab 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
@@ -49,7 +49,7 @@
                 </div>
             </div>
             <div class="item-row column">
-                <table class="obj-res-eval my-3" style="font-size: 110% !important;">
+                <table class="obj-res-eval my-3">
                     <thead>
                         <tr>
                             <th class="eval">