Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-13 13:54:23 +00:00
Code Issues Actions Projects Releases Wiki Activity

visgraph: fix logic error with relationship direction

Browse Source
This commit is contained in:
Mathieu Jaumotte 2021-11-03 15:43:44 +01:00
parent e7900b8b21
commit 58f7715643
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js
View File

@ -295,7 +295,7 @@ const store = createStore({
color: 'lightblue', color: 'lightblue',
font: { color: '#33839d' }, font: { color: '#33839d' },
dashes: true, //physics: false, dashes: true, //physics: false,
label: getRelationshipLabel(r, false), label: getRelationshipLabel(r),
title: getRelationshipTitle(r), title: getRelationshipTitle(r),
}) })
for (let person of [r.fromPerson, r.toPerson]) { for (let person of [r.fromPerson, r.toPerson]) {

13
src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/vis-network.js
View File

@ -292,11 +292,11 @@ const getHouseholdWidth = (member) => {
/** /**
* Return label edge * Return label edge
* @param relationship * @param relationship
* @param reverse
* @returns string * @returns string
*/ */
const getRelationshipLabel = (relationship, reverse) => { const getRelationshipLabel = (relationship) => {
return (!reverse) ? relationship.relation.title.fr : relationship.relation.reverseTitle.fr return (!relationship.reverse) ?
relationship.relation.title.fr : relationship.relation.reverseTitle.fr
} }
/** /**
@ -305,10 +305,9 @@ const getRelationshipLabel = (relationship, reverse) => {
* @returns string * @returns string
*/ */
const getRelationshipTitle = (relationship) => { const getRelationshipTitle = (relationship) => {
return relationship.relation.title.fr + ': ' return (!relationship.reverse) ?
+ relationship.fromPerson.text + '\n' relationship.relation.title.fr + ': ' + relationship.fromPerson.text + '\n' + relationship.relation.reverseTitle.fr + ': ' + relationship.toPerson.text :
+ relationship.relation.reverseTitle.fr + ': ' relationship.relation.title.fr + ': ' + relationship.toPerson.text + '\n' + relationship.relation.reverseTitle.fr + ': ' + relationship.fromPerson.text
+ relationship.toPerson.text
} }
/** /**