From d009d09215516772a90971ceb2ece0683a175f45 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 22 Oct 2021 12:35:27 +0200
Subject: [PATCH] some adjustments to the application of blur
 effect...incomplete

---
 .../public/vuejs/_components/Confidential.vue |  6 +-
 .../PersonsAssociated/ParticipationItem.vue   |  2 +-
 .../components/Requestor.vue                  | 89 +++++++++++--------
 .../_components/Entity/PersonRenderBox.vue    | 18 ++--
 .../views/AccompanyingPeriod/_list.html.twig  | 16 ++--
 5 files changed, 66 insertions(+), 65 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
index 165e9f0b0..11d1bc6e0 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
@@ -37,12 +37,14 @@ export default {
 
 <style lang='scss'>
     .confidential{
-        display: flex;
         align-items: center;
     }
     .toggle{
-        margin-left: 10px;
+        margin-top: 28px;
         cursor: pointer;
+        display: block;
+        float: right;
+        margin-right: 20px;
     }
     .blur {
         -webkit-filter: blur(5px);
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
index 7b5fabfbd..fd3f59cef 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
@@ -9,7 +9,7 @@
                addAltNames: true,
                addAge : true,
                hLevel : 3,
-               isConfidential :  true,
+               isConfidential :  false,
             }"
       :person="participation.person"
       :returnPath="getAccompanyingCourseReturnPath">
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
index cb4b243bb..3e9cf8475 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
@@ -9,45 +9,54 @@
          <input type="checkbox" v-model="isAnonymous" class="me-2" />
          {{ $t('requestor.is_anonymous') }}
       </label>
-
-      <third-party-render-box v-if="accompanyingCourse.requestor.type === 'thirdparty'"
-         :thirdparty="accompanyingCourse.requestor"
-         :options="{
-            addLink: false,
-            addId: false,
-            addEntity: true,
-            addInfo: false,
-            hLevel: 3,
-            isMultiline: true
-            }"
-      >
-      <template v-slot:record-actions>
-         <ul class="record_actions">
-            <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="show"></on-the-fly></li>
-            <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly"></on-the-fly></li>
-         </ul>
-      </template>
-      </third-party-render-box>
-
-      <person-render-box render="bloc" v-else-if="accompanyingCourse.requestor.type === 'person'"
-         :person="accompanyingCourse.requestor"
-         :options="{
-            addLink: false,
-            addId: false,
-            addAltNames: false,
-            addEntity: true,
-            addInfo: true,
-            hLevel: 3,
-            isMultiline: true
-            }"
-      >
-      <template v-slot:record-actions>
-         <ul class="record_actions">
-            <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="show"></on-the-fly></li>
-            <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly"></on-the-fly></li>
-         </ul>
-      </template>
-      </person-render-box>
+      <confidential v-if="accompanyingCourse.requestor.type === 'thirdparty'">
+         <template v-slot:confidential-content>
+            <third-party-render-box
+               :thirdparty="accompanyingCourse.requestor"
+               :options="{
+                  addLink: false,
+                  addId: false,
+                  addEntity: true,
+                  addInfo: false,
+                  hLevel: 3,
+                  isMultiline: true,
+                  isConfidential: true
+                  }"
+            >
+            <template v-slot:record-actions>
+               <ul class="record_actions">
+                  <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="show"></on-the-fly></li>
+                  <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly"></on-the-fly></li>
+               </ul>
+            </template>
+            </third-party-render-box>
+         </template>
+      </confidential>
+      
+      <confidential v-else-if="accompanyingCourse.requestor.type === 'person'">
+         <template v-slot:confidential-content>
+            <person-render-box render="bloc"
+               :person="accompanyingCourse.requestor"
+               :options="{
+                  addLink: false,
+                  addId: false,
+                  addAltNames: false,
+                  addEntity: true,
+                  addInfo: true,
+                  hLevel: 3,
+                  isMultiline: true,
+                  isConfidential: false
+                  }"
+            >
+               <template v-slot:record-actions>
+                  <ul class="record_actions">
+                     <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="show"></on-the-fly></li>
+                     <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly"></on-the-fly></li>
+                  </ul>
+               </template>
+            </person-render-box>
+         </template>
+      </confidential>
 
       <ul class="record_actions">
          <li>
@@ -82,6 +91,7 @@ import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
 import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue';
 import PersonRenderBox from '../../_components/Entity/PersonRenderBox.vue';
 import ThirdPartyRenderBox from 'ChillThirdPartyAssets/vuejs/_components/Entity/ThirdPartyRenderBox.vue';
+import Confidential from 'ChillMainAssets/vuejs/_components/Confidential.vue';
 
 export default {
    name: 'Requestor',
@@ -90,6 +100,7 @@ export default {
       OnTheFly,
       PersonRenderBox,
       ThirdPartyRenderBox,
+      Confidential
    },
    data() {
       return {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index d7242a593..3b9ea5156 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -57,18 +57,10 @@
 
                     <li v-if="person.current_household_id">
                        <i class="fa fa-li fa-map-marker"></i>
-                       <confidential v-if="options.isConfidential">
-                           <template v-slot:confidential-content>
-                            <address-render-box
-                                :address="person.current_household_address"
-                                :isMultiline="isMultiline">
-                            </address-render-box>
-                           </template>
-                       </confidential>
-                        <address-render-box v-else-if="person.current_household_address"
-                            :address="person.current_household_address"
-                            :isMultiline="isMultiline">
-                        </address-render-box>
+                       <address-render-box v-if="person.current_household_address"
+                         :address="person.current_household_address"
+                         :isMultiline="isMultiline">
+                       </address-render-box>
                        <p v-else class="chill-no-data-statement">
                           {{ $t('renderbox.household_without_address') }}
                        </p>
@@ -86,7 +78,7 @@
                           {{ $t('renderbox.no_data') }}
                        </p>
                     </li>
-
+                    
                     <li v-if="person.mobilenumber">
                        <i class="fa fa-li fa-mobile"></i>
                        <a :href="'tel: ' + person.mobilenumber">{{ person.mobilenumber }}</a>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
index 440ecf45e..a53a7c0d0 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
@@ -63,16 +63,12 @@
                             <div class="wl-row">
                                 <div class="wl-col title"><h3>{{ 'Requestor'|trans({'gender': null }) }}</h3></div>
                                 <div class="wl-col list">
-                                    <div class="confidential">
-                                        <div class="confidential-content blur">
-                                            {% if accompanying_period.requestorPerson is not null %}
-                                                <span class="wl-item badge-person">{{ accompanying_period.requestorPerson|chill_entity_render_string }}</span>
-                                            {% endif %}
-                                            {% if accompanying_period.requestorThirdParty is not null %}
-                                                <span class="wl-item badge-thirdparty">{{ accompanying_period.requestorThirdParty|chill_entity_render_string }}</span>
-                                            {% endif %}
-                                        </div>
-                                    </div>
+                                    {% if accompanying_period.requestorPerson is not null %}
+                                        <span class="wl-item badge-person">{{ accompanying_period.requestorPerson|chill_entity_render_string }}</span>
+                                    {% endif %}
+                                    {% if accompanying_period.requestorThirdParty is not null %}
+                                        <span class="wl-item badge-thirdparty">{{ accompanying_period.requestorThirdParty|chill_entity_render_string }}</span>
+                                    {% endif %}
                                 </div>
                             </div>
                         {% endif %}