From eebe1d669a815a39065b45f1be1146ee7243f495 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 21 Mar 2022 12:39:33 +0100
Subject: [PATCH 1/6] first commit

---
 .../ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue  | 3 +++
 .../ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
index 812d2e5fd..7d07c5514 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
@@ -5,6 +5,9 @@
    <teleport to="#visgraph-legend">
       <div class="post-menu">
          <div class="list-group mt-4">
+            <button type="button" class="list-group-item list-group-item-action btn btn-create">
+               {{ $t('visgraph.add_person') }}
+            </button>
             <button type="button" class="list-group-item list-group-item-action btn btn-create" @click="createRelationship">
                {{ $t('visgraph.add_link') }}
             </button>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
index f0eb331a6..bf9d894d5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
@@ -21,6 +21,7 @@ const visMessages = {
             between: "entre",
             and: "et",
             add_link: "Créer un lien de filiation",
+            add_person: "Ajouter une personne",
             create_link_help: "Pour créer un lien de filiation, cliquez d'abord sur un usager, puis sur un second ; précisez ensuite la nature du lien dans le formulaire d'édition.",
             refresh: "Rafraîchir",
             screenshot: "Prendre une photo",

From c7caa2ba7677f49e87bfd7e815785832eeeddef8 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 21 Mar 2022 16:13:02 +0100
Subject: [PATCH 2/6] addpersons component, doesnt hear emitted event...

---
 .../Resources/public/vuejs/VisGraph/App.vue   | 45 ++++++++++++++++---
 1 file changed, 40 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
index 7d07c5514..e0f8e7f3c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
@@ -5,9 +5,6 @@
    <teleport to="#visgraph-legend">
       <div class="post-menu">
          <div class="list-group mt-4">
-            <button type="button" class="list-group-item list-group-item-action btn btn-create">
-               {{ $t('visgraph.add_person') }}
-            </button>
             <button type="button" class="list-group-item list-group-item-action btn btn-create" @click="createRelationship">
                {{ $t('visgraph.add_link') }}
             </button>
@@ -116,7 +113,16 @@
          </template>
       </modal>
    </teleport>
-
+   <div style="float: right;">
+      <add-persons
+         buttonTitle="visgraph.add_person"
+         modalTitle="visgraph.add_person"
+         v-bind:key="addPersons.key"
+         v-bind:options="addPersons.options"
+         @addNewPersons="addNewPersons"
+         ref="addPersons">
+      </add-persons>
+   </div>
 </template>
 
 <script>
@@ -127,12 +133,14 @@ import VueMultiselect from 'vue-multiselect'
 import { getRelationsList, postRelationship, patchRelationship, deleteRelationship } from "./api"
 import { splitId, getAge } from "./vis-network"
 import { visMessages } from "./i18n";
+import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
 
 export default {
    name: "App",
    components: {
       Modal,
-      VueMultiselect
+      VueMultiselect,
+      AddPersons
    },
    props: ['household_id'],
    data() {
@@ -162,8 +170,34 @@ export default {
          },
          canvas: null,
          link: null,
+         addPersons: {
+            key: 'filiation',
+            options: {
+               type: ['person'],
+               priority: null,
+               uniq: false,
+            }
+         }
       }
    },
+   methods: {
+      addNewPersons({ selected, modal }) {
+         console.log('@@@ CLICK button addNewPersons', selected);
+         // selected.forEach(function(item) {
+         //       this.$store.dispatch('addPerson', item)
+         //          .catch(({name, violations}) => {
+         //             if (name === 'ValidationException' || name === 'AccessException') {
+         //                violations.forEach((violation) => this.$toast.open({message: violation}));
+         //             } else {
+         //                this.$toast.open({message: violations})
+         //             }
+         //          });
+         //    }, this
+         // );
+         // this.$refs.addPersons.resetSearch(); // to cast child method
+         // modal.showModal = false;
+      },
+   },
    computed: {
       ...mapGetters(['nodes', 'edges',
          // not used 'isInWhitelist', 'isHouseholdLoading', 'isCourseLoaded', 'isRelationshipLoaded', 'isPersonLoaded', 'isExcludedNode', 'countLinksByNode', 'getParticipationsByCourse', 'getMembersByHousehold', 'getPersonsGroup',
@@ -238,6 +272,7 @@ export default {
       this.initGraph()
       this.listenOnGraph()
       this.getRelationsList()
+      console.log(this.persons);
 
       this.canvas = document.getElementById('visgraph').querySelector('canvas')
       this.link = document.getElementById('exportCanvasBtn')

From 8d5c66dc408e825bf453117a4ee96ee6f6f7a15e Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 22 Mar 2022 15:49:25 +0100
Subject: [PATCH 3/6] person can be added to filiation graph and relationship
 created

---
 .../Resources/public/vuejs/VisGraph/App.vue   | 35 +++++++++----------
 .../Resources/public/vuejs/VisGraph/i18n.js   |  6 ++++
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
index e0f8e7f3c..e671ce7ad 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
@@ -180,24 +180,6 @@ export default {
          }
       }
    },
-   methods: {
-      addNewPersons({ selected, modal }) {
-         console.log('@@@ CLICK button addNewPersons', selected);
-         // selected.forEach(function(item) {
-         //       this.$store.dispatch('addPerson', item)
-         //          .catch(({name, violations}) => {
-         //             if (name === 'ValidationException' || name === 'AccessException') {
-         //                violations.forEach((violation) => this.$toast.open({message: violation}));
-         //             } else {
-         //                this.$toast.open({message: violations})
-         //             }
-         //          });
-         //    }, this
-         // );
-         // this.$refs.addPersons.resetSearch(); // to cast child method
-         // modal.showModal = false;
-      },
-   },
    computed: {
       ...mapGetters(['nodes', 'edges',
          // not used 'isInWhitelist', 'isHouseholdLoading', 'isCourseLoaded', 'isRelationshipLoaded', 'isPersonLoaded', 'isExcludedNode', 'countLinksByNode', 'getParticipationsByCourse', 'getMembersByHousehold', 'getPersonsGroup',
@@ -278,7 +260,22 @@ export default {
       this.link = document.getElementById('exportCanvasBtn')
    },
    methods: {
-
+      addNewPersons({ selected, modal }) {
+         // console.log('@@@ CLICK button addNewPersons', selected);
+         selected.forEach(function(item) {
+               this.$store.dispatch('addPerson', item.result)
+                  .catch(({name, violations}) => {
+                     if (name === 'ValidationException' || name === 'AccessException') {
+                        violations.forEach((violation) => this.$toast.open({message: violation}));
+                     } else {
+                        this.$toast.open({message: violations})
+                     }
+                  });
+            }, this
+         );
+         this.$refs.addPersons.resetSearch(); // to cast child method
+         modal.showModal = false;
+      },
       initGraph() {
          this.container = document.getElementById('visgraph')
          // Instanciate vis objects in separate window variables, see vis-network.js
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
index bf9d894d5..5172d8074 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
@@ -1,5 +1,11 @@
 const visMessages = {
     fr: {
+        add_persons: {
+            title: "Ajouter des usagers",
+            suggested_counter: "Pas de résultats | 1 résultat | {count} résultats",
+            selected_counter: " 1 sélectionné | {count} sélectionnés",
+            search_some_persons: "Rechercher des personnes..",
+        },
         visgraph: {
             Course: 'Parcours',
             Household: 'Ménage',

From 4939c8c8e4f9ff17c6724d23dffb4d2bd9e54400 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 22 Mar 2022 15:50:31 +0100
Subject: [PATCH 4/6] changelog updated

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e74bd2abe..0d6c1c831 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,7 @@ and this project adheres to
 * [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
 * [thirdparty] Thirdparty view page, english text translated (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/534)
 * [social_action] Translation changed in evaluation section (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/512)
+* [filiation] Possible to add person (or create onthefly) to add to filiation graph + add relation (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/519)
 
 ## Test releases
 

From 98d5de29b02d89999713f046614c436ff7151c5a Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 22 Mar 2022 16:09:03 +0100
Subject: [PATCH 5/6] translations added

---
 .../Resources/public/vuejs/VisGraph/i18n.js   | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
index 5172d8074..cee841d0c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
@@ -34,6 +34,41 @@ const visMessages = {
             choose_relation: "Choisissez le lien de parenté",
             relationship_household: "Filiation du ménage",
         },
+        item: {
+            type_person: "Usager",
+            type_user: "TMS",
+            type_thirdparty: "Tiers professionnel",
+            type_household: "Ménage"
+        },
+        person: {
+            firstname: "Prénom",
+            lastname: "Nom",
+            born: (ctx) => {
+                if (ctx.gender === 'man') {
+                    return 'Né le';
+                } else if (ctx.gender === 'woman') {
+                    return 'Née le';
+                } else {
+                    return 'Né·e le';
+                }
+            },
+            center_id: "Identifiant du centre",
+            center_type: "Type de centre",
+            center_name: "Territoire", // vendée
+            phonenumber: "Téléphone",
+            mobilenumber: "Mobile",
+            altnames: "Autres noms",
+            email: "Courriel",
+            gender: {
+                title: "Genre",
+                placeholder: "Choisissez le genre de l'usager",
+                woman: "Féminin",
+                man: "Masculin",
+                neuter: "Neutre, non binaire",
+                undefined: "Non renseigné"
+            }
+        },
+        error_only_one_person: "Une seule personne peut être sélectionnée !",
         edit: 'Éditer',
         del: 'Supprimer',
         back: 'Revenir en arrière',

From 2e336ac87451fffb472161ec7dd44a7c08070e9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 24 Mar 2022 15:07:46 +0100
Subject: [PATCH 6/6] update case when the person was already on the graph

---
 .../Resources/public/vuejs/VisGraph/App.vue   | 24 +++++----
 .../Resources/public/vuejs/VisGraph/store.js  | 53 +++++++++++++++++--
 .../public/vuejs/VisGraph/vis-network.js      | 10 +---
 3 files changed, 65 insertions(+), 22 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
index e671ce7ad..f5db187b9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
@@ -113,16 +113,18 @@
          </template>
       </modal>
    </teleport>
-   <div style="float: right;">
-      <add-persons
-         buttonTitle="visgraph.add_person"
-         modalTitle="visgraph.add_person"
-         v-bind:key="addPersons.key"
-         v-bind:options="addPersons.options"
-         @addNewPersons="addNewPersons"
-         ref="addPersons">
-      </add-persons>
-   </div>
+   <ul class="record_actions sticky-form-buttons">
+     <li>
+       <add-persons
+           buttonTitle="visgraph.add_person"
+           modalTitle="visgraph.add_person"
+           v-bind:key="addPersons.key"
+           v-bind:options="addPersons.options"
+           @addNewPersons="addNewPersons"
+           ref="addPersons">
+       </add-persons>
+     </li>
+   </ul>
 </template>
 
 <script>
@@ -263,7 +265,7 @@ export default {
       addNewPersons({ selected, modal }) {
          // console.log('@@@ CLICK button addNewPersons', selected);
          selected.forEach(function(item) {
-               this.$store.dispatch('addPerson', item.result)
+               this.$store.dispatch('addMorePerson', item.result)
                   .catch(({name, violations}) => {
                      if (name === 'ValidationException' || name === 'AccessException') {
                         violations.forEach((violation) => this.$toast.open({message: violation}));
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js
index 023faa679..32aa5bbc9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js
@@ -117,10 +117,27 @@ const store = createStore({
             return group
         },
 
+        getPersonById: (state) => (person_id) => {
+            return state.persons.find(p => p._id === person_id);
+        }
+
 
     },
     mutations: {
         addPerson(state, [person, options]) {
+            if (!'_id' in person) {
+                person._id = person.id
+                person.id = `person_${person.id}`
+            }
+
+            let existing = state.persons.find(p => p._id === person._id);
+
+            if (typeof existing !== 'undefined') {
+                if (!options.folded && person.folded) {
+                    // unfold
+                }
+               return;
+            }
             let age = getAge(person)
             age = (age === '')? '' : ' - ' + age
 
@@ -232,6 +249,9 @@ const store = createStore({
 
         //// unfold
         unfoldPerson(state, person) {
+            if (!person.folded) {
+                return;
+            }
             //console.log('unfoldPerson', person)
             person.label = person._label
             delete person._label
@@ -261,6 +281,31 @@ const store = createStore({
             dispatch('fetchInfoForPerson', person)
         },
 
+        /**
+         * Add a person manually
+         *
+         * @param commit
+         * @param dispatch
+         * @param person
+         */
+        addMorePerson({ commit, dispatch, getters }, person) {
+            let nodeId = `person_${person.id}`;
+            if (getters.isPersonLoaded(person.id)) {
+                if (getters.isExcludedNode(nodeId)) {
+                    commit('removeExcludedNode', nodeId);
+                    let p = getters.getPersonById(person.id);
+                    if (typeof p !== 'undefined') {
+                        commit('unfoldPerson', p);
+                    } else {
+                        throw 'a person loaded was not found';
+                    }
+                    commit('updateHack');
+                }
+            } else {
+                return dispatch('addPerson', person);
+            }
+        },
+
         /**
          *  2) Fetch infos for this person (hub)
          *  @param object
@@ -287,7 +332,7 @@ const store = createStore({
             //console.log('  isHouseholdLoading ?', getters.isHouseholdLoading(person.current_household_id))
             if (! getters.isHouseholdLoading(person.current_household_id)) {
                 commit('markHouseholdLoading', person.current_household_id)
-                getHouseholdByPerson(person)
+                return getHouseholdByPerson(person)
                     .then(household => new Promise(resolve => {
                         commit('addHousehold', household)
                             // DISABLED: in init or expand loop, layer is uncheck when added
@@ -295,7 +340,7 @@ const store = createStore({
                             //commit('updateHack')
                         dispatch('addLinkFromPersonsToHousehold', household)
                         commit('updateHack')
-                        resolve()
+                        resolve();
                         })
                     ).catch( () => {
                         commit('unmarkHouseholdLoading', person.current_household_id)
@@ -335,7 +380,7 @@ const store = createStore({
          *  @param person
          */
         fetchCoursesByPerson({ commit, dispatch }, person) {
-            getCoursesByPerson(person)
+            return getCoursesByPerson(person)
                 .then(courses => new Promise(resolve => {
                     dispatch('addCourses', courses)
                     resolve()
@@ -383,6 +428,8 @@ const store = createStore({
                     dispatch('addMissingPerson', [p.person, course])
                 }
             })
+
+            return Promise.resolve();
         },
 
         /**
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/vis-network.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/vis-network.js
index ef87cb779..6f9a2ac16 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/vis-network.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/vis-network.js
@@ -164,14 +164,8 @@ const getGender = (gender) => {
  * @returns {string|null}
  */
 const getAge = (person) => {
-    if (person.birthdate) {
-        let birthdate = new Date(person.birthdate.datetime)
-        if (person.deathdate) {
-            let deathdate = new Date(person.deathdate.datetime)
-            return (deathdate.getFullYear() - birthdate.getFullYear()) + visMessages.fr.visgraph.years
-        }
-        let now = new Date()
-        return (now.getFullYear() - birthdate.getFullYear()) + visMessages.fr.visgraph.years
+    if (person.age) {
+        return person.age + ' ' + visMessages.fr.visgraph.years;
     }
     return ''
 }