Merge remote-tracking branch 'origin/master' into issue439_residential_address_otf

2025-08-21 15:13:50 +00:00 · 2022-02-28 15:11:50 +01:00
parent 57175e1c0b 822f0aa737
commit cdd21c94c6
166 changed files with 2682 additions and 1555 deletions
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
@@ -199,7 +199,7 @@ export default {
      ...mapState({
         suggestedEntities: state => {
           return [
-               ...state.accompanyingCourse.participations.map(p => p.person),
+               ...state.accompanyingCourse.participations.filter((p) => p.endDate === null).map((p) => p.person),
               ...state.accompanyingCourse.resources.map(r => r.resource)
             ]
               .filter((e) => e !== null)
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
@@ -77,7 +77,7 @@ export default {
      counter: state => state.accompanyingCourse.resources.length,
      suggestedEntities: state => [
            state.accompanyingCourse.requestor,
-            ...state.accompanyingCourse.participations.map(p => p.person),
+            ...state.accompanyingCourse.participations.filter((p) => p.endDate === null).map((p) => p.person),
         ]
         .filter((e) => e !== null)
         .filter(
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
@@ -159,18 +159,19 @@ export default {
               .catch((error) => {
                  if (error.name === 'ValidationException') {
                     for (let v of error.violations) {
-                         this.$toast.open({message: v });
+                        this.$toast.open({message: v });
                     }
                  } else {
-                      this.$toast.open({message: 'An error occurred'});
+                     this.$toast.open({message: 'An error occurred'});
                  }
               })
         }
         else if (payload.type === 'thirdparty') {
+            console.log('data', payload.data)
            body.name = payload.data.text;
            body.email = payload.data.email;
            body.telephone = payload.data.phonenumber;
-            body.address = { id: payload.data.address.address_id };
+            body.address = payload.data.address ? { id: payload.data.address.address_id } :  null;

            makeFetch('PATCH', `/api/1.0/thirdparty/thirdparty/${payload.data.id}.json`, body)
               .then(response => {
@@ -180,10 +181,10 @@ export default {
               .catch((error) => {
                  if (error.name === 'ValidationException') {
                     for (let v of error.violations) {
-                         this.$toast.open({message: v });
+                        this.$toast.open({message: v });
                     }
                  } else {
-                      this.$toast.open({message: 'An error occurred'});
+                     this.$toast.open({message: 'An error occurred'});
                  }
               })
         }
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -57,6 +57,8 @@
                  v-bind:item="item"
                  v-bind:search="search"
                  v-bind:type="checkUniq"
+                  @saveFormOnTheFly="saveFormOnTheFly"
+                  @newPriorSuggestion="newPriorSuggestion"
                  @updateSelected="updateSelected">
               </person-suggestion>

@@ -249,7 +251,7 @@ export default {
         }
      },
      newPriorSuggestion(entity) {
-         console.log('newPriorSuggestion', entity);
+         // console.log('newPriorSuggestion', entity);
         if (entity !== null) {
            let suggestion = {
               key: entity.type + entity.id,
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue
@@ -18,6 +18,7 @@

         <suggestion-third-party
            v-if="item.result.type === 'thirdparty'"
+            @newPriorSuggestion="newPriorSuggestion"
            v-bind:item="item">
         </suggestion-third-party>

@@ -26,10 +27,10 @@
            v-bind:item="item">
         </suggestion-user>

-        <suggestion-household
-            v-if="item.result.type === 'household'"
-            v-bind:item="item">
-        </suggestion-household>
+         <suggestion-household
+               v-if="item.result.type === 'household'"
+               v-bind:item="item">
+         </suggestion-household>
      </label>

   </div>
@@ -54,7 +55,7 @@ export default {
      'search',
      'type'
   ],
-   emits: ['updateSelected'],
+   emits: ['updateSelected', 'newPriorSuggestion'],
   computed: {
      selected: {
         set(value) {
@@ -72,6 +73,9 @@ export default {
   methods: {
      setValueByType(value, type) {
         return (type === 'radio')? [value] : value;
+      },
+      newPriorSuggestion(response) {
+         this.$emit('newPriorSuggestion', response)
      }
   }
 };
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
@@ -2,12 +2,12 @@
    <div class="container tpartycontainer">
      <div class="tparty-identification">
        <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,21 +19,28 @@
    </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 v-if="item.result.kind === 'company'"
+          v-bind:parent="item.result"
+          @saveFormOnTheFly="saveFormOnTheFly"
+          action="addContact"
+          ref="onTheFly"
+      ></on-the-fly>
+      <on-the-fly
+          type="thirdparty"
+          v-bind:id="item.result.id"
+          action="show">
+      </on-the-fly>
    </div>
 </template>

 <script>
 import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue';
 import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue';
+import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';

 const i18n = {
  messages: {
@@ -48,36 +55,56 @@ 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'],
+  emits: ['newPriorSuggestion'],
+  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;
+    }
+  },
+  methods: {
+    saveFormOnTheFly({data, type}) {
+      makeFetch('POST', '/api/1.0/thirdparty/thirdparty.json', data)
+        .then(response => {
+            this.$emit('newPriorSuggestion', response);
+            this.$refs.onTheFly.closeModal();
+        })
+        .catch((error) => {
+            if (error.name === 'ValidationException') {
+              for (let v of error.violations) {
+                  this.$toast.open({message: v });
+              }
+            } else {
+              this.$toast.open({message: 'An error occurred'});
+            }
+        })
+
+    }
+  }
 }
 </script>

--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -12,6 +12,7 @@
                      <!-- use person-text here to avoid code duplication ? TODO -->
                        <span class="firstname">{{ person.firstName }}</span>
                        <span class="lastname">{{ person.lastName }}</span>
+                        <span v-if="person.suffixText" class="suffixtext">&nbsp;{{ person.suffixText }}</span>
                        <span v-if="person.altNames && options.addAltNames ==  true" class="altnames">
                            <span :class="'altname altname-' + altNameKey">{{ altNameLabel }}</span>
                        </span>
@@ -20,6 +21,7 @@
                  <!-- use person-text here to avoid code duplication ? TODO -->
                    <span class="firstname">{{ person.firstName }}</span>
                    <span class="lastname">{{ person.lastName }}</span>
+                    <span v-if="person.suffixText" class="suffixtext">&nbsp;{{ person.suffixText }}</span>
                    <span v-if="person.deathdate" class="deathdate"> (‡)</span>
                    <span v-if="person.altNames && options.addAltNames ==  true" class="altnames">
                        <span :class="'altname altname-' + altNameKey">{{ altNameLabel }}</span>
@@ -85,6 +87,15 @@
                            </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.mobilenumber">
                            <i class="fa fa-li fa-mobile"></i>
                            <a :href="'tel: ' + person.mobilenumber">{{ person.mobilenumber }}</a>
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonText.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonText.vue
@@ -6,6 +6,7 @@
        <span v-if="person.altNames && person.altNames.length > 0" class="altnames">
            <span :class="'altname altname-' + altNameKey"> ({{ altNameLabel }})</span>
        </span>
+        <span v-if="person.suffixText" class="suffixtext">&nbsp;{{ person.suffixText }}</span>
        <span class="age" v-if="this.addAge && person.birthdate !== null && person.deathdate === null">{{ $tc('renderbox.years_old', person.age) }}</span>
        <span v-else-if="this.addAge && person.deathdate !== null">&nbsp;(‡)</span>
    </span>