From ecda740d81857cd89b8b0e036a75a65f83763278 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 12 Jan 2022 20:26:54 +0100
Subject: [PATCH] on-the-fly: add a 'parent' option to pass parent context. So
 we could now display resource.comment below the renderbox.

---
 .../Resources/public/vuejs/OnTheFly/App.vue   |  1 +
 .../vuejs/OnTheFly/components/OnTheFly.vue    | 27 ++++++++++++++++---
 .../Resources/public/vuejs/OnTheFly/i18n.js   |  1 +
 .../Resources/public/vuejs/OnTheFly/index.js  |  3 ++-
 .../OnTheFly/_insert_vue_onthefly.html.twig   |  5 ++++
 .../components/Resources/ResourceItem.vue     | 15 +++++++++++
 .../views/AccompanyingCourse/index.html.twig  | 19 ++++++++++---
 7 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/App.vue
index 48f68380b..05fed6671 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/App.vue
@@ -5,6 +5,7 @@
         :action="context.action"
         :buttonText="options.buttonText"
         :displayBadge="options.displayBadge === 'true'"
+        :parent="options.parent"
         @saveFormOnTheFly="saveFormOnTheFly">
     </on-the-fly>
 </template>
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 d64ae274e..c3a939b14 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
@@ -28,6 +28,12 @@
                v-bind:action="action"
                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>
+            </div>
          </template>
 
          <template v-slot:body v-else-if="type === 'thirdparty'">
@@ -37,6 +43,12 @@
                v-bind:action="action"
                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>
+             </div>
          </template>
 
          <template v-slot:body v-else>
@@ -78,18 +90,27 @@ export default {
       OnTheFlyThirdparty,
       OnTheFlyCreate
    },
-   props: ['type', 'id', 'action', 'buttonText', 'displayBadge'],
+   props: ['type', 'id', 'action', 'buttonText', 'displayBadge', 'parent'],
    emits: ['saveFormOnTheFly'],
    data() {
       return {
          modal: {
             showModal: false,
             modalDialogClass: "modal-dialog-scrollable modal-xl"
-         },
-         //action: this.action
+         }
       }
    },
    computed: {
+      hasResourceComment() {
+          //console.log('hasResourceComment', this.parent);
+          if (typeof this.parent === 'undefined' || this.parent === null) {
+              return false;
+          }
+          return this.action === 'show'
+              && this.parent.type === 'accompanying_period_resource'
+              && (this.parent.comment !== null || this.parent.comment !== '')
+          ;
+      },
       classAction() {
          switch (this.action) {
             case 'show':
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/i18n.js
index 3cba67149..c619ef96b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/i18n.js
@@ -17,6 +17,7 @@ const ontheflyMessages = {
                 person: "un nouvel usager",
                 thirdparty: "un nouveau tiers professionnel"
             },
+            resource_comment_title: "Un commentaire est associé à cet interlocuteur"
         }
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/index.js
index 88e6aad5e..479cc1248 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/index.js
@@ -21,7 +21,8 @@ containers.forEach((container) => {
                     },
                     options: {
                         buttonText: container.dataset.buttonText || null,
-                        displayBadge: container.dataset.displayBadge || false
+                        displayBadge: container.dataset.displayBadge || false,
+                        parent: JSON.parse(container.dataset.parent) || null,
                     }
                 }
             }
diff --git a/src/Bundle/ChillMainBundle/Resources/views/OnTheFly/_insert_vue_onthefly.html.twig b/src/Bundle/ChillMainBundle/Resources/views/OnTheFly/_insert_vue_onthefly.html.twig
index e63fd9ee0..666743fb2 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/OnTheFly/_insert_vue_onthefly.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/OnTheFly/_insert_vue_onthefly.html.twig
@@ -10,6 +10,7 @@
     * action        string  'show', 'edit', 'create'
     * buttonText    string
     * displayBadge  boolean (default: false)  replace button by badge, need to define buttonText for content
+    * parent        object  (optional)        pass parent context of the targetEntity (used for course resource comment)
 
 #}
 <span class="onthefly-container"
@@ -31,6 +32,10 @@
         data-display-badge="true"
     {% endif %}
 
+    {% if parent is defined %}
+        data-parent='{{ parent|json_encode }}'
+    {% endif %}
+
 ></span>
 
 {{ encore_entry_script_tags('vue_onthefly') }}
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 0b7527063..e7bc18371 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
@@ -22,6 +22,7 @@
             </li>
             <li>
                <on-the-fly
+                  :parent="parent"
                   :type="resource.resource.type"
                   :id="resource.resource.id"
                   action="show">
@@ -29,6 +30,7 @@
             </li>
             <li>
                <on-the-fly
+                  :parent="parent"
                   :type="resource.resource.type"
                   :id="resource.resource.id"
                   action="edit"
@@ -66,6 +68,7 @@
             </li>
             <li>
                <on-the-fly
+                  :parent="parent"
                   :type="resource.resource.type"
                   :id="resource.resource.id"
                   action="show">
@@ -73,6 +76,7 @@
             </li>
             <li>
                <on-the-fly
+                  :parent="parent"
                   :type="resource.resource.type"
                   :id="resource.resource.id"
                   action="edit"
@@ -110,6 +114,17 @@ export default {
    props: ['resource'],
    emits: ['remove'],
    computed: {
+      parent() {
+         return {
+            'type': this.resource.type,
+            'id': this.resource.id,
+            'comment': this.resource.comment,
+            'parent': {
+               'type': this.$store.state.accompanyingCourse.type,
+               'id': this.$store.state.accompanyingCourse.id
+            }
+         }
+      },
       hasCurrentHouseholdAddress() {
          if ( this.resource.resource.current_household_address !== null ) {
             return true;
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index 392355753..9fcbd6c76 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -4,11 +4,12 @@
     {{ 'Resume Accompanying Course'|trans }}
 {% endblock %}
 
-{% macro insert_onthefly(type, entity) %}
+{% macro insert_onthefly(type, entity, parent = null) %}
     {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
         action: 'show', displayBadge: true,
         targetEntity: { name: type, id: entity.id },
-        buttonText: entity|chill_entity_render_string
+        buttonText: entity|chill_entity_render_string,
+        parent: parent
     } %}
 {% endmacro %}
 
@@ -106,11 +107,21 @@
             <div class="mbloc col col-sm-6 col-lg-4">
                 <div class="resources">
                     <h4 class="item-key">{{ 'Resources'|trans }}</h4>
+
                     {% for r in accompanyingCourse.resources %}
+                        {% set parent = {
+                            'type': 'accompanying_period_resource',
+                            'id': r.id,
+                            'comment': r.comment,
+                            'parent': {
+                                'type': 'accompanying_period',
+                                'id': accompanyingCourse.id
+                            }
+                        } %}
                         {% if r.person is not null %}
-                            {{ _self.insert_onthefly('person', r.person) }}
+                            {{ _self.insert_onthefly('person', r.person, parent) }}
                         {% elseif r.thirdParty is not null %}
-                            {{ _self.insert_onthefly('thirdparty', r.thirdParty) }}
+                            {{ _self.insert_onthefly('thirdparty', r.thirdParty, parent) }}
                         {% endif %}
                     {% endfor %}
                 </div>