From 5c413edb32631b6a0a81d74c27c37228452bfa9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 25 Jan 2023 13:26:57 +0100
Subject: [PATCH] Fixed: check for empty command

Use the the EmbeddableComment api for getting comment.
---
 .../AccompanyingCourseWork/_item.html.twig    | 27 +++++++++----------
 .../_objectifs_results_evaluations.html.twig  | 22 ++++++++-------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
index 579487824..8ab7a932c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
@@ -108,7 +108,7 @@
 
         </div>
     </div>
-    
+
     {% if displayContent is not defined or displayContent == 'short' %}
         <div class="item-row column">
             {% include 'ChillPersonBundle:AccompanyingCourseWork:_objectifs_results_evaluations.html.twig' with {
@@ -116,16 +116,16 @@
             } %}
         </div>
     {% endif %}
-    
+
     {% if displayContent is not defined or displayContent == 'short' %}
         <div class="item-row separator">
-            
+
             {% import '@ChillPerson/AccompanyingCourseWork/_macros.html.twig' as macro  %}
-            
+
             <div class="item-col item-meta">
                 {{ macro.metadata(w) }}
             </div>
-    
+
             {% if displayAction is defined and displayAction == true %}
             <ul class="item-col record_actions">
                 <li>{{ macro.workflowButton(w) }}</li>
@@ -163,10 +163,10 @@
 #}
 {% if displayContent is defined and displayContent == 'long' %}
     </div>
-    
+
     {% if w.results|length > 0 or w.goals|length > 0 or w.accompanyingPeriodWorkEvaluations|length > 0 %}
         <h2 class="chill-blue">{{ 'Dispositifs' }}</h2>
-        
+
         <div class="flex-table">{# new flex-table wrapper #}
             <div class="item-bloc colored{% if displayContent is defined %} {{ displayContent }}{% endif %}{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
                 {% include 'ChillPersonBundle:AccompanyingCourseWork:_objectifs_results_evaluations.html.twig' with {
@@ -175,9 +175,9 @@
             </div>
         </div>
     {% endif %}
-    
+
     <h2 class="chill-blue">{{ 'Comments'|trans }}</h2>
-    
+
     <div class="flex-table">
         <div class="item-bloc no-altern{% if displayContent is defined %} {{ displayContent }}{% endif %}{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
             <h3 class="chill-beige">Public</h3>
@@ -189,15 +189,14 @@
                 <span class="chill-no-data-statement">{{ 'No comment associated'|trans }}</span>
             {% endif %}
         </div>
-        {% set userId = app.user.id %}
-        {% if w.privateComment.comments|length > 0 and w.privateComment.comments[userId] %}
+        {% if w.privateComment.hasCommentForUser(app.user) %}
             <div class="item-bloc no-altern{% if displayContent is defined %} {{ displayContent }}{% endif %}{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
                 <h3 class="chill-beige">Privé</h3>
                 <blockquote class="chill-user-quote private-quote">
-                    {{ w.privateComment.comments[userId]|chill_markdown_to_html }}
+                    {{ w.privateComment.commentForUser(app.user)|chill_markdown_to_html }}
                 </blockquote>
             </div>
         {% endif %}
     {# Here flex-table stay open ! read above #}
-    
-{% endif %}
\ No newline at end of file
+
+{% endif %}
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 800d39935..aa3838348 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
@@ -75,7 +75,7 @@
                                     <span class="item-key">{{ 'accompanying_course_work.start_date'|trans ~ ' : ' }}</span>
                                     <b>{{ e.startDate|format_date('short') }}</b>
                                 </li>
-                                
+
                                 {% if e.endDate %}
                                     <li>
                                         <span class="item-key">{{ 'accompanying_course_work.end_date'|trans ~ ' : ' }}</span>
@@ -89,7 +89,7 @@
                                         </li>
                                     {% endif %}
                                 {% endif %}
-                                
+
                                 {% if e.maxDate %}
                                     <li>
                                         <span class="item-key">{{ 'accompanying_course_work.max_date'|trans ~ ' : ' }}</span>
@@ -103,7 +103,7 @@
                                         </li>
                                     {% endif %}
                                 {% endif %}
-                                
+
                                 {% if e.warningInterval and e.warningInterval.d > 0 %}
                                     <li>
                                         {% set days = (e.warningInterval.d + e.warningInterval.m * 30) %}
@@ -122,15 +122,17 @@
                         </li>
                     </ul>
                     {% if displayContent is defined and displayContent == 'long' %}
-                        
-                        <blockquote class="chill-user-quote">{{ e.comment|chill_entity_render_box }}</blockquote>
-    
+
+                        {% if e.comment is not empty %}
+                            <blockquote class="chill-user-quote">{{ e.comment|chill_entity_render_box }}</blockquote>
+                        {% endif %}
+
                         {% 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 %}
-                                
+
                                 {% for d in e.documents %}
                                     <div class="row">
                                         <div class="col text-start">
@@ -144,12 +146,12 @@
                                         </div>
                                     </div>
                                 {% endfor %}
-                                
+
                             {% else %}
                                 <span class="chill-no-data-statement">{{ 'No document found'|trans }}</span>
                             {% endif %}
                         </div>
-                        
+
                     {% endif %}
                 </td>
             </tr>