fix merge conflicts

src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue

@@ -19,9 +19,15 @@
          ></third-party-render-box>
       </div>
    </div>
-   <div v-else-if="action === 'edit' || action === 'create'">
-
-      <div class="form-floating mb-3" v-if="thirdparty.kind !== 'child'">
+   <div v-else-if="action === 'edit' || action === 'create' || action === 'addContact'">
+      <div v-if="parent">
+         <div class="parent-info">
+            <i class="fa fa-li fa-hand-o-right"></i>
+            <b class="me-2">{{ $t('child_of') }}</b>
+            <span class="chill-entity badge-thirdparty">{{ parent.text }}</span>
+         </div>
+      </div>
+      <div class="form-floating mb-3" v-else-if="kind !== 'child'">
          <div class="form-check">
             <input class="form-check-input mt-0" type="radio" v-model="kind" value="company" id="tpartyKindInstitution">
             <label for="tpartyKindInstitution" class="required">
@@ -55,10 +61,30 @@
                   addCenter: false,
                   addNoData: true,
                   isMultiline: false
-         }"></third-party-render-box>
+            }"></third-party-render-box>
       </div>
+
+      <div v-if="thirdparty.kind === 'child' || thirdparty.kind === 'contact'">
+         <div id="child-info">
+            <div class="input-group mb-3">
+               <select class="form-select form-select-lg" id="profession"
+                  v-model="thirdparty.civility">
+                  <option selected disabled :value="null" >{{ $t('thirdparty.civility') }}</option>
+                  <option v-for="civility in civilities" :key="civility.id" :value="{type: 'chill_main_civility', id: civility.id }">{{ civility.name.fr }}</option>
+               </select>
+            </div>
+            <div class="input-group mb-3">
+               <select class="form-select form-select-lg" id="civility"
+                  v-model="thirdparty.profession">
+                  <option selected disabled :value="null">{{ $t('thirdparty.profession') }}</option>
+                  <option v-for="profession in professions" :key="profession.id" :value="{type: 'third_party_profession', id: profession.id }">{{ profession.name.fr }}</option>
+               </select>
+            </div>
+         </div>
+      </div>
+
       <div class="form-floating mb-3">
-         <input class="form-control form-control-lg" id="name" v-model="thirdparty.text" v-bind:placeholder="$t('thirdparty.name')" />
+         <input class="form-control form-control-lg" id="name" v-model="thirdparty.name" v-bind:placeholder="$t('thirdparty.name')" />
          <label for="name">{{ $t('thirdparty.name') }}</label>
       </div>
       <div v-if="query">
@@ -98,6 +124,15 @@
             aria-describedby="phonenumber" />
       </div>
 
+      <div v-if="parent">
+         <div class="input-group mb-3">
+            <span class="input-group-text" id="comment"><i class="fa fa-fw fa-pencil"></i></span>
+            <textarea class="form-control form-control-lg"
+               v-bind:placeholder="$t('thirdparty.comment')"
+               v-model="thirdparty.comment"
+            ></textarea>
+         </div>
+      </div>
    </div>
 </template>
 
@@ -106,10 +141,11 @@ import ThirdPartyRenderBox from '../Entity/ThirdPartyRenderBox.vue';
 import AddAddress from 'ChillMainAssets/vuejs/Address/components/AddAddress';
 import { getThirdparty } from '../../_api/OnTheFly';
 import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue';
+import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
 
 export default {
    name: "OnTheFlyThirdParty",
-   props: ['id', 'type', 'action', 'query'],
+   props: ['id', 'type', 'action', 'query', 'parent'],
    components: {
       ThirdPartyRenderBox,
       AddAddress,
@@ -124,8 +160,11 @@ export default {
             kind: 'company',
             name: '',
             telephone: '',
-
+            civility: null,
+            profession: null,
          },
+         professions: [],
+         civilities: [],
          addAddress: {
             options: {
                openPanesInModal: true,
@@ -177,10 +216,10 @@ export default {
    },
    methods: {
       loadData(){
-         getThirdparty(this.id).then(thirdparty => new Promise((resolve, reject) => {
+         return getThirdparty(this.id).then(thirdparty => new Promise((resolve, reject) => {
             this.thirdparty = thirdparty;
             this.thirdparty.kind = thirdparty.kind;
-            //console.log('get thirdparty', thirdparty);
+            console.log('get thirdparty', thirdparty);
             if (this.action !== 'show') {
                if (thirdparty.address !== null) {
                   // bof! we force getInitialAddress because addressId not available when mounted
@@ -190,6 +229,30 @@ export default {
             resolve();
          }));
       },
+      loadCivilities() {
+         const url = `/api/1.0/main/civility.json`;
+         return makeFetch('GET', url)
+               .then(response => {
+                  this.$data.civilities = response.results;
+                  return Promise.resolve();
+               })
+               .catch((error) => {
+                  console.log(error)
+                  this.$toast.open({message: error.body})
+               })
+      },
+      loadProfessions() {
+         const url = `/api/1.0/thirdparty/professions.json`;
+         return makeFetch('GET', url)
+               .then(response => {
+                  this.$data.professions = response.results;
+                  return Promise.resolve();
+               })
+               .catch((error) => {
+                  console.log(error)
+                  this.$toast.open({message: error.body})
+               })
+      },
       submitAddress(payload) {
          console.log('submitAddress', payload);
           if (typeof payload.addressId !== 'undefined') { // <--
@@ -200,13 +263,24 @@ export default {
          }
       },
       addQuery(query) {
-         this.thirdparty.text = query;
-      }
+         this.thirdparty.name = query;
+      },
    },
-   mounted() {
-      //console.log('mounted', this.action);
+    mounted() {
+       let dependencies = [];
+       dependencies.push(this.loadProfessions());
+       dependencies.push(this.loadCivilities());
       if (this.action !== 'create') {
-         this.loadData();
+         if (this.id) {
+            dependencies.push(this.loadData());
+            // here we can do something when all promises are resolve, with
+            // Promise.all(dependencies).then(() => { /* do something */ });
+         }
+         if (this.action === 'addContact') {
+            this.$data.thirdparty.kind = 'child'
+            // this.$data.thirdparty.parent = this.parent.id
+            this.$data.thirdparty.address =  null
+         }
       } else {
          this.thirdparty.kind = 'company';
       }
@@ -229,5 +303,16 @@ dl {
       margin-left: 1em;
    }
 }
+.parent-info {
+   margin-bottom: 1rem;
+}
+
+#child-info {
+   display: flex;
+   justify-content: space-between;
+   div {
+      width: 49%;
+   }
+}
 </style>
 

src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_js/i18n.js

@@ -4,7 +4,12 @@ const thirdpartyMessages = {
             name: "Dénomination",
             email: "Courriel",
             phonenumber: "Téléphone",
-        }
+            comment: "Commentaire",
+            profession: "Qualité",
+            civility: "Civilité"
+        },
+        child_of: "Contact de: ",
+        children: "Personnes de contact: ",
     }
 };
 

src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/_form.html.twig

@@ -23,15 +23,15 @@
 {{ form_row(form.contactDataAnonymous) }}
 {% endif %}
 
+{% if form.address is defined %}
+    {{ form_row(form.address) }}
+{% endif %}
+
 {% if form.activeChildren is defined %}
     <h2>{{ 'Contacts'|trans }}</h2>
     {{ form_widget(form.activeChildren) }}
 {% endif %}
 
-{% if form.address is defined %}
-    {{ form_row(form.address) }}
-{% endif %}
-
 {{ form_row(form.comment) }}
 
 {% if form.centers is defined %}