From 034e2553bc89946d1a8196ebd0d6fc82eff53ea5 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Tue, 18 Apr 2023 21:13:24 +0200
Subject: [PATCH] Fix option with RoleWithoutScope distinction. Remove flag.

---
 .../translations/messages.fr.yml              |  4 +--
 .../views/PermissionsGroup/edit.html.twig     | 29 +++++++++++++++++--
 .../views/PermissionsGroup/show.html.twig     |  4 +--
 .../translations/messages.fr.yml              |  4 ++-
 .../translations/messages.fr.yml              | 12 ++++----
 5 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
index 581df7431..0a7aacfd8 100644
--- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
@@ -104,8 +104,8 @@ CHILL_ACTIVITY_UPDATE: Modifier un échange
 CHILL_ACTIVITY_SEE: Voir un échange
 CHILL_ACTIVITY_SEE_DETAILS: Voir le détail des échanges
 CHILL_ACTIVITY_DELETE: Supprimer un échange
-CHILL_ACTIVITY_STATS: Statistique des échanges (⚑)
-CHILL_ACTIVITY_LIST: Liste des échanges (⚑)
+CHILL_ACTIVITY_STATS: Statistique des échanges
+CHILL_ACTIVITY_LIST: Liste des échanges
 CHILL_ACTIVITY_CREATE_PERSON: Créer un échange lié à un usager
 CHILL_ACTIVITY_CREATE_ACCOMPANYING_COURSE: Créer un échange lié à un parcours
 CHILL_ACTIVITY_FULL: Voir les détails, créer, supprimer et mettre à jour un échange
diff --git a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig
index 18e91f2c5..2404178b2 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig
@@ -44,13 +44,13 @@
                 {%- endif -%}
             </td>
             <td>
-                <span class="role_scope role">{{ role_scope.role|trans|replace({'(⚑)': ''}) }}</span>
+                <span class="role_scope role">{{ role_scope.role|trans }}</span>
                 {% if expanded_roles[role_scope.role]|length > 1 %}
                     <div class="help-text">
                         <span style="text-decoration: underline dotted;">{{ 'Which implies'|trans }}&nbsp;:</span>
                         {% for role in expanded_roles[role_scope.role] %}
                             {% if role != role_scope.role  %}
-                                {{ role|trans|replace({'(⚑)': ''}) }}
+                                {{ role|trans }}
                                 {% if not loop.last %}, {% endif %}
                             {% endif %}
                         {% endfor %}
@@ -83,7 +83,7 @@
             {{ form_widget(add_role_scopes_form.composed_role_scope.role, { 'attr': { 'class': 'w-50' }}) }}
             {{ form_widget(add_role_scopes_form.composed_role_scope.scope) }}
         </div>
-        <div class="help-text mb-3">{{ 'Help to pick role an scope'|trans }}</div>
+        <div id="role_scope_legend" class="help-text mb-3">{{ 'Help to pick role and scope'|trans }}</div>
 
         <ul class="record_actions sticky-form-buttons">
             <li class="cancel">
@@ -102,3 +102,26 @@
 
 
 {% endblock %}
+
+{% block js %}
+<script>
+
+    // An event listener give contextual legend when choosing an option.
+    const select = document.getElementById('form_composed_role_scope_role');
+    const legend = document.getElementById('role_scope_legend');
+
+    select.addEventListener('change', function() {
+        const option = this.options[this.selectedIndex];
+        const hasScope = option.getAttribute('data-has-scope');
+        legend.style.display = 'block';
+        if (hasScope === '0') {
+            legend.innerText = '{{ 'The role does not need scope'|trans }}';
+        } else if (hasScope === '1') {
+            legend.innerText = '{{ 'The role need scope'|trans }}';
+        } else {
+            legend.innerText = '{{ 'Help to pick role and scope'|trans }}';
+        }
+    });
+
+</script>
+{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig
index e457fd913..b183bc19e 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig
@@ -37,13 +37,13 @@
                     {%- endif -%}
                 </td>
                 <td>
-                    <span class="role_scope role">{{ role_scope.role|trans|replace({'(⚑)': ''}) }}</span>
+                    <span class="role_scope role">{{ role_scope.role|trans }}</span>
                     {% if expanded_roles[role_scope.role]|length > 1 %}
                         <div class="help-text">
                             <span style="text-decoration: underline dotted;">{{ 'Which implies'|trans }}&nbsp;:</span>
                             {% for role in expanded_roles[role_scope.role] %}
                                 {% if role != role_scope.role  %}
-                                    {{ role|trans|replace({'(⚑)': ''}) }}
+                                    {{ role|trans }}
                                     {% if not loop.last %}, {% endif %}
                                 {% endif %}
                             {% endfor %}
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 0acaffe79..b8349ce2e 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -174,7 +174,9 @@ This group does not provide any permission: Ce groupe n'attribue aucune permissi
 The role '%role%' has been removed: Le rôle "%role%" a été enlevé de ce groupe de permission
 The role '%role%' on circle '%scope%' has been removed: Le rôle "%role%" sur le cercle "%scope%" a été enlevé de ce groupe de permission
 Unclassified: Non classifié
-Help to pick role an scope: Les rôles marqués d'un (⚑) ne nécessitent pas de cercle.
+Help to pick role and scope: Certains rôles ne nécessitent pas de cercle.
+The role need scope: Ce rôle nécessite un cercle.
+The role does not need scope: Ce rôle ne nécessite pas de cercle !
 
 #admin section for users
 User configuration: Gestion des utilisateurs
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 2ca57f5f7..18e3ab13f 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -308,12 +308,12 @@ Opening the accompanying period: Ouverture d'un parcours d'accompagnement
 'Timeline for %name%': 'Historique de %name%'
 
 # ROLES
-CHILL_PERSON_SEE: Voir les usagers (⚑)
-CHILL_PERSON_UPDATE: Modifier les usagers (⚑)
-CHILL_PERSON_CREATE: Ajouter des usagers (⚑)
-CHILL_PERSON_STATS: Statistiques sur les usagers (⚑)
-CHILL_PERSON_LISTS: Liste des usagers (⚑)
-CHILL_PERSON_DUPLICATE: Gérer les doublons d'usagers (⚑)
+CHILL_PERSON_SEE: Voir les usagers
+CHILL_PERSON_UPDATE: Modifier les usagers
+CHILL_PERSON_CREATE: Ajouter des usagers
+CHILL_PERSON_STATS: Statistiques sur les usagers
+CHILL_PERSON_LISTS: Liste des usagers
+CHILL_PERSON_DUPLICATE: Gérer les doublons d'usagers
 
 CHILL_PERSON_ACCOMPANYING_PERIOD_SEE: Vision simplifiée d'un parcours d'accompagnement
 CHILL_PERSON_ACCOMPANYING_PERIOD_CONFIDENTIAL: Voir et modifier les parcours d'accompagnement confidentielles