From 698514ef1202d4abc3fb5acec0f06180d70fbe56 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 20 Aug 2021 14:47:33 +0200
Subject: [PATCH] #192 custom-zone added + no_data message

---
 .../Resources/public/vuejs/_js/i18n.js        |  2 +-
 .../_components/Entity/PersonRenderBox.vue    | 42 +++++++++++--
 .../vuejs/_components/OnTheFly/Person.vue     | 60 +++----------------
 3 files changed, 45 insertions(+), 59 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
index e451bc461..3d189e318 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
@@ -75,7 +75,7 @@ const messages = {
             man: "Né le",
             woman: "Née le"
          } ,
-         no_information: "Pas d'information",
+         no_data: "Aucune information renseignée",
          type: {
             thirdparty: "Tiers",
             person: "Usager"
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 520734e53..f4db98c0f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -11,19 +11,19 @@
                    <a v-if="this.options.addLink ==  true" href="#">
                         <span class="firstname">{{ person.firstName }}</span>
                         <span class="lastname">{{ person.lastName }}</span>
-                        <span v-if="this.options.addAltNames ==  true" class="altnames">
+                        <span v-if="person.altNames && options.addAltNames ==  true" class="altnames">
                             <span :class="'altname altname-' + altNameKey">{{ altNameLabel }}</span>
                         </span>
                     </a>
 
                    <span class="firstname">{{ person.firstName }}</span>
                    <span class="lastname">{{ person.lastName }}</span>
-                   <span v-if="this.options.addAltNames ==  true" class="altnames">
+                   <span v-if="person.altNames && options.addAltNames ==  true" class="altnames">
                        <span :class="'altname altname-' + altNameKey">{{ altNameLabel }}</span>
                    </span>
 
-                   <span v-if="this.options.addId ==  true" class="id-number" :title="'n° ' + person.id">{{ person.id }}</span>
-                   <span v-if="this.options.addEntity ==  true" class="badge rounded-pill bg-secondary">{{ $t('renderbox.person') }}</span>
+                   <span v-if="options.addId ==  true" class="id-number" :title="'n° ' + person.id">{{ person.id }}</span>
+                   <span v-if="options.addEntity ==  true" class="badge rounded-pill bg-secondary">{{ $t('renderbox.person') }}</span>
 
                 </div>
 
@@ -35,25 +35,51 @@
                     <time v-else-if="person.deathdate" datetime="{{ person.deathdate }}" title="{{ person.deathdate }}">
                         {{ birthdate }} - {{ deathdate }}
                     </time>
-                    <span class="age">{{ person.age }}</span>
+                    <!-- <span class="age">{{ person.age }}</span> -->
                 </p>
             </div>
         </div>
 
         <div class="item-col separator">
             <ul class="list-content fa-ul">
+                
                 <li v-if="person.current_household_address">
                     <i class="fa fa-li fa-map-marker"></i>
                     <show-address :address="person.current_household_address" :isMultiline="false"></show-address>
                 </li>
+                <li v-else-if="options.addNoData">
+                    <i class="fa fa-li fa-map-marker"></i>
+                    <p class="chill-no-data-statement">{{ $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>
                 </li>
-                <li v-else-if="person.phonenumber">
+                <li v-else-if="options.addNoData">
+                    <i class="fa fa-li fa-mobile"></i>
+                    <p class="chill-no-data-statement">{{ $t('renderbox.no_data') }}</p>
+                </li>
+                <li v-if="person.phonenumber">
                     <i class="fa fa-li fa-phone"></i>
                     <a :href="'tel: ' + person.phonenumber">{{ person.phonenumber }}</a>
                 </li>
+                <li v-else-if="options.addNoData">
+                    <i class="fa fa-li fa-phone"></i>
+                    <p class="chill-no-data-statement">{{ $t('renderbox.no_data') }}</p>
+                </li>
+                
+                <li v-if="person.center && options.addCenter">
+                    <i class="fa fa-li fa-long-arrow-right"></i>
+                    {{ person.center.name }}
+                </li>
+                <li v-else-if="options.addNoData">
+                    <i class="fa fa-li fa-long-arrow-right"></i>
+                    <p class="chill-no-data-statement">{{ $t('renderbox.no_data') }}</p>
+                </li>
+                
+                <slot name="custom-zone"></slot>
+
             </ul>
 
             <slot name="record-actions"></slot>
@@ -107,6 +133,10 @@ export default {
 .lastname:before{
     content: " "
 }
+
+div.item-col:first-child{
+    width: 33%;
+}
 </style>
 
 
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 3c8791884..db9515efa 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -1,63 +1,23 @@
 <template>
 <div v-if="action === 'show'">
-
    <div class="flex-table">
       <!-- {{ person }} -->
-      <!-- <person-render-box
+      <person-render-box
          :person="person"
          :options="{
             addInfo: true,
             addEntity: false,
-            addAltNames: false,
-            addId: false,
+            addAltNames: true,
+            addId: true,
             addLink: false,
-            hLevel: 3
+            hLevel: 3,
+            addCenter: true,
+            addNoData: true
          }"
-      ></person-render-box> -->
-      <div class="item-bloc">
-         <div class="item-row">
-            <div class="item-col">
-               <h3 :title="person.id">{{ person.text }}</h3>
-               <p>
-                  <i class="fa fa-fw"
-                     :class="genderClass">
-                  </i>
-                  <span v-if="person.birthdate">
-                     {{ $t('person.born', { e: feminized }) }}
-                     {{ $d(person.birthdate.datetime, 'short') }}
-                  </span>
-               </p>
-            </div>
-            <div class="item-col">
-               <dl class="list-content">
-                  <dt>{{ $t('person.firstname') }}</dt>
-                  <dd>{{ person.firstName }}</dd>
-
-                  <dt>{{ $t('person.lastname') }}</dt>
-                  <dd>{{ person.lastName }}</dd>
-
-                  <dt>{{ $t('person.altnames') }}</dt>
-                  <dd>{{ person.altNames }}</dd>
-
-                  <span v-if="person.center">
-                     <dt>{{ $t('person.center_name') }}</dt>
-                     <dd :title="person.center.id">{{ person.center.name }}</dd>
-                  </span>
-
-                  <dt>{{ $t('person.phonenumber') }}</dt>
-                  <dd>{{ person.phonenumber }}</dd>
-
-                  <dt>{{ $t('person.mobilenumber') }}</dt>
-                  <dd>{{ person.mobilenumber }}</dd>
-
-                  <dt>{{ $t('person.gender.title') }}</dt>
-               </dl>
-            </div>
-         </div>
-      </div>
+      ></person-render-box>
    </div>
-
 </div>
+
 <div v-else-if="action === 'edit' || action === 'create'">
 
    <div class="form-floating mb-3">
@@ -214,10 +174,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-ul {
-   li::marker {
-   }
-}
 div.flex-table {
    div.item-bloc {
       div.item-row {