From 62b8b3e6b7d53007db6be0d67bf34f30f2933f9a Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 9 Dec 2021 16:17:25 +0100
Subject: [PATCH] add thirdparty comment in acccourse resources

---
 .../AccompanyingCourse/components/Resources/ResourceItem.vue  | 4 +---
 src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php        | 1 +
 .../public/vuejs/_components/Entity/ThirdPartyRenderBox.vue   | 3 +++
 .../public/vuejs/_components/OnTheFly/ThirdParty.vue          | 1 +
 .../Serializer/Normalizer/ThirdPartyNormalizer.php            | 1 +
 5 files changed, 7 insertions(+), 3 deletions(-)

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 612d78a7b..e17555c6a 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
@@ -14,9 +14,6 @@
       }">
       <template v-slot:record-actions>
          <ul class="record_actions">
-            <!--
-            <button-location v-if="hasCurrentHouseholdAddress" :person="resource.resource"></button-location>
-            -->
             <li>
                <on-the-fly
                   :type="resource.resource.type"
@@ -51,6 +48,7 @@
          addId : false,
          addEntity: true,
          addInfo: false,
+         //addComment: true,
          hLevel: 3
       }">
       <template v-slot:record-actions>
diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
index 19f2062ee..4611b32b4 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
@@ -126,6 +126,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\Column(name="comment", type="text", nullable=true)
+     * @Groups({"read"})
      */
     private ?string $comment = null;
 
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 6b4fba8bf..5758f1f33 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@@ -91,6 +91,9 @@
                      </li>
                      -->
                  </ul>
+                  <div v-if="options.addComment && !thirdparty.contactDataAnonymous && thirdparty.comment">
+                      <blockquote class="chill-user-quote">{{ thirdparty.comment }}</blockquote>
+                  </div>
               </div>
            </div>
         </div>
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
index d86fb6210..2d540530d 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
@@ -14,6 +14,7 @@
                hLevel: 3,
                addCenter: true,
                addNoData: true,
+               addComment: true,
                isMultiline: true
             }"
          ></third-party-render-box>
diff --git a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
index 50ecefb18..0723b6f6c 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
             'parent' => $this->normalizer->normalize($thirdParty->getParent(), $format, $context),
             'civility' => $this->normalizer->normalize($thirdParty->getCivility(), $format, $context),
             'contactDataAnonymous' => $thirdParty->isContactDataAnonymous(),
+            'comment' => $thirdParty->getComment(),
         ];
     }