From f750cfecac97906664ad554bcd6b4ef75efdb23d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 24 Oct 2024 16:15:49 +0200
Subject: [PATCH] Show userGroup in workflow breadcrumb

related:

- https://champs-libres.openproject.com/wp/774
- OP#774
- https://gitea.champs-libres.be/Vendee/accent-suivi-developpement/issues/1274
---
 .../Resources/views/Workflow/_history.html.twig             | 6 +++---
 .../Resources/views/Workflow/macro_breadcrumb.html.twig     | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_history.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_history.html.twig
index 5fcc60ed4..9149e9a94 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_history.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_history.html.twig
@@ -42,7 +42,7 @@
                     <div class="item-col" style="width: inherit;">
                             <div>
                                 {%- if step.transitionBy is not null -%}
-                                    {{ step.transitionBy|chill_entity_render_box({'at_date': step.transitionAt}) }}
+                                    <span class="badge-user">{{ step.transitionBy|chill_entity_render_box({'at_date': step.transitionAt}) }}</span>
                                 {% else %}
                                     <span class="chill-no-data-statement">{{ 'workflow.Automated transition'|trans }}</span>
                                 {%- endif -%}
@@ -105,7 +105,7 @@
                             <p><b>{{ 'workflow.Users put in Cc'|trans }}&nbsp;: </b></p>
                             <ul>
                                 {% for u in step.ccUser %}
-                                    <li>{{ u|chill_entity_render_box({'at_date': step.previous.transitionAt}) }}</li>
+                                    <li><span class="badge-user">{{ u|chill_entity_render_box({'at_date': step.previous.transitionAt}) }}</span></li>
                                 {% endfor %}
                             </ul>
                         {% endif %}
@@ -123,7 +123,7 @@
                             <p><b>{{ 'workflow.Those users are also granted to apply a transition by using an access key'|trans }}&nbsp;:</b></p>
                             <ul>
                                 {% for u in step.destUserByAccessKey %}
-                                    <li>{{ u|chill_entity_render_box({'at_date': step.previous.transitionAt}) }}</li>
+                                    <li><span class="badge-user">{{ u|chill_entity_render_box({'at_date': step.previous.transitionAt}) }}</span></li>
                                 {% endfor %}
                             </ul>
                         {% endif %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig
index 61189100c..6a1c66ae7 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig
@@ -9,11 +9,13 @@
                 <span class="item-key">{{ 'Le'|trans ~ ' : ' }}</span>
                 <b>{{ step.previous.transitionAt|format_datetime('short', 'short') }}</b>
             </li>
-            {% if step.destUser|length > 0 %}
+            {% if step.destUser|length > 0 or step.destUserGroups|length > 0 %}
                 <li>
                     <span class="item-key">{{ 'workflow.For'|trans ~ ' : ' }}</span>
                     <b>
-                        {% for d in step.destUser %}{{ d|chill_entity_render_string({'at_date': step.previous.transitionAt}) }}{% if not loop.last %}, {% endif %}{% endfor %}
+                        {% for d in step.destUser %}<span class="badge-user">{{ d|chill_entity_render_string({'at_date': step.previous.transitionAt}) }}</span>{% if not loop.last %}, {% endif -%}{% endfor -%}
+                        {%- if step.destUser|length > 0 and step.destUserGroups|length > 0 %}, {% endif -%}
+                        {%- for d in step.destUserGroups %}{{ d|chill_entity_render_box }}{% if not loop.last %}, {% endif %}{% endfor -%}
                     </b>
                 </li>
             {% endif %}