merge master into issue388

2025-08-20 22:53:49 +00:00 · 2022-02-22 12:47:56 +01:00
parent 736ca2272b 8f597eb254
commit 568c4b60ef
207 changed files with 3441 additions and 1525 deletions
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss
@@ -15,6 +15,7 @@ $chill-theme-buttons: (
   "action":        $chill-orange,
   "edit":          $chill-orange,
   "update":        $chill-orange,
+   "wopilink":      $chill-orange,
   "show":          $chill-blue,
   "view":          $chill-blue,
   "misc":          $gray-300,
@@ -54,6 +55,7 @@ $chill-theme-buttons: (
   &.btn-action,
   &.btn-edit,
   &.btn-tpchild,
+   &.btn-wopilink,
   &.btn-update {
       &, &:hover {
          color: $light;
@@ -66,6 +68,7 @@ $chill-theme-buttons: (
   &.btn-create::before,
   &.btn-edit::before,
   &.btn-update::before,
+   &.btn-wopilink::before,
   &.btn-show::before,
   &.btn-view::before,
   &.btn-save::before,
@@ -98,6 +101,7 @@ $chill-theme-buttons: (
   &.btn-create::before    { content: "\f067"; } // fa-plus
   &.btn-edit::before,
   &.btn-update::before    { content: "\f040"; } // fa-pencil
+   &.btn-wopilink::before  { content: "\f1dd"; } // fa-paragraph
   &.btn-show::before,
   &.btn-view::before      { content: "\f06e"; } // fa-eye
   &.btn-save::before      { content: "\f0c7"; } // fa-floppy-o
--- a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
@@ -17,7 +17,12 @@ function loadDynamicPicker(element) {
            isMultiple = parseInt(el.dataset.multiple) === 1,
            uniqId = el.dataset.uniqid,
            input = element.querySelector('[data-input-uniqid="'+ el.dataset.uniqid +'"]'),
-            picked = (isMultiple) ? (JSON.parse(input.value)) : ((input.value === '[]') ? (null) : ([JSON.parse(input.value)]));
+            picked = isMultiple ?
+                JSON.parse(input.value) : (
+                    (input.value === '[]' || input.value === '') ?
+                        null : [ JSON.parse(input.value) ]
+                )
+        ;

        if (!isMultiple) {
            if (input.value === '[]'){
--- a/src/Bundle/ChillMainBundle/Resources/public/module/wopi-link/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/wopi-link/index.js
@@ -4,20 +4,34 @@ import {_createI18n} from "ChillMainAssets/vuejs/_js/i18n";

 const i18n = _createI18n({});

+
+//TODO move to chillDocStore or ChillWopi
+
+/*
+
+tags to load module:
+
+<span data-module="wopi-link"
+    data-wopi-url="{{ path('chill_wopi_file_edit', {'fileId': document.uuid}) }}"
+    data-doc-type="{{ document.type|e('html_attr') }}"
+    data-options="{{ options|json_encode }}"
+        ></span>
+
+*/
+
 window.addEventListener('DOMContentLoaded', function (e) {
    document.querySelectorAll('span[data-module="wopi-link"]')
        .forEach(function (el) {
            createApp({
-                template: '<open-wopi-link :wopiUrl="wopiUrl" :title="title" :type="type" :button="button"></open-wopi-link>',
+                template: '<open-wopi-link :wopiUrl="wopiUrl" :type="type" :options="options"></open-wopi-link>',
                components: {
                    OpenWopiLink
                },
                data() {
                    return {
                        wopiUrl: el.dataset.wopiUrl,
-                        title: el.dataset.docTitle,
                        type: el.dataset.docType,
-                        button: el.dataset.button ? JSON.parse(el.dataset.button) : {}
+                        options: el.dataset.options !== 'null' ? JSON.parse(el.dataset.options) : {}
                    }
                }
            })
@@ -26,4 +40,4 @@ window.addEventListener('DOMContentLoaded', function (e) {
            ;
        })
    ;
-});
+});
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -260,8 +260,7 @@ export default {
            editPane: false,
            datePane: false,
            loading: false,
-            success: false,
-            dirty: false
+            success: false
         },
         errors: [],
         defaultz: {
@@ -537,17 +536,19 @@ export default {

      checkErrors() {
         this.errors = [];
-         if (this.flag.dirty) {
-            if (this.entity.selected.country === null) {
-               this.errors.push("Un pays doit être sélectionné.");
-            }
+         if (this.entity.selected.country === null) {
+            this.errors.push("Un pays doit être sélectionné.");
+         }
+         if (this.entity.selected.city === null) {
+            this.errors.push("Une ville doit être sélectionnée.");
+         } else {
            if (Object.keys(this.entity.selected.city).length === 0) {
               this.errors.push("Une ville doit être sélectionnée.");
            }
-            if (!this.entity.selected.isNoAddress) {
-               if (this.entity.selected.address.street === null || this.entity.selected.address.streetNumber === null) {
-                  this.errors.push("Une adresse doit être sélectionnée.");
-               }
+         }
+         if (!this.entity.selected.isNoAddress) {
+            if (this.entity.selected.address.street === null || this.entity.selected.address.street === '' || this.entity.selected.address.streetNumber === null || this.entity.selected.address.streetNumber === '') {
+               this.errors.push("Une adresse doit être sélectionnée.");
            }
         }
      },
@@ -567,7 +568,7 @@ export default {

         this.entity.selected.country = this.context.edit ? this.entity.address.country : {};
         this.entity.selected.postcode = this.context.edit ? this.entity.address.postcode : {};
-         this.entity.selected.city = {};
+         this.entity.selected.city = this.context.edit ? this.entity.address.postcode : {};

         this.entity.selected.address = {};
         this.entity.selected.address.street = this.context.edit ? this.entity.address.street: null;
@@ -583,6 +584,8 @@ export default {
         this.entity.selected.writeNew.address = this.context.edit && this.entity.address.addressReference === null && this.entity.address.street.length > 0
         this.entity.selected.writeNew.postcode = false // NB: this used to be this.context.edit, but think it was erroneous;
         console.log('!! just set writeNew.postcode to', this.entity.selected.writeNew.postcode);
+
+         this.checkErrors();
      },

      /*
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
@@ -111,11 +111,9 @@ export default {
         this.entity.selected.address.streetNumber = value.streetNumber;
         this.entity.selected.writeNew.address = false;
         this.updateMapCenter(value.point);
-         this.flag.dirty = true;
         this.checkErrors();
      },
      remove() {
-         this.flag.dirty = true;
         this.entity.selected.address = {};
         this.checkErrors();
      },
@@ -158,7 +156,6 @@ export default {
            this.entity.selected.address.street = addr.street;
            this.entity.selected.address.streetNumber = addr.number;
            this.entity.selected.writeNew.address = true;
-            this.flag.dirty = true;
            this.checkErrors();
         }
      },
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
@@ -125,11 +125,9 @@ export default {
         if (value.center) {
            this.updateMapCenter(value.center);
         }
-         this.flag.dirty = true;
         this.checkErrors();
      },
      remove() {
-         this.flag.dirty = true;
         this.entity.selected.city = {};
         this.checkErrors();
      },
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue
@@ -51,7 +51,6 @@ export default {
      init() {
         if (this.value !== undefined) {
            this.selectCountry(this.value);
-            this.flag.dirty = false;
         }
      },
      selectCountryByCode(countryCode) {
@@ -67,7 +66,6 @@ export default {
         this.checkErrors();
      },
      remove() {
-         this.flag.dirty = true;
         this.entity.selected.country = null;
         this.checkErrors();
      },
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
@@ -157,6 +157,7 @@ export default {
         set(value) {
            console.log('isNoAddress value', value);
            this.entity.selected.isNoAddress = value;
+            this.checkErrors();
         },
         get() {
            return this.entity.selected.isNoAddress;
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue
@@ -1,7 +1,7 @@
 <template>
-   
+
   <h2>{{ $t('main_title') }}</h2>
-   
+
   <ul class="nav nav-tabs">
      <li class="nav-item">
         <a class="nav-link"
@@ -23,7 +23,6 @@
            :class="{'active': activeTab === 'MyAccompanyingCourses'}"
            @click="selectTab('MyAccompanyingCourses')">
            {{ $t('my_accompanying_courses.tab') }}
-            <tab-counter :count="state.accompanyingCourses.count"></tab-counter>
         </a>
      </li>
      <li class="nav-item">
@@ -51,11 +50,19 @@
            <tab-counter :count="state.tasks.alert.count"></tab-counter>
         </a>
      </li>
+      <li class="nav-item">
+         <a class="nav-link"
+            :class="{'active': activeTab === 'MyWorkflows'}"
+            @click="selectTab('MyWorkflows')">
+            {{ $t('my_workflows.tab') }}
+            <tab-counter :count="state.workflows.count"></tab-counter>
+         </a>
+      </li>
      <li class="nav-item loading ms-auto py-2" v-if="loading">
         <i class="fa fa-circle-o-notch fa-spin fa-lg text-chill-gray" :title="$t('loading')"></i>
      </li>
   </ul>
-   
+
   <div class="my-4">
      <my-customs
         v-if="activeTab === 'MyCustoms'">
@@ -75,6 +82,9 @@
      <my-notifications
         v-else-if="activeTab === 'MyNotifications'">
      </my-notifications>
+      <my-workflows
+         v-else-if="activeTab === 'MyWorkflows'">
+      </my-workflows>
   </div>
 </template>

@@ -85,6 +95,7 @@ import MyEvaluations from './MyEvaluations';
 import MyTasks from './MyTasks';
 import MyAccompanyingCourses from './MyAccompanyingCourses';
 import MyNotifications from './MyNotifications';
+import MyWorkflows from './MyWorkflows.vue';
 import TabCounter from './TabCounter';
 import { mapState } from "vuex";

@@ -95,6 +106,7 @@ export default {
      MyWorks,
      MyEvaluations,
      MyTasks,
+      MyWorkflows,
      MyAccompanyingCourses,
      MyNotifications,
      TabCounter,
@@ -126,6 +138,7 @@ export default {
         'MyWorks',
         'MyEvaluations',
         'MyTasks',
+         'MyWorkflows',
      ]) {
         this.$store.dispatch('getByTab', { tab: m, param: "countOnly=1" });
      }
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyAccompanyingCourses.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyAccompanyingCourses.vue
@@ -32,7 +32,7 @@
               </span>
            </td>
            <td>
-               <span v-if="c.emergency" class="badge rounded-pill bg-danger">{{ $t('emergency') }}</span>
+               <span v-if="c.emergency" class="badge rounded-pill bg-danger me-1">{{ $t('emergency') }}</span>
               <span v-if="c.confidential" class="badge rounded-pill bg-danger">{{ $t('confidential') }}</span>
            </td>
            <td>
@@ -80,5 +80,7 @@ export default {
 </script>

 <style scoped>
-
+span.badge.rounded-pill.bg-danger {
+   text-transform: uppercase;
+}
 </style>
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue
@@ -17,7 +17,8 @@
                  <a :href="getNotificationUrl(n)">{{ n.title }}</a>
               </span>
            </td>
-            <td>{{ n.sender.text }}</td>
+            <td v-if="n.sender != null">{{ n.sender.text }}</td>
+            <td v-else>{{ $t('automatic_notification')}}</td>
            <td>
               <a class="btn btn-sm btn-show"
                  :href="getEntityUrl(n)">
@@ -65,6 +66,8 @@ export default {
               return appMessages.fr.the_activity;
            case 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod':
               return appMessages.fr.the_course;
+            case 'Chill\\MainBundle\\Entity\\Workflow\\EntityWorkflow':
+               return appMessages.fr.the_workflow;
            default:
               throw 'notification type unknown';
         }
@@ -75,6 +78,8 @@ export default {
               return `/fr/activity/${n.relatedEntityId}/show`
            case 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod':
               return `/fr/parcours/${n.relatedEntityId}`
+            case 'Chill\\MainBundle\\Entity\\Workflow\\EntityWorkflow':
+               return `/fr/main/workflow/${n.relatedEntityId}/show`
            default:
               throw 'notification type unknown';
         }
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorkflows.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorkflows.vue
@@ -0,0 +1,88 @@
+<template>
+
+<div class="alert alert-light">{{ $t('my_workflows.description') }}</div>
+<span v-if="noResults" class="chill-no-data-statement">{{ $t('no_data') }}</span>
+<tab-table v-else>
+    <template v-slot:thead>
+        <th scope="col">{{ $t('Object_workflow') }}</th>
+        <th scope="col">{{ $t('Step') }}</th>
+        <th scope="col">{{ $t('concerned_users') }}</th>
+        <th scope="col"></th>
+    </template>
+    <template v-slot:tbody>
+        <tr v-for="(w, i) in workflows.results" :key="`workflow-${i}`">
+            <td>{{ w.title }}</td>
+            <td>
+                <div class="workflow">
+                    <div class="breadcrumb">
+                        <i class="fa fa-circle me-1 text-chill-yellow mx-2"></i>
+                        <span class="mx-2">{{ getStep(w) }}</span>
+                    </div>
+                </div>
+            </td>
+            <td v-if="w.datas.persons !== null">
+                <span v-for="p in w.datas.persons" class="me-1" :key="p.id">
+                    <on-the-fly
+                        :type="p.type"
+                        :id="p.id"
+                        :buttonText="p.textAge"
+                        :displayBadge="'true' === 'true'"
+                        action="show">
+                    </on-the-fly>
+                </span>
+            </td>
+            <td>
+            <a class="btn btn-sm btn-show" :href="getUrl(w)">
+                {{ $t('show_entity', { entity: $t('the_workflow') }) }}
+            </a>
+            </td>
+        </tr>
+    </template>
+</tab-table>
+
+</template>
+
+<script>
+import { mapState, mapGetters } from "vuex";
+import TabTable from "./TabTable";
+import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly';
+
+export default {
+    name: "MyWorkflows",
+    components: {
+        TabTable,
+        OnTheFly
+    },
+    computed: {
+        ...mapState([
+            'workflows',
+        ]),
+        ...mapGetters([
+            'isWorkflowsLoaded',
+        ]),
+        noResults() {
+            if (!this.isWorkflowsLoaded) {
+                return false;
+            } else {
+                return this.workflows.count === 0;
+            }
+        },
+    },
+    methods: {
+        getUrl(w) {
+            return `/fr/main/workflow/${w.id}/show`;
+        },
+        getStep(w) {
+            const lastStep = w.steps.length - 1
+            return w.steps[lastStep].currentStep.text;
+        }
+    },
+}
+</script>
+
+<style scoped>
+span.outdated {
+    font-weight: bold;
+    color: var(--bs-warning);
+}
+</style>
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js
@@ -22,6 +22,10 @@ const appMessages = {
            tab: "Mes notifications",
            description: "Liste des notifications reçues et non lues.",
        },
+        my_workflows: {
+            tab: "Mes workflows",
+            description: "Liste des workflows en attente d'une action."
+        },
        opening_date: "Date d'ouverture",
        social_issues: "Problématiques sociales",
        concerned_persons: "Usagers concernés",
@@ -33,12 +37,16 @@ const appMessages = {
        From: "Expéditeur",
        Subject: "Objet",
        Entity: "Associé à",
+        Step: "Étape",
+        concerned_users: "Usagers concernés",
+        Object_workflow: "Objet du workflow",
        show_entity: "Voir {entity}",
        the_activity: "l'échange",
        the_course: "le parcours",
        the_action: "l'action",
        the_evaluation: "l'évaluation",
        the_task: "la tâche",
+        the_workflow: "le workflow",
        StartDate: "Date d'ouverture",
        SocialAction: "Action d'accompagnement",
        no_data: "Aucun résultats",
@@ -50,7 +58,10 @@ const appMessages = {
            assignated_evaluations: "{n} évaluation assignée | {n} évaluations assignées",
            alert_tasks: "{n} tâche en rappel | {n} tâches en rappel",
            warning_tasks: "{n} tâche à échéance | {n} tâches à échéance",
-        }
+        },
+        emergency: "Urgent",
+        confidential: "Confidentiel",
+        automatic_notification: "Notification automatique"
    }
 };

@@ -58,4 +69,4 @@ Object.assign(appMessages.fr);

 export {
    appMessages
-};
+};
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/store.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/store.js
@@ -1,12 +1,6 @@
 import 'es6-promise/auto';
 import { createStore } from 'vuex';
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
-import MyCustoms from "../MyCustoms";
-import MyWorks from "../MyWorks";
-import MyEvaluations from "../MyEvaluations";
-import MyTasks from "../MyTasks";
-import MyAccompanyingCourses from "../MyAccompanyingCourses";
-import MyNotifications from "../MyNotifications";

 const debug = process.env.NODE_ENV !== 'production';

@@ -27,6 +21,7 @@ const store = createStore({
        },
        accompanyingCourses: {},
        notifications: {},
+        workflows: {},
        errorMsg: [],
        loading: false
    },
@@ -49,6 +44,9 @@ const store = createStore({
        isNotificationsLoaded(state) {
            return !isEmpty(state.notifications);
        },
+        isWorkflowsLoaded(state) {
+            return !isEmpty(state.workflows);
+        },
        counter(state) {
            return {
                works: state.works.count,
@@ -57,6 +55,7 @@ const store = createStore({
                tasksAlert: state.tasks.alert.count,
                accompanyingCourses: state.accompanyingCourses.count,
                notifications: state.notifications.count,
+                workflows: state.workflows.count
            }
        }
    },
@@ -85,6 +84,9 @@ const store = createStore({
            //console.log('addNotifications', notifications);
            state.notifications = notifications;
        },
+        addWorkflows(state, workflows) {
+            state.workflows = workflows;
+        },
        setLoading(state, bool) {
            state.loading = bool;
        },
@@ -180,14 +182,30 @@ const store = createStore({
                        const url = `/api/1.0/main/notification/my/unread${'?'+ param}`;
                        makeFetch('GET', url)
                            .then((response) => {
+                                console.log('notifications', response)
                                commit('addNotifications', response);
                                commit('setLoading', false);
                            })
                            .catch((error) => {
                                commit('catchError', error);
                                throw error;
-                            })
-                        ;
+                            });
+                    }
+                    break;
+                case 'MyWorkflows':
+                    if (!getters.isWorflowsLoaded) {
+                        commit('setLoading', true);
+                        const url = '/api/1.0/main/workflow/my';
+                        makeFetch('GET', url)
+                        .then((response) => {
+                            console.log('workflows', response)
+                            commit('addWorkflows', response);
+                            commit('setLoading', false);
+                        })
+                        .catch((error) => {
+                            commit('catchError', error);
+                            throw error;
+                        });
                    }
                    break;
                default:
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue
@@ -1,6 +1,6 @@
 <template>
   <ul class="nav nav-tabs">
-      <li class="nav-item">
+      <li v-if="allowedTypes.includes('person')" class="nav-item">
         <a class="nav-link" :class="{ active: isActive('person') }">
            <label for="person">
               <input type="radio" name="person" id="person" v-model="radioType" value="person">
@@ -8,7 +8,7 @@
            </label>
         </a>
      </li>
-      <li class="nav-item">
+      <li v-if="allowedTypes.includes('thirdparty')" class="nav-item">
         <a class="nav-link" :class="{ active: isActive('thirdparty') }">
            <label for="thirdparty">
               <input type="radio" name="thirdparty" id="thirdparty" v-model="radioType" value="thirdparty">
@@ -21,14 +21,16 @@
   <div class="my-4">
      <on-the-fly-person
         v-if="type === 'person'"
-         v-bind:action="action"
+         :action="action"
+         :query="query"
         ref="castPerson"
      >
      </on-the-fly-person>

      <on-the-fly-thirdparty
         v-if="type === 'thirdparty'"
-         v-bind:action="action"
+         :action="action"
+         :query="query"
         ref="castThirdparty"
      >
      </on-the-fly-thirdparty>
@@ -38,18 +40,17 @@
 <script>
 import OnTheFlyPerson from 'ChillPersonAssets/vuejs/_components/OnTheFly/Person.vue';
 import OnTheFlyThirdparty from 'ChillThirdPartyAssets/vuejs/_components/OnTheFly/ThirdParty.vue';
-import { postPerson } from "ChillPersonAssets/vuejs/_api/OnTheFly";

 export default {
   name: "OnTheFlyCreate",
-   props: ['action'],
+   props: ['action', 'allowedTypes', 'query'],
   components: {
      OnTheFlyPerson,
      OnTheFlyThirdparty
   },
   data() {
      return {
-         type: 'person' //by default
+         type: null
      }
   },
   computed: {
@@ -61,7 +62,10 @@ export default {
         get() {
            return this.type;
         }
-      }
+      },
+   },
+   mounted() {
+      this.type = (this.allowedTypes.length === 1 && this.allowedTypes.includes('thirdparty')) ? 'thirdparty' : 'person'
   },
   methods: {
      isActive(tab) {
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
@@ -54,6 +54,8 @@
         <template v-slot:body v-else>
            <on-the-fly-create
               :action="action"
+               :allowedTypes="allowedTypes"
+               :query="query"
               ref="castNew">
            </on-the-fly-create>
         </template>
@@ -90,7 +92,7 @@ export default {
      OnTheFlyThirdparty,
      OnTheFlyCreate
   },
-   props: ['type', 'id', 'action', 'buttonText', 'displayBadge', 'isDead', 'parent', 'canCloseModal'],
+   props: ['type', 'id', 'action', 'buttonText', 'displayBadge', 'isDead', 'parent', 'allowedTypes', 'query'],
   emits: ['saveFormOnTheFly'],
   data() {
      return {
@@ -129,6 +131,13 @@ export default {
               return 'action.create';
         }
      },
+      titleCreate() {
+         return this.allowedTypes.every(t => t === 'person')
+            ? 'onthefly.create.title.person'
+            : this.allowedTypes.every(t => t === 'thirdparty')
+               ? 'onthefly.create.title.thirdparty'
+               : 'onthefly.create.title.default'
+      },
      titleModal() {
         switch (this.action) {
            case 'show':
@@ -136,7 +145,7 @@ export default {
            case 'edit':
               return 'onthefly.edit.' + this.type;
            case 'create':
-               return 'onthefly.create.title';
+               return this.titleCreate;
         }
      },
      titleMessage() {
@@ -160,17 +169,10 @@ export default {
      },
      badgeType() {
         return 'entity-' + this.type + ' badge-' + this.type;
-      }
-   },
-   watch: {
-      canCloseModal: {
-         handler: function(val, oldVal) {
-            if (val) {
-               this.closeModal();
-            }
-         },
-         deep: true
-      }
+      },
+      getReturnPath() {
+         return `?returnPath=${window.location.pathname}${window.location.search}${window.location.hash}`;
+      },
   },
   methods: {
      closeModal() {
@@ -217,9 +219,9 @@ export default {
      buildLocation(id, type) {
         if (type === 'person') {
            // TODO i18n
-            return `/fr/person/${id}/general`;
+            return encodeURI(`/fr/person/${id}/general${this.getReturnPath}`);
         } else if (type === 'thirdparty') {
-            return `/fr/3party/3party/${id}/view`;
+            return encodeURI(`/fr/3party/3party/${id}/view${this.getReturnPath}`);
         }
      }
   }
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/i18n.js
@@ -9,11 +9,15 @@ const ontheflyMessages = {
            },
            edit: {
                person: "Modifier un usager",
-                thirdparty: "Modifier un tiers"
+                thirdparty: "Modifier un tiers",
            },
            create: {
                button: "Créer \"{q}\"",
-                title: "Création d'un nouvel usager ou d'un tiers professionnel",
+                title: {
+                    default: "Création d'un nouvel usager ou d'un tiers professionnel",
+                    person: "Création d'un nouvel usager",
+                    thirdparty: "Création d'un nouveau tiers professionnel",
+                },
                person: "un nouvel usager",
                thirdparty: "un nouveau tiers professionnel"
            },
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
@@ -5,8 +5,8 @@
        </li>
    </ul>
    <ul class="record_actions">
-        <li>
-            <AddPersons
+        <li class="add-persons">
+            <add-persons
                :options="addPersonsOptions"
                :key="uniqid"
                :buttonTitle="translatedListOfTypes"
@@ -14,7 +14,7 @@
                ref="addPersons"
                @addNewPersons="addNewEntity"
            >
-            </AddPersons>
+            </add-persons>
        </li>
    </ul>
 </template>
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/i18n.js
@@ -1,4 +1,7 @@
 import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n';
+import { thirdpartyMessages } from 'ChillThirdPartyAssets/vuejs/_js/i18n';
+import { addressMessages } from 'ChillMainAssets/vuejs/Address/i18n';
+import { ontheflyMessages } from 'ChillMainAssets/vuejs/OnTheFly/i18n';

 const appMessages = {
    fr: {
@@ -12,6 +15,6 @@ const appMessages = {
    }
 }

-Object.assign(appMessages.fr, personMessages.fr);
+Object.assign(appMessages.fr, personMessages.fr, thirdpartyMessages.fr, addressMessages.fr, ontheflyMessages.fr );

 export { appMessages };
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
@@ -42,57 +42,11 @@
                  class="street">
                  {{ address.text }}
               </p>
-               <p v-if="address.postcode"
-                  class="postcode">
-                  {{ address.postcode.code }} {{ address.postcode.name }}
-               </p>
-               <p v-if="address.country"
-                  class="country">
-                  {{ address.country.name.fr }}
-               </p>
            </div>
         </div>

      </component>

-      <!-- <div v-if="isMultiline === true" class="address-more">
-         <div v-if="address.floor">
-            <span class="floor">
-               <b>{{ $t('floor') }}</b>: {{ address.floor }}
-            </span>
-         </div>
-         <div v-if="address.corridor">
-            <span class="corridor">
-               <b>{{ $t('corridor') }}</b>: {{ address.corridor }}
-            </span>
-         </div>
-         <div v-if="address.steps">
-            <span class="steps">
-               <b>{{ $t('steps') }}</b>: {{ address.steps }}
-            </span>
-         </div>
-         <div v-if="address.flat">
-            <span class="flat">
-               <b>{{ $t('flat') }}</b>: {{ address.flat }}
-            </span>
-         </div>
-         <div v-if="address.buildingName">
-               <span class="buildingName">
-                  <b>{{ $t('buildingName') }}</b>: {{ address.buildingName }}
-               </span>
-         </div>
-         <div v-if="address.extra">
-               <span class="extra">
-                  <b>{{ $t('extra') }}</b>: {{ address.extra }}
-               </span>
-         </div>
-         <div v-if="address.distribution">
-               <span class="distribution">
-                  <b>{{ $t('distribution') }}</b>: {{ address.distribution }}
-               </span>
-         </div>
-      </div> -->
-
      <div v-if="useDatePane === true" class="address-more">
         <div v-if="address.validFrom">
            <span class="validFrom">
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OpenWopiLink.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OpenWopiLink.vue
@@ -1,12 +1,14 @@
 <template>
   <a v-if="isOpenDocument"
-      class="btn change-icon" :class="[isChangeClass ? button.changeClass : 'btn-edit']"
+      class="btn" :class="[
+         isChangeIcon ? 'change-icon' : '',
+         isChangeClass ? options.changeClass : 'btn-wopilink' ]"
      @click="openModal">
      
-      <i class="fa me-2" :class="[isChangeIcon ? button.changeIcon : 'fa-pencil']"></i>
+      <i v-if="isChangeIcon" class="fa me-2" :class="options.changeIcon"></i>
      
      <span v-if="!noText">
-         {{ $t('Update_document') }}
+         {{ $t('online_edit_document') }}
      </span>
   </a>
   
@@ -20,12 +22,14 @@
            <template v-slot:header>
               <img class="logo" :src="logo" height="45"/>
                  <span class="ms-auto me-3">
-                     {{ this.title }}
+                     <span v-if="options.title">{{ options.title }}</span>
                  </span>
+                  <!--
                  <a class="btn btn-outline-light">
                     <i class="fa fa-save fa-fw"></i>
                     {{ $t('save_and_quit') }}
                  </a>
+                  -->
            </template>
            
            <template v-slot:body>
@@ -71,15 +75,11 @@ export default {
         type: String,
         required: true
      },
-      title: {
-         type: String,
-         required: true
-      },
      type: {
         type: String,
         required: true
      },
-      button: {
+      options: {
         type: Object,
         required: false
      }
@@ -175,20 +175,20 @@ export default {
         return false;
      },
      noText() {
-         if (typeof this.button.noText !== 'undefined') {
-            return this.button.noText === true;
+         if (typeof this.options.noText !== 'undefined') {
+            return this.options.noText === true;
         }
         return false;
      },
      isChangeIcon() {
-         if (typeof this.button.changeIcon !== 'undefined') {
-            return (!(this.button.changeIcon === null || this.button.changeIcon === ''))
+         if (typeof this.options.changeIcon !== 'undefined') {
+            return (!(this.options.changeIcon === null || this.options.changeIcon === ''))
         }
         return false;
      },
      isChangeClass() {
-         if (typeof this.button.changeClass !== 'undefined') {
-            return (!(this.button.changeClass === null || this.button.changeClass === ''))
+         if (typeof this.options.changeClass !== 'undefined') {
+            return (!(this.options.changeClass === null || this.options.changeClass === ''))
         }
         return false;
      }
@@ -205,7 +205,7 @@ export default {
   i18n: {
      messages: {
         fr: {
-            Update_document: "Modifier le document",
+            online_edit_document: "Éditer en ligne",
            save_and_quit: "Enregistrer et quitter",
            loading: "Chargement de l'éditeur en ligne",
            invalid_title: "Format incompatible",
--- a/src/Bundle/ChillMainBundle/Resources/views/OnTheFly/_insert_vue_onthefly.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/OnTheFly/_insert_vue_onthefly.html.twig
@@ -11,7 +11,6 @@
    * 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)
-    * isDead        boolean (default: false)  is the person dead

 #}
 <span class="onthefly-container"
@@ -29,10 +28,6 @@
        data-button-text="{{ buttonText|e('html_attr') }}"
    {% endif %}

-    {% if isDead is defined and isDead == 1  %}
-        data-is-dead="true"
-    {% endif %}
-
    {% if displayBadge is defined and displayBadge == 1 %}
        data-display-badge="true"
    {% endif %}
--- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/index.html.twig
@@ -6,7 +6,6 @@

 {% block js %}
    {{ parent() }}
-    
    {{ encore_entry_script_tags('mod_async_upload') }}
    {{ encore_entry_script_tags('mod_pickentity_type') }}
    {{ encore_entry_script_tags('mod_entity_workflow_subscribe') }}