merge with master

src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss

@@ -72,7 +72,7 @@ section.chill-entity {
                 }
             }
             p {
-                display: inline-block;
+                // display: inline-block;
                 margin: 0 0 0 1.5em;
                 text-indent: -1.5em;
 

src/Bundle/ChillMainBundle/Resources/public/lib/collection/index.js

@@ -50,7 +50,7 @@ var handleAdd = function(button) {
         empty_explain = collection.querySelector('li[data-collection-empty-explain]'),
         entry = document.createElement('li'),
         event = new CustomEvent('collection-add-entry', { detail: { collection: collection, entry: entry } }),
-        counter = collection.childNodes.length,
+        counter = collection.childNodes.length + parseInt(Math.random() * 1000000)
         content
         ;
     content = prototype.replace(new RegExp('__name__', 'g'), counter);

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);

src/Bundle/ChillMainBundle/Resources/public/page/workflow-show/index.js

@@ -3,7 +3,7 @@ import {ShowHide} from 'ChillMainAssets/lib/show_hide/show_hide.js';
 window.addEventListener('DOMContentLoaded', function() {
     let
         divTransitions = document.querySelector('#transitions'),
-        futureDestUsersContainer = document.querySelector('#futureDestUsers')
+        futureDestUsersContainer = document.querySelector('#futureDests')
     ;
 
     if (null !== divTransitions) {
@@ -67,24 +67,4 @@ window.addEventListener('DOMContentLoaded', function() {
         });
     }
 
-    // validate form
-    let form = document.querySelector('form[name="workflow_step"]');
-
-    if (form === null) {
-        console.error('form to validate not found');
-    }
-
-    form.addEventListener('submit', function (event) {
-        const datas = new FormData(event.target);
-
-        if (datas.has('workflow_step[future_dest_users]')) {
-            const dests = JSON.parse(datas.get('workflow_step[future_dest_users]'));
-            if (dests === null || (dests instanceof Array && dests.length === 0)) {
-                event.preventDefault();
-                console.log('no users!');
-                window.alert('Indiquez un utilisateur pour traiter la prochaine étape.');
-            }
-        }
-    });
-
 });

src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue

@@ -77,8 +77,7 @@ export default {
                return this.$refs.castPerson.$data.person;
             case 'thirdparty':
                let data = this.$refs.castThirdparty.$data.thirdparty;
-               data.name = data.text;
-               if (data.address !== null) {
+               if (data.address !== undefined && data.address !== null) {
                    data.address = { id: data.address.address_id }
                } else {
                    data.address = null;

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">
+         {{ buttonText }}<span v-if="isDead"> (‡)</span>
+      </span>
+   </a>
+   <a v-else class="btn btn-sm" target="_blank"
       :class="classAction"
       :title="$t(titleAction)"
       @click="openModal">
@@ -18,7 +18,8 @@
          @close="modal.showModal = false">
 
          <template v-slot:header>
-            <h3 class="modal-title">{{ $t(titleModal) }}</h3>
+            <h3 v-if="parent" class="modal-title">{{ $t(titleModal, {q: parent.text}) }}</h3>
+            <h3 v-else class="modal-title">{{ $t(titleModal) }}</h3>
          </template>
 
          <template v-slot:body v-if="type === 'person'">
@@ -29,10 +30,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,13 +45,22 @@
                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>
 
+         <template v-slot:body v-else-if="parent">
+            <on-the-fly-thirdparty
+               :parent="parent"
+               :action="action"
+               type="thirdparty"
+               ref="castThirdparty">
+            </on-the-fly-thirdparty>
+         </template>
+
          <template v-slot:body v-else>
             <on-the-fly-create
                :action="action"
@@ -83,6 +93,7 @@ import Modal from 'ChillMainAssets/vuejs/_components/Modal.vue';
 import OnTheFlyCreate from './Create.vue';
 import OnTheFlyPerson from 'ChillPersonAssets/vuejs/_components/OnTheFly/Person.vue';
 import OnTheFlyThirdparty from 'ChillThirdPartyAssets/vuejs/_components/OnTheFly/ThirdParty.vue';
+import { postThirdparty } from "ChillThirdPartyAssets/vuejs/_api/OnTheFly";
 
 export default {
    name: 'OnTheFly',
@@ -104,12 +115,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) {
@@ -119,6 +129,8 @@ export default {
                return 'btn-update';
             case 'create':
                return 'btn-create';
+            case 'addContact':
+               return 'btn-tpchild';
          }
       },
       titleAction() {
@@ -129,6 +141,8 @@ export default {
                return 'action.edit';
             case 'create':
                return 'action.create';
+            case 'addContact':
+               return 'action.addContact';
          }
       },
       titleCreate() {
@@ -146,6 +160,8 @@ export default {
                return 'onthefly.edit.' + this.type;
             case 'create':
                return this.titleCreate;
+            case 'addContact':
+               return 'onthefly.addContact.title';
          }
       },
       titleMessage() {
@@ -179,8 +195,8 @@ export default {
          this.modal.showModal = false;
       },
       openModal() {
-         //console.log('## OPEN ON THE FLY MODAL');
-         //console.log('## type:', this.type, ', action:', this.action);
+         // console.log('## OPEN ON THE FLY MODAL');
+         // console.log('## type:', this.type, ', action:', this.action);
          this.modal.showModal = true;
          this.$nextTick(function() {
             //this.$refs.search.focus();
@@ -190,7 +206,7 @@ export default {
          this.$data.action = action;
       },
       saveAction() {
-         console.log('saveAction button: create/edit action with', this.type);
+         // console.log('saveAction button: create/edit action with', this.type);
          let
             type = this.type,
             data = {} ;
@@ -202,17 +218,28 @@ export default {
 
             case 'thirdparty':
                data = this.$refs.castThirdparty.$data.thirdparty;
+               /* never executed ? */
                break;
 
             default:
-               if (typeof this.type === 'undefined') { // action=create
-                  type = this.$refs.castNew.radioType;
-                  data = this.$refs.castNew.castDataByType();
+               if (typeof this.type === 'undefined') { // action=create or addContact
+                   console.log('will rewrite data');
+                  if (this.action === 'addContact') {
+                     type = 'thirdparty'
+                     data = this.$refs.castThirdparty.$data.thirdparty;
+                     console.log('data original', data);
+                     data.parent = {type: "thirdparty", id: this.parent.id};
+                  } else {
+                     type = this.$refs.castNew.radioType;
+                     data = this.$refs.castNew.castDataByType();
+                     console.log(data)
+                  }
                } else {
                   throw 'error with object type';
                }
          }
-
+         console.log('type', type);
+         console.log('data', data);
          // pass datas to parent
          this.$emit('saveFormOnTheFly', { type: type, data: data });
       },
@@ -232,4 +259,8 @@ export default {
 a {
    cursor: pointer;
 }
+
+/* .btn-add-contact {
+   background-color: pink;
+} */
 </style>

src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/i18n.js

@@ -21,7 +21,13 @@ const ontheflyMessages = {
                 person: "un nouvel usager",
                 thirdparty: "un nouveau tiers professionnel"
             },
-            resource_comment_title: "Un commentaire est associé à cet interlocuteur"
+            addContact: {
+                title: "Créer un contact pour {q}"
+            },
+            resource_comment_title: "Un commentaire est associé à cet interlocuteur",
+            addContact: {
+                title: "Créer un contact pour {q}"
+            }
         }
     }
 }

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,5 @@ 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>

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;
       }
    }

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue

@@ -5,7 +5,7 @@
 
          <div>
             <div class="item-row col">
-               <h2>Workflow</h2>
+               <h2>{{ w.title }}</h2>
                <div class="flex-grow-1 ms-3 h3">
                   <div class="visually-hidden">
                      {{ w.relatedEntityClass }}

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue

@@ -12,6 +12,8 @@
       :relatedEntityClass="this.relatedEntityClass"
       :relatedEntityId="this.relatedEntityId"
       :workflowsAvailables="workflowsAvailables"
+      :preventDefaultMoveToGenerate="this.$props.preventDefaultMoveToGenerate"
+      :goToGenerateWorkflowPayload="this.goToGenerateWorkflowPayload"
       @go-to-generate-workflow="goToGenerateWorkflow"
    ></pick-workflow>
 
@@ -36,6 +38,7 @@
                :relatedEntityId="this.relatedEntityId"
                :workflowsAvailables="workflowsAvailables"
                :preventDefaultMoveToGenerate="this.$props.preventDefaultMoveToGenerate"
+               :goToGenerateWorkflowPayload="this.goToGenerateWorkflowPayload"
                @go-to-generate-workflow="this.goToGenerateWorkflow"
             ></pick-workflow>
          </template>
@@ -83,6 +86,10 @@ export default {
           required: false,
           default: false,
       },
+      goToGenerateWorkflowPayload: {
+         required: false,
+         default: {}
+      },
    },
     data() {
       return {
@@ -105,7 +112,7 @@ export default {
          this.modal.showModal = true;
       },
       goToGenerateWorkflow(data) {
-          console.log('go to generate workflow intercepted');
+          console.log('go to generate workflow intercepted', data);
           this.$emit('goToGenerateWorkflow', data);
       }
    },

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/PickWorkflow.vue

@@ -37,6 +37,10 @@ export default {
             required: false,
             default: false,
         },
+        goToGenerateWorkflowPayload: {
+            required: false,
+            default: {}
+        },
     },
     emits: ['goToGenerateWorkflow'],
     methods: {
@@ -51,7 +55,7 @@ export default {
                 window.location.assign(this.makeLink(workflowName));
             }
 
-            this.$emit('goToGenerateWorkflow', {event, workflowName, link: this.makeLink(workflowName)});
+            this.$emit('goToGenerateWorkflow', {event, workflowName, link: this.makeLink(workflowName), payload: this.goToGenerateWorkflowPayload});
         }
     }
 }

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

@@ -46,7 +46,8 @@ const messages = {
             person: "Quitter la page et ouvrir la fiche de l'usager",
             thirdparty: "Quitter la page et voir le tiers",
          },
-         refresh: 'Rafraîchir'
+         refresh: 'Rafraîchir',
+         addContact: 'Ajouter un contact'
       },
       nav: {
          next: "Suivant",