From 4f6011348dd5c53f7d3da8d650fe736f318679a5 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 27 Aug 2021 15:36:38 +0200
Subject: [PATCH] merge 2 subcomponent to use only Entity/PersonRenderBox.vue

---
 .../PersonsAssociated/ParticipationItem.vue      |  2 +-
 .../AccompanyingCourse/components/Requestor.vue  |  2 +-
 .../components/Resources/ResourceItem.vue        |  2 +-
 .../vuejs/AccompanyingCourseWorkCreate/App.vue   |  6 +++---
 .../vuejs/AccompanyingCourseWorkEdit/App.vue     |  6 +++---
 .../components/Concerned.vue                     |  6 +++---
 .../components/MemberDetails.vue                 |  6 +++---
 .../_components/Entity/HouseholdRenderBox.vue    | 10 +++++++---
 .../vuejs/_components/Entity/PersonRenderBox.vue |  7 ++++---
 .../public/vuejs/_components/OnTheFly/Person.vue |  2 +-
 .../public/vuejs/_components/Person/Person.vue   | 16 ----------------
 11 files changed, 27 insertions(+), 38 deletions(-)
 delete mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Person/Person.vue

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 04c6b73a9..117206d28 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
@@ -1,5 +1,5 @@
 <template>
-   <person-render-box
+   <person-render-box :render="bloc"
       :options="{
                addInfo : true,
                addId : false,
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 97ba5ba10..6c26b00cd 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
@@ -30,7 +30,7 @@
       </template>
       </third-party-render-box>
 
-      <person-render-box v-else-if="accompanyingCourse.requestor.type == 'person'"
+      <person-render-box :render="bloc" v-else-if="accompanyingCourse.requestor.type == 'person'"
          :person="accompanyingCourse.requestor"
          :options="{
             addLink: false,
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
index d37a4b84f..483c27de8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
@@ -1,5 +1,5 @@
 <template>
-   <person-render-box
+   <person-render-box :render="bloc"
       v-if="resource.resource.type === 'person'"
       :person="resource.resource"
       :options="{ addInfo : true, addId : false, addEntity: true, addLink: false, addAltNames: true, addAge : false, hLevel : 3 }"
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue
index 134b35353..2623509a7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue
@@ -35,7 +35,7 @@
         <ul>
           <li v-for="p in personsReachables" :key="p.id">
             <input type="checkbox" :value="p.id" v-model="personsPicked">
-            <person :person="p"></person>
+            <person-render-box render="badge" :person="p"></person-render-box>
           </li>
         </ul>
       </div>
@@ -124,7 +124,7 @@
 import { mapState, mapActions, mapGetters } from 'vuex';
 import VueMultiselect from 'vue-multiselect';
 import { dateToISO, ISOToDate } from 'ChillMainAssets/chill/js/date.js';
