From 58f771564325c0001ee36ecf6a19d6097059f730 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 3 Nov 2021 15:43:44 +0100 Subject: [PATCH] visgraph: fix logic error with relationship direction --- .../Resources/public/vuejs/VisGraph/store.js | 2 +- .../Resources/public/vuejs/VisGraph/vis-network.js | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js index 5470d07f9..90cfb7d24 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js @@ -295,7 +295,7 @@ const store = createStore({ color: 'lightblue', font: { color: '#33839d' }, dashes: true, //physics: false, - label: getRelationshipLabel(r, false), + label: getRelationshipLabel(r), title: getRelationshipTitle(r), }) for (let person of [r.fromPerson, r.toPerson]) { 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 32f409275..3a12265d6 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/vis-network.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/vis-network.js @@ -292,11 +292,11 @@ const getHouseholdWidth = (member) => { /** * Return label edge * @param relationship - * @param reverse * @returns string */ -const getRelationshipLabel = (relationship, reverse) => { - return (!reverse) ? relationship.relation.title.fr : relationship.relation.reverseTitle.fr +const getRelationshipLabel = (relationship) => { + return (!relationship.reverse) ? + relationship.relation.title.fr : relationship.relation.reverseTitle.fr } /** @@ -305,10 +305,9 @@ const getRelationshipLabel = (relationship, reverse) => { * @returns string */ const getRelationshipTitle = (relationship) => { - return relationship.relation.title.fr + ': ' - + relationship.fromPerson.text + '\n' - + relationship.relation.reverseTitle.fr + ': ' - + relationship.toPerson.text + return (!relationship.reverse) ? + relationship.relation.title.fr + ': ' + relationship.fromPerson.text + '\n' + relationship.relation.reverseTitle.fr + ': ' + relationship.toPerson.text : + relationship.relation.title.fr + ': ' + relationship.toPerson.text + '\n' + relationship.relation.reverseTitle.fr + ': ' + relationship.fromPerson.text } /**