From 55b9242690d0f9f57f4c3dc5b988505e0f5d8a95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 29 Nov 2021 21:57:29 +0100
Subject: [PATCH] [bugfix][activity form] check the presence of location /
 social issues / persons fields

---
 .../SocialIssuesAcc/CheckSocialIssue.vue      | 22 ++++++++++++++-----
 .../Resources/views/Activity/new.html.twig    |  9 +++++---
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
index d88a7c97f..8d902818f 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
@@ -1,18 +1,18 @@
 <template>
    <span class="inline-choice">
       <div class="form-check">
-      
+
          <input class="form-check-input"
-            type="checkbox" 
+            type="checkbox"
             v-model="selected"
             name="issue"
-            v-bind:id="issue.id" 
+            v-bind:id="issue.id"
             v-bind:value="issue"
             />
          <label class="form-check-label" v-bind:for="issue.id">
-            {{ issue.text }}
+            <span class="badge bg-chill-l-gray text-dark">{{ issue.text }}</span>
          </label>
-         
+
       </div>
    </span>
 </template>
@@ -34,3 +34,15 @@ export default {
    }
 }
 </script>
+
+<style lang="scss" scoped>
+@import 'ChillMainAssets/module/bootstrap/shared';
+@import 'ChillPersonAssets/chill/scss/mixins';
+@import 'ChillMainAssets/chill/scss/chill_variables';
+span.badge {
+    @include badge_social($social-issue-color);
+    font-size: 95%;
+    margin-bottom: 5px;
+    margin-right: 1em;
+}
+</style>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
index 56b40a53c..2fc8be3e6 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
@@ -29,7 +29,7 @@
     {{ form_row(form.socialActions) }}
 {% endif %}
 
-{%- if edit_form.socialIssues is defined or edit_form.socialIssues is defined -%}
+{%- if form.socialIssues is defined or form.socialIssues is defined -%}
     <div id="social-issues-acc"></div>
 {% endif %}
 
@@ -37,7 +37,8 @@
     {{ form_row(form.reasons) }}
 {% endif %}
 
-{%- if edit_form.persons is defined or edit_form.thirdParties is defined or edit_form.users is defined -%}
+{%- if form.persons is defined or form.thirdParties is defined or form.users is defined -%}
+
     <h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
 
     {%- if form.persons is defined -%}
@@ -49,7 +50,9 @@
     {%- if form.users is defined -%}
         {{ form_widget(form.users) }}
     {% endif %}
-        <div id="add-persons"></div>
+
+    <div id="add-persons"></div>
+
 {% endif %}
 
 <h2 class="chill-red">{{ 'Activity data'|trans }}</h2>