From 2d230683547b246cb740af25be4b8674d01b5773 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 18 Feb 2022 17:07:53 +0100
Subject: [PATCH 01/16] start to display profession/fonction of thirdparty

---
 .../public/vuejs/_components/Entity/ThirdPartyRenderBox.vue    | 3 +++
 .../Serializer/Normalizer/ThirdPartyNormalizer.php             | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
index fb466f929..92e2915fd 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@@ -22,6 +22,8 @@
                     </badge-entity>
                 </div>
 
+                <p v-if="thirdparty.profession">{{ thirdparty.profession }}</p>
+
                 <p v-if="this.options.addInfo === true" class="moreinfo">
                 </p>
             </div>
@@ -111,6 +113,7 @@ export default {
     props: ['thirdparty', 'options'],
     computed: {
         isMultiline: function() {
+            console.log('thirdparty', this.thirdparty)
             if (this.options.isMultiline){
                 return this.options.isMultiline
             } else {
diff --git a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
index 6ffcc2dea..6cb37a8c6 100644
--- a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
+++ b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
@@ -45,6 +45,7 @@ class ThirdPartyNormalizer implements NormalizerAwareInterface, NormalizerInterf
             'isChild' => $thirdParty->isChild(),
             'parent' => $this->normalizer->normalize($thirdParty->getParent(), $format, $context),
             'civility' => $this->normalizer->normalize($thirdParty->getCivility(), $format, $context),
+            'profession' => $this->normalizer->normalize($thirdParty->getProfession(), $format, $context),
             'contactDataAnonymous' => $thirdParty->isContactDataAnonymous(),
         ];
     }

From 874c90e0e0bfc553ccd5e88532d4fc82c3655b3f Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 18 Feb 2022 17:07:53 +0100
Subject: [PATCH 02/16] start to display profession/fonction of thirdparty

---
 .../public/vuejs/_components/Entity/ThirdPartyRenderBox.vue    | 3 +++
 .../Serializer/Normalizer/ThirdPartyNormalizer.php             | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
index fb466f929..92e2915fd 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@@ -22,6 +22,8 @@
                     </badge-entity>
                 </div>
 
+                <p v-if="thirdparty.profession">{{ thirdparty.profession }}</p>
+
                 <p v-if="this.options.addInfo === true" class="moreinfo">
                 </p>
             </div>
@@ -111,6 +113,7 @@ export default {
     props: ['thirdparty', 'options'],
     computed: {
         isMultiline: function() {
+            console.log('thirdparty', this.thirdparty)
             if (this.options.isMultiline){
                 return this.options.isMultiline
             } else {
diff --git a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
index 6ffcc2dea..6cb37a8c6 100644
--- a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
+++ b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
@@ -45,6 +45,7 @@ class ThirdPartyNormalizer implements NormalizerAwareInterface, NormalizerInterf
             'isChild' => $thirdParty->isChild(),
             'parent' => $this->normalizer->normalize($thirdParty->getParent(), $format, $context),
             'civility' => $this->normalizer->normalize($thirdParty->getCivility(), $format, $context),
+            'profession' => $this->normalizer->normalize($thirdParty->getProfession(), $format, $context),
             'contactDataAnonymous' => $thirdParty->isContactDataAnonymous(),
         ];
     }

From 292d56cfbee17df09bfec3058b0655bc411db9c9 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 21 Feb 2022 16:38:55 +0100
Subject: [PATCH 03/16] email added to person renderbox

---
 .../public/vuejs/_components/Entity/PersonRenderBox.vue  | 9 +++++++++
 1 file changed, 9 insertions(+)

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 dd26db217..ad722faa3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -102,6 +102,15 @@
                             <p class="chill-no-data-statement">{{ $t('renderbox.no_data') }}</p>
                         </li>
 
+                        <li v-if="person.email">
+                            <i class="fa fa-li fa-envelope-o"></i>
+                            <a :href="'mailto: ' + person.email">{{ person.email }}</a>
+                        </li>
+                        <li v-else-if="options.addNoData">
+                            <i class="fa fa-li fa-envelope-o"></i>
+                            <p class="chill-no-data-statement">{{ $t('renderbox.no_data') }}</p>
+                        </li>
+
                         <li v-if="person.centers !== undefined && person.centers.length > 0 && options.addCenter">
                             <i class="fa fa-li fa-long-arrow-right"></i>
                             <template v-for="c in person.centers">{{ c.name }}</template>

From 5d530aaae95081cefdf050a55061f6a29a9f19c3 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 22 Feb 2022 15:04:53 +0100
Subject: [PATCH 04/16] Fix confidential toggle bug

---
 .../public/vuejs/_components/Confidential.vue | 16 +------
 .../_components/Entity/AddressRenderBox.vue   |  2 +-
 .../Entity/ThirdPartyRenderBox.vue            | 42 +++++++++++--------
 3 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
index 0a34c4123..3961a43cd 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
@@ -1,6 +1,6 @@
 <template>
-    <div :class="classes">
-        <div class="confidential-content" :class="{ 'blur': isBlurred }">
+    <div class="confidential">
+        <div :class="{ 'blur': isBlurred }">
             <slot name="confidential-content"></slot>
         </div>
         <div>
@@ -29,18 +29,6 @@ export default {
 <style scoped lang='scss'>
     .confidential{
         align-items: center;
-        display: flex;
-    }
-    .toggle{
-        margin-top: 28px;
-        cursor: pointer;
         display: block;
-        float: right;
-        margin-right: 20px;
-    }
-    .blur {
-        -webkit-filter: blur(5px);
-        -moz-filter: blur(5px);
-        filter: blur(5px);
     }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
index 9a5dc2644..fca64106f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
@@ -27,7 +27,6 @@
                      </p>
                   </div>
                </template>
-
             </confidential>
          </div>
 
@@ -94,6 +93,7 @@ export default {
          return this.isMultiline === true ? "multiline" : "";
       },
       isConfidential() {
+         console.log(this.address.confidential)
          return this.address.confidential;
       }
    }
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
index 92e2915fd..d93566de7 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@@ -44,25 +44,31 @@
                     <!-- TODO hasChildren
                         NB: we cannot call on-the-fly from RenderBox. See error message in previous version of this file.
                     -->
+                    <li v-if="getProfession.length > 0">
+                        <i class="fa fa-li fa-id-card"></i>
+                        <p><span v-for="p in getProfession" :key="p" class="list-item">{{ p[0].toUpperCase() + p.slice(1).toLowerCase() }}</span></p>
+                    </li>
                 </ul>
-                <confidential v-if="thirdparty.contactDataAnonymous">
-                    <template v-slot:confidential-content>
-                        <ul class="list-content fa-ul">
-                            <li v-if="thirdparty.address">
-                            <i class="fa fa-li fa-map-marker"></i>
-                            <address-render-box :address="thirdparty.address" :isMultiline="isMultiline"></address-render-box>
-                            </li>
-                            <li v-if="thirdparty.phonenumber">
-                            <i class="fa fa-li fa-mobile"></i>
-                            <a :href="'tel: ' + thirdparty.phonenumber">{{ thirdparty.phonenumber }}</a>
-                            </li>
-                            <li v-if="thirdparty.email">
-                            <i class="fa fa-li fa-envelope-o"></i>
-                            <a :href="'mailto: ' + thirdparty.email">{{ thirdparty.email }}</a>
-                            </li>
-                        </ul>
-                    </template>
-                </confidential>
+                <div v-if="thirdparty.contactDataAnonymous">
+                    <confidential>
+                        <template v-slot:confidential-content>
+                            <ul class="list-content fa-ul">
+                                <li v-if="thirdparty.address">
+                                <i class="fa fa-li fa-map-marker"></i>
+                                <address-render-box :address="thirdparty.address" :isMultiline="isMultiline"></address-render-box>
+                                </li>
+                                <li v-if="thirdparty.phonenumber">
+                                <i class="fa fa-li fa-mobile"></i>
+                                <a :href="'tel: ' + thirdparty.phonenumber">{{ thirdparty.phonenumber }}</a>
+                                </li>
+                                <li v-if="thirdparty.email">
+                                <i class="fa fa-li fa-envelope-o"></i>
+                                <a :href="'mailto: ' + thirdparty.email">{{ thirdparty.email }}</a>
+                                </li>
+                            </ul>
+                        </template>
+                    </confidential>
+                </div>
                 <ul v-else class="list-content fa-ul">
                     <li v-if="thirdparty.address">
                         <i class="fa fa-li fa-map-marker"></i>

From 262bb13b6c5dc722c4d4d752e2381933e0747238 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 22 Feb 2022 15:05:43 +0100
Subject: [PATCH 05/16] Adding fonction in personrenderbox

---
 .../Entity/ThirdPartyProfession.php           |  4 +--
 .../Entity/ThirdPartyRenderBox.vue            | 24 ++++++++++++-----
 .../Normalizer/ThirdPartyNormalizer.php       | 27 ++++++++++++++++---
 3 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php
index 1963b34a7..eb852f367 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php
@@ -30,13 +30,13 @@ class ThirdPartyProfession
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
-     * @Serializer\Groups({"docgen:read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="json")
-     * @Serializer\Groups({"docgen:read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      */
     private array $name = [];
 
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
index d93566de7..6b2ba3218 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@@ -22,8 +22,6 @@
                     </badge-entity>
                 </div>
 
-                <p v-if="thirdparty.profession">{{ thirdparty.profession }}</p>
-
                 <p v-if="this.options.addInfo === true" class="moreinfo">
                 </p>
             </div>
@@ -96,10 +94,8 @@
 
 <script>
 import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
-import {dateToISO} from 'ChillMainAssets/chill/js/date.js';
 import Confidential from 'ChillMainAssets/vuejs/_components/Confidential.vue';
 import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue';
-//import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue';
 
 export default {
     name: "ThirdPartyRenderBox",
@@ -107,7 +103,6 @@ export default {
         AddressRenderBox,
         Confidential,
         BadgeEntity,
-        //OnTheFly
     },
     i18n: {
         messages: {
@@ -119,7 +114,6 @@ export default {
     props: ['thirdparty', 'options'],
     computed: {
         isMultiline: function() {
-            console.log('thirdparty', this.thirdparty)
             if (this.options.isMultiline){
                 return this.options.isMultiline
             } else {
@@ -129,6 +123,15 @@ export default {
         hasParent() {
             return !(this.thirdparty.parent === null || this.thirdparty.parent === undefined);
         },
+        getProfession() {
+            let profession  = []
+
+            if (this.thirdparty.category) {
+                profession = this.thirdparty.category.map((category) => category.text);
+            }
+
+            return profession
+        }
         /* TODO need backend normalizer to serve children without circular reference
         hasChildren() {
             //console.log(this.thirdparty.activeChildren.length > 0)
@@ -148,6 +151,15 @@ export default {
         font-variant: all-small-caps;
     }
 }
+
+.list-item {
+    &::after {
+        content: "|";
+    }
+    &:last-child::after {
+        content: ""
+    }
+}
 </style>
 
 
diff --git a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
index 6cb37a8c6..e1eae4940 100644
--- a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
+++ b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
@@ -11,7 +11,10 @@ declare(strict_types=1);
 
 namespace Chill\ThirdPartyBundle\Serializer\Normalizer;
 
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\ThirdPartyBundle\Entity\ThirdPartyCategory;
 use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
@@ -23,9 +26,14 @@ class ThirdPartyNormalizer implements NormalizerAwareInterface, NormalizerInterf
 
     private ThirdPartyRender $thirdPartyRender;
 
-    public function __construct(ThirdPartyRender $thirdPartyRender)
-    {
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    public function __construct(
+        ThirdPartyRender $thirdPartyRender,
+        TranslatableStringHelperInterface $translatableStringHelper
+    ) {
         $this->thirdPartyRender = $thirdPartyRender;
+        $this->translatableStringHelper = $translatableStringHelper;
     }
 
     /**
@@ -39,13 +47,26 @@ class ThirdPartyNormalizer implements NormalizerAwareInterface, NormalizerInterf
             'text' => $this->thirdPartyRender->renderString($thirdParty, []),
             'id' => $thirdParty->getId(),
             'kind' => $thirdParty->getKind(),
+            'category' => array_map(function ($el) {
+                if ($el instanceof ThirdPartyCategory) {
+                    return [
+                        'text' => $this->translatableStringHelper->localize($el->getName()),
+                        'type' => 'thirdparty_category',
+                    ];
+                } else {
+                    return [
+                        'text' => $el,
+                        'type' => 'thirdparty_kind',
+                    ];
+                }
+            }, $thirdParty->getTypesAndCategories()),
+            'profession' => $this->normalizer->normalize($thirdParty->getProfession(), $format, $context),
             'address' => $this->normalizer->normalize($thirdParty->getAddress(), $format, ['address_rendering' => 'short']),
             'phonenumber' => $thirdParty->getTelephone(),
             'email' => $thirdParty->getEmail(),
             'isChild' => $thirdParty->isChild(),
             'parent' => $this->normalizer->normalize($thirdParty->getParent(), $format, $context),
             'civility' => $this->normalizer->normalize($thirdParty->getCivility(), $format, $context),
-            'profession' => $this->normalizer->normalize($thirdParty->getProfession(), $format, $context),
             'contactDataAnonymous' => $thirdParty->isContactDataAnonymous(),
         ];
     }

From ab5bb3963bf10185d71996917b069284257aad92 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 22 Feb 2022 15:06:31 +0100
Subject: [PATCH 06/16] =?UTF-8?q?Add=20qualit=C3=A9=20in=20personsuggestio?=
 =?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_components/AddPersons/TypeThirdParty.vue | 114 +++++++++---------
 1 file changed, 60 insertions(+), 54 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
index 28f74818a..ddda65f35 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
@@ -1,13 +1,14 @@
 <template>
     <div class="container tpartycontainer">
       <div class="tparty-identification">
+        <span v-if="item.result.profession" class="profession">{{ item.result.profession.name.fr }}</span>
         <span class="name">
-           {{ item.result.text }}&nbsp;
+            {{ item.result.text }}&nbsp;
         </span>
         <span class="location">
           <template v-if="hasAddress">
-           {{ getAddress.text }} -
-           {{ getAddress.postcode.name }}
+            {{ getAddress.text }} -
+            {{ getAddress.postcode.name }}
           </template>
         </span>
       </div>
@@ -19,15 +20,15 @@
     </div>
 
     <div class="right_actions">
-       <badge-entity
-         :entity="item.result"
-         :options="{ displayLong: true }">
-       </badge-entity>
-       <on-the-fly
-           type="thirdparty"
-           v-bind:id="item.result.id"
-           action="show">
-       </on-the-fly>
+      <badge-entity
+        :entity="item.result"
+        :options="{ displayLong: true }">
+      </badge-entity>
+      <on-the-fly
+          type="thirdparty"
+          v-bind:id="item.result.id"
+          action="show">
+      </on-the-fly>
     </div>
 </template>
 
@@ -48,54 +49,59 @@ const i18n = {
 };
 
 export default {
-   name: 'SuggestionThirdParty',
-   components: {
-      OnTheFly,
-      BadgeEntity
-   },
-   props: ['item'],
-   i18n,
-   computed: {
-     hasAddress() {
-       if (this.$props.item.result.address !== null) {
-         return true;
-       }
-       if (this.$props.item.result.parent !== null) {
-         this.$props.item.result.parent.address !== null;
-       }
-     },
-     hasParent() {
-       return this.$props.item.result.parent !== null;
-     },
-     getAddress() {
-       if (this.$props.item.result.address !== null) {
-         return this.$props.item.result.address;
-       }
-       if (this.$props.item.result.parent.address !== null) {
-         return this.$props.item.result.parent.address;
-       }
+  name: 'SuggestionThirdParty',
+  components: {
+    OnTheFly,
+    BadgeEntity
+  },
+  props: ['item'],
+  i18n,
+  computed: {
+    hasAddress() {
+      if (this.$props.item.result.address !== null) {
+        return true;
+      }
+      if (this.$props.item.result.parent !== null) {
+        this.$props.item.result.parent.address !== null;
+      }
+    },
+    hasParent() {
+      return this.$props.item.result.parent !== null;
+    },
+    getAddress() {
+      if (this.$props.item.result.address !== null) {
+        return this.$props.item.result.address;
+      }
+      if (this.$props.item.result.parent.address !== null) {
+        return this.$props.item.result.parent.address;
+      }
 
-       return null;
-     }
-   }
+      return null;
+    },
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 .tpartycontainer {
- .tpartyparent {
-    .name {
-      font-weight: bold;
-      font-variant: all-small-caps;
+  .tpartyparent {
+      .name {
+        font-weight: bold;
+        font-variant: all-small-caps;
+      }
+  }
+  .tparty-identification {
+    span:not(.name) {
+      margin-left: 0.5em;
+      opacity: 0.5;
+      font-size: 90%;
+      font-style: italic;
     }
- }
- .tparty-identification {
-   span:not(.name) {
-     margin-left: 0.5em;
-     opacity: 0.5;
-     font-size: 90%;
-     font-style: italic;
-   }
- }
+    .profession {
+      font-weight: 800;
+      color: black;
+      font-style: normal;
+    }
+  }
 }
 </style>

From daab42109b69065699608325dd0168fd04ba5e05 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 22 Feb 2022 15:07:40 +0100
Subject: [PATCH 07/16] style adjustment

---
 .../public/vuejs/_components/Entity/ThirdPartyRenderBox.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
index 6b2ba3218..6693d36eb 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@@ -154,7 +154,7 @@ export default {
 
 .list-item {
     &::after {
-        content: "|";
+        content: " | ";
     }
     &:last-child::after {
         content: ""

From fd0ca3b29d7c49680608f162995c115e93cf0f9e Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 22 Feb 2022 15:07:40 +0100
Subject: [PATCH 08/16] =?UTF-8?q?style=20adjustment=20+=20if=20contact=20d?=
 =?UTF-8?q?isplay=20qualit=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_components/Entity/ThirdPartyRenderBox.vue   | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
index 6b2ba3218..78253b43f 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@@ -124,13 +124,17 @@ export default {
             return !(this.thirdparty.parent === null || this.thirdparty.parent === undefined);
         },
         getProfession() {
-            let profession  = []
-
-            if (this.thirdparty.category) {
-                profession = this.thirdparty.category.map((category) => category.text);
+            if (this.hasParent) {
+                console.log('im here')
+                let profession = []
+                profession.push(this.thirdparty.profession.name.fr)
+                return profession;
+            }
+
+            if (!this.hasParent && this.thirdparty.category) {
+                return this.thirdparty.category.map((category) => category.text);
             }
 
-            return profession
         }
         /* TODO need backend normalizer to serve children without circular reference
         hasChildren() {
@@ -154,7 +158,7 @@ export default {
 
 .list-item {
     &::after {
-        content: "|";
+        content: " | ";
     }
     &:last-child::after {
         content: ""

From cc4dfdb042ca806883bd5b9d2cc4949689314793 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 22 Feb 2022 15:24:14 +0100
Subject: [PATCH 09/16] style adjustment

---
 .../public/vuejs/_components/AddPersons/TypeThirdParty.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
index ddda65f35..536112986 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
@@ -100,7 +100,7 @@ export default {
     .profession {
       font-weight: 800;
       color: black;
-      font-style: normal;
+      font-style: normal !important;
     }
   }
 }

From fffed6e3f6434e8337c08fcf0a6f97dd55dc9097 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 23 Feb 2022 10:24:01 +0100
Subject: [PATCH 10/16] Attempt to add on-the-fly for parent badge

Error: failed to resolve component on-the-fly
---
 .../vuejs/OnTheFly/components/OnTheFly.vue    | 39 +++++++++----------
 .../Entity/ThirdPartyRenderBox.vue            | 34 ++++++++++------
 2 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
index b03b98b23..e50c2a41f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
@@ -1,11 +1,11 @@
 <template>
 
-    <a v-if="isDisplayBadge" @click="openModal">
-        <span class="chill-entity" :class="badgeType">
-            {{ buttonText }}<span v-if="isDead"> (‡)</span>
-        </span>
-    </a>
-    <a v-else class="btn btn-sm" target="_blank"
+   <a v-if="isDisplayBadge" @click="openModal">
+      <span class="chill-entity" :class="badgeType"> hello
+         {{ buttonText }}<span v-if="isDead"> (‡)</span>
+      </span>
+   </a>
+   <a v-else class="btn btn-sm" target="_blank"
       :class="classAction"
       :title="$t(titleAction)"
       @click="openModal">
@@ -29,10 +29,10 @@
                ref="castPerson">
             </on-the-fly-person>
             <div v-if="hasResourceComment">
-                <h3>{{ $t('onthefly.resource_comment_title') }}</h3>
-                <blockquote class="chill-user-quote">
-                    {{ parent.comment }}
-                </blockquote>
+               <h3>{{ $t('onthefly.resource_comment_title') }}</h3>
+               <blockquote class="chill-user-quote">
+                  {{ parent.comment }}
+               </blockquote>
             </div>
          </template>
 
@@ -44,10 +44,10 @@
                ref="castThirdparty">
             </on-the-fly-thirdparty>
             <div v-if="hasResourceComment">
-                <h3>{{ $t('onthefly.resource_comment_title') }}</h3>
-                <blockquote class="chill-user-quote">
-                    {{ parent.comment }}
-                </blockquote>
+               <h3>{{ $t('onthefly.resource_comment_title') }}</h3>
+               <blockquote class="chill-user-quote">
+                  {{ parent.comment }}
+               </blockquote>
             </div>
          </template>
 
@@ -104,12 +104,11 @@ export default {
    },
    computed: {
       hasResourceComment() {
-          //console.log('hasResourceComment', this.parent);
-          return (typeof this.parent !== 'undefined' && this.parent !== null)
-              && this.action === 'show'
-              && this.parent.type === 'accompanying_period_resource'
-              && (this.parent.comment !== null && this.parent.comment !== '')
-              ;
+         return (typeof this.parent !== 'undefined' && this.parent !== null)
+            && this.action === 'show'
+            && this.parent.type === 'accompanying_period_resource'
+            && (this.parent.comment !== null && this.parent.comment !== '')
+            ;
       },
       classAction() {
          switch (this.action) {
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
index 78253b43f..0149fc5d6 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@@ -34,18 +34,27 @@
                     <slot name="record-actions"></slot>
                 </div>
                 <ul class="list-content fa-ul">
-                    <li v-if="hasParent">
-                        <i class="fa fa-li fa-hand-o-right"></i>
-                        <b class="me-2">{{ $t('child_of') }}</b>
-                        <span class="chill-entity badge-thirdparty">{{ thirdparty.parent.text }}</span>
-                    </li>
-                    <!-- TODO hasChildren
-                        NB: we cannot call on-the-fly from RenderBox. See error message in previous version of this file.
-                    -->
                     <li v-if="getProfession.length > 0">
                         <i class="fa fa-li fa-id-card"></i>
                         <p><span v-for="p in getProfession" :key="p" class="list-item">{{ p[0].toUpperCase() + p.slice(1).toLowerCase() }}</span></p>
                     </li>
+                    <li v-if="hasParent">
+                        <i class="fa fa-li fa-hand-o-right"></i>
+                        <b class="me-2">{{ $t('child_of') }}</b>
+                        <!-- <on-the-fly
+                            :type="thirdparty.parent.type"
+                            :id="thirdparty.parent.id"
+                            :buttonText="thirdparty.parent.text"
+                            :displayBadge="'true' === 'true'"
+                            action="show">
+                        </on-the-fly> -->
+                        <span class="chill-entity badge-thirdparty">
+                            {{ thirdparty.parent.text}}
+                        </span>
+                    </li>
+                    <!-- TODO hasChildren
+                        NB: we cannot call on-the-fly from RenderBox. See error message in previous version of this file.
+                    -->
                 </ul>
                 <div v-if="thirdparty.contactDataAnonymous">
                     <confidential>
@@ -96,10 +105,12 @@
 import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 import Confidential from 'ChillMainAssets/vuejs/_components/Confidential.vue';
 import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue';
+// import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue';
 
 export default {
     name: "ThirdPartyRenderBox",
     components: {
+        // OnTheFly,
         AddressRenderBox,
         Confidential,
         BadgeEntity,
@@ -124,17 +135,16 @@ export default {
             return !(this.thirdparty.parent === null || this.thirdparty.parent === undefined);
         },
         getProfession() {
+            let profession = []
             if (this.hasParent) {
-                console.log('im here')
-                let profession = []
                 profession.push(this.thirdparty.profession.name.fr)
                 return profession;
             }
 
             if (!this.hasParent && this.thirdparty.category) {
-                return this.thirdparty.category.map((category) => category.text);
+                profession = this.thirdparty.category.map((category) => category.text);
             }
-
+            return profession;
         }
         /* TODO need backend normalizer to serve children without circular reference
         hasChildren() {

From 0601fa014276f357712cf50300395442e6f78a4f Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 23 Feb 2022 10:24:24 +0100
Subject: [PATCH 11/16] changelog updated

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53f2a855a..324e30ba4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,9 @@ and this project adheres to
 * [homepage_widget]: If no sender then display as 'notification automatique' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/435)
 * [parcours]: Order social activities and only display most recent three in parcours resumé (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/481)
 * [parcours / addresses]: launch an event when a person change address (either through changing household or because the household is associated to a new address). If the person is localising a course, the course location go back to a temporarily address.
+* [thirdparty]: address/phonenumber/email/fonction displayed in thirdpartyrenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/401)
+* [thirdparty_contact]: in search results the 'qualité' is displayed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/465)
+* [bug]: fix confidential toggle of address in thirdpartyrenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/460)
 
 ## Test releases
 

From d486f2ddfc9a70b5294a7dbc19a3d1908f4a4ddd Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 23 Feb 2022 10:46:25 +0100
Subject: [PATCH 12/16] fix styling of confidential toggle button in
 renderboxes

---
 .../ChillMainBundle/Resources/public/module/blur/blur.scss   | 5 +++++
 .../Resources/public/vuejs/_components/Confidential.vue      | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss b/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss
index ec96289de..b56609d85 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss
@@ -1,10 +1,15 @@
 .confidential{
     display: flex;
+    position: relative;
 }
 .toggle{
     margin-left: 30px;
     margin-top: 5px;
     cursor: pointer;
+    position: absolute;
+    bottom: 0px;
+    right: 10px;
+    z-index: 5;
 }
 .blur {
     -webkit-filter: blur(5px);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
index 3961a43cd..3d237a2d4 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
@@ -29,6 +29,5 @@ export default {
 <style scoped lang='scss'>
     .confidential{
         align-items: center;
-        display: block;
     }
 </style>

From c416f1ef6dde180ce32ca84c223f3d74d0af988f Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 25 Feb 2022 13:58:17 +0100
Subject: [PATCH 13/16] fix bug to resolve onthefly component within thirdparty
 renderbox

---
 .../vuejs/OnTheFly/components/OnTheFly.vue    |  2 +-
 .../Entity/ThirdPartyRenderBox.vue            | 23 +++++++++----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
index e50c2a41f..40b59a86a 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
@@ -1,7 +1,7 @@
 <template>
 
    <a v-if="isDisplayBadge" @click="openModal">
-      <span class="chill-entity" :class="badgeType"> hello
+      <span class="chill-entity" :class="badgeType">
          {{ buttonText }}<span v-if="isDead"> (‡)</span>
       </span>
    </a>
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
index 0149fc5d6..cf785b22d 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@@ -41,16 +41,13 @@
                     <li v-if="hasParent">
                         <i class="fa fa-li fa-hand-o-right"></i>
                         <b class="me-2">{{ $t('child_of') }}</b>
-                        <!-- <on-the-fly
-                            :type="thirdparty.parent.type"
-                            :id="thirdparty.parent.id"
-                            :buttonText="thirdparty.parent.text"
-                            :displayBadge="'true' === 'true'"
-                            action="show">
-                        </on-the-fly> -->
-                        <span class="chill-entity badge-thirdparty">
-                            {{ thirdparty.parent.text}}
-                        </span>
+                    <on-the-fly
+                        :type="thirdparty.parent.type"
+                        :id="thirdparty.parent.id"
+                        :buttonText="thirdparty.parent.text"
+                        :displayBadge="'true' === 'true'"
+                        action="show">
+                    </on-the-fly>
                     </li>
                     <!-- TODO hasChildren
                         NB: we cannot call on-the-fly from RenderBox. See error message in previous version of this file.
@@ -105,16 +102,18 @@
 import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 import Confidential from 'ChillMainAssets/vuejs/_components/Confidential.vue';
 import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue';
-// import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue';
 
 export default {
     name: "ThirdPartyRenderBox",
     components: {
-        // OnTheFly,
         AddressRenderBox,
         Confidential,
         BadgeEntity,
     },
+    // To avoid components recursively invoking eachother resolve OnTheFly component here
+    beforeCreate() {
+        this.$options.components.OnTheFly = require('ChillMainAssets/vuejs/OnTheFly/components/OnTheFly').default;
+    },
     i18n: {
         messages: {
             fr: {

From 530297bc671cebb1d84a0a10a88763ea2bfdeb92 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 25 Feb 2022 13:59:05 +0100
Subject: [PATCH 14/16] csfixes

---
 .../Serializer/Normalizer/ThirdPartyNormalizer.php    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
index e1eae4940..44f8178eb 100644
--- a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
+++ b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\ThirdPartyBundle\Serializer\Normalizer;
 
-use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Entity\ThirdPartyCategory;
@@ -53,12 +52,12 @@ class ThirdPartyNormalizer implements NormalizerAwareInterface, NormalizerInterf
                         'text' => $this->translatableStringHelper->localize($el->getName()),
                         'type' => 'thirdparty_category',
                     ];
-                } else {
-                    return [
-                        'text' => $el,
-                        'type' => 'thirdparty_kind',
-                    ];
                 }
+
+                return [
+                    'text' => $el,
+                    'type' => 'thirdparty_kind',
+                ];
             }, $thirdParty->getTypesAndCategories()),
             'profession' => $this->normalizer->normalize($thirdParty->getProfession(), $format, $context),
             'address' => $this->normalizer->normalize($thirdParty->getAddress(), $format, ['address_rendering' => 'short']),

From 72a9183ca8cc592df142c53f35cde36a0f9a1340 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 28 Feb 2022 12:04:05 +0100
Subject: [PATCH 15/16] fix in case of no profession

---
 .../public/vuejs/_components/Entity/ThirdPartyRenderBox.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
index cf785b22d..7f5727050 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@@ -135,7 +135,7 @@ export default {
         },
         getProfession() {
             let profession = []
-            if (this.hasParent) {
+            if (this.hasParent && this.thirdparty.profession) {
                 profession.push(this.thirdparty.profession.name.fr)
                 return profession;
             }

From 3b26466a6c9d2a8d486764e9585d7e1e67e1bcb7 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 28 Feb 2022 20:07:13 +0100
Subject: [PATCH 16/16] remove duplicate key in thirdparty serializer

---
 .../Serializer/Normalizer/ThirdPartyNormalizer.php               | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
index 6338c43d0..c107d8485 100644
--- a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
+++ b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
@@ -67,7 +67,6 @@ class ThirdPartyNormalizer implements NormalizerAwareInterface, NormalizerInterf
             'isChild' => $thirdParty->isChild(),
             'parent' => $this->normalizer->normalize($thirdParty->getParent(), $format, $context),
             'civility' => $this->normalizer->normalize($thirdParty->getCivility(), $format, $context),
-            'profession' => $this->normalizer->normalize($thirdParty->getProfession(), $format, $context),
             'contactDataAnonymous' => $thirdParty->isContactDataAnonymous(),
         ];
     }