-import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
+import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
 
 const i18n = {
   messages: {
@@ -145,7 +145,7 @@ export default {
   name: 'App',
   components: {
     VueMultiselect,
-    Person,
+     PersonRenderBox,
   },
   methods: {
     submit() {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index ec99d1478..647ab4adb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -122,7 +122,7 @@
          <ul>
             <li v-for="p in personsReachables" :key="p.id">
                <input v-model="personsPicked" :value="p.id" type="checkbox">
-               <person :person="p"></person>
+               <person-render-box render="badge" :person="p"></person-render-box>
             </li>
          </ul>
       </div>
@@ -229,7 +229,7 @@ import CKEditor from '@ckeditor/ckeditor5-vue';
 import ClassicEditor from 'ChillMainAssets/module/ckeditor5/index.js';
 import AddResult from './components/AddResult.vue';
 import AddEvaluation from './components/AddEvaluation.vue';
-import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
+import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
 import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
 import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
 
@@ -274,7 +274,7 @@ export default {
       AddResult,
       AddEvaluation,
       AddPersons,
-      Person,
+      PersonRenderBox,
       ShowAddress,
    },
    i18n,
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
index 9399f9245..5ae594c8d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
@@ -25,7 +25,7 @@
         <div class="item-row">
           <div class="item-col">
             <div>
-              <person :person="conc.person"></person>
+              <person-render-box render="badge" :person="conc.person"></person-render-box>
             </div>
             <div v-if="conc.person.birthdate !== null">
               {{ $t('person.born', {'gender': conc.person.gender} ) }}
@@ -126,7 +126,7 @@ div.person {
 <script>
 import { mapGetters } from 'vuex';
 import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
-import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
+import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
 import MemberDetails from './MemberDetails.vue';
 import { ISOToDatetime } from 'ChillMainAssets/chill/js/date.js';
 
@@ -135,7 +135,7 @@ export default {
   components: {
     AddPersons,
     MemberDetails,
-    Person,
+    PersonRenderBox,
   },
   computed: {
     ...mapGetters([
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue
index e153373a1..99f92aaf1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue
@@ -3,7 +3,7 @@
     <div class="item-row">
       <div class="item-col">
         <div>
-          <person :person="conc.person"></person>
+          <person-render-box render="badge" :person="conc.person"></person-render-box>
           <span v-if="isHolder" class="badge bg-primary holder">
             {{ $t('household_members_editor.holder') }}
           </span>
@@ -73,14 +73,14 @@ div.participation-details {
 
 <script>
 import { mapGetters } from 'vuex';
-import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
+import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
 import CKEditor from '@ckeditor/ckeditor5-vue';
 import ClassicEditor from 'ChillMainAssets/module/ckeditor5/index.js';
 
 export default {
   name: 'MemberDetails',
   components: {
-    Person,
+    PersonRenderBox,
     ckeditor: CKEditor.component,
   },
   props: [
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
index 741470b81..021f0976f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
@@ -21,11 +21,15 @@
                <li v-if="hasCurrentMembers" class="members">
                   <i class="fa fa-li fa-user" :title="$t('current_members')"></i>
                   <template v-for="(m, index) in currentMembers()" :key="m.id">
-                     <person :person="m.person"></person>
                      <span v-if="m.holder">
                     &nbsp;<span class="badge bg-primary">{{ $t('holder') }}</span>
                   </span>
                      <span v-if="index != (currentMembersLength() - 1)">, </span>
+                     <person-render-box render="badge"
+                       :person="m.person"
+                       :options="{
+                       }">
+                     </person-render-box>
                   </template>
                </li>
                <li v-else class="members">
@@ -51,7 +55,7 @@
 </template>
 
 <script>
-import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
+import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
 import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
 
 const i18n = {
@@ -73,7 +77,7 @@ export default {
   name: 'Household',
   props: ['household'],
   components: {
-    Person,
+    PersonRenderBox,
     ShowAddress,
   },
   i18n,
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 4a53f0bb5..9ee13b322 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -1,5 +1,6 @@
 <template>
- <div class="item-bloc">
+  <div v-if="render === 'bloc'"
+    class="item-bloc">
     <section class="chill-entity entity-person">
     <div class="item-row entity-bloc">
 
@@ -86,7 +87,7 @@
 
     </div>
     </section>
- </div>
+  </div>
 </template>
 
 <script>
@@ -98,7 +99,7 @@ export default {
     components: {
         ShowAddress
     },
-    props: ['person', 'options'],
+    props: ['person', 'options', 'render'],
     computed: {
         getGender: function() {
             return this.person.gender == 'woman' ? 'renderbox.birthday.woman' : 'renderbox.birthday.man';
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index 1a9fffb45..3e6062cc1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -1,7 +1,7 @@
 <template>
 <div v-if="action === 'show'">
    <div class="flex-table">
-      <person-render-box
+      <person-render-box :render="bloc"
          :person="person"
          :options="{
             addInfo: true,
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Person/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Person/Person.vue
deleted file mode 100644
index 886a00683..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Person/Person.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<template>
-  <span class="chill-entity chill-entity__person">
-    <span class="chill-entity__person__text chill_denomination">
-      {{ person.text }}
-    </span>
-  </span>
-</template>
-
-<script>
-
-export default {
-  name: 'Person',
-  props: ['person']
-}
-
-</script>