Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-21 07:03:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

visgraph: try to remove folded person nodes when layer is unchecked (wip)

Browse Source
This commit is contained in:
Mathieu Jaumotte
2021-11-03 23:31:32 +01:00
parent 5d7f4bde1d
commit 19badc0062
3 changed files with 239 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
import { createStore } from 'vuex'
import { getHouseholdByPerson, getCoursesByPerson, getRelationshipsByPerson } from './api'
import { adapt2vis, getHouseholdLabel, getHouseholdWidth, getRelationshipLabel, getRelationshipTitle, getRelationshipDirection, splitId } from './vis-network'
import { getHouseholdLabel, getHouseholdWidth, getRelationshipLabel, getRelationshipTitle, getRelationshipDirection, splitId, getGender, getAge } from './vis-network'
import {visMessages} from "./i18n";
const debug = process.env.NODE_ENV !== 'production'
@@ -54,27 +55,100 @@ const store = createStore({
},
isPersonLoaded: (state) => (person_id) => {
return state.personLoadedIds.includes(person_id)
}
},
isExcludedNode: (state) => (id) => {
return state.excludedNodesIds.includes(id)
},
getParticipationsByCourse: (state) => (course_id) => {
//console.log('getParticipationsByCourse', course_id)
const course = state.courses.filter(c => c.id === course_id)[0]
const currentParticipations = course.participations.filter(p => p.endDate === null)
const participations = []
currentParticipations.forEach(p => {
participations.push(p)
})
console.log('participations',
participations.map(i => i.person.id),
participations
.filter(i => typeof i.person._id !== 'undefined')
.map(i => i.person.id)
)
return participations
},
getMembersByHousehold: (state) => (household_id) => {
//console.log('getMembersByHousehold', household_id)
const household = state.households.filter(h => h.id === household_id)[0]
const currentMembers = household.members.filter(m => household.current_members_id.includes(m.id))
const members = []
currentMembers.forEach(m => {
members.push(m)
})
console.log('members',
members.map(i => i.person.id),
members
.filter(i => typeof i.person._id !== 'undefined')
.map(i => i.person.id)
)
return members
},
getFoldedPersons: () => (array) => {
return array
.filter(i => typeof i.person._id !== 'undefined')
.map(i => i.person)
},
},
mutations: {
addPerson(state, person) {
console.log('+ addPerson', person.id)
addPerson(state, [person, options]) {
//console.log('+ addPerson', person.id)
person.group = person.type
person._id = person.id
person.id = `person_${person.id}`
person.label = `*${person.text}*\n_${getGender(person.gender)} - ${getAge(person.birthdate)}_`
if (options.folded) {
person.title = visMessages.fr.visgraph.click_to_expand
person._label = person.label // keep label
person.label = null
}
state.persons.push(person)
},
addHousehold(state, household) {
console.log('+ addHousehold', household.id)
//console.log('+ addHousehold', household.id)
household.group = household.type
household._id = household.id
household.label = `${visMessages.fr.visgraph.Household} n° ${household.id}`
household.id = `household_${household.id}`
state.households.push(household)
},
addCourse(state, course) {
console.log('+ addCourse', course.id)
state.courses.push(course)
//console.log('+ addCourse', course.id)
course.group = course.type
course._id = course.id
course.label = `${visMessages.fr.visgraph.Course} n° ${course.id}`
course.id = `accompanying_period_${course.id}`
state.courses.push(course)
},
addRelationship(state, relationship) {
console.log('+ addRelationship', relationship.id)
//console.log('+ addRelationship', relationship.id)
relationship.group = relationship.type
relationship._id = relationship.id
relationship.id = `relationship_${relationship.id}`
state.relationships.push(relationship)
},
addLink(state, link) {
console.log('+ addLink from', link.from, 'to', link.to)
//console.log('+ addLink from', link.from, 'to', link.to)
state.links.push(link)
},
@@ -86,7 +160,7 @@ const store = createStore({
state.personLoadedIds = state.personLoadedIds.filter(i => i !== id)
},
markHouseholdLoading(state, id) {
console.log('..loading household', id)
//console.log('..loading household', id)
state.householdLoadingIds.push(id)
},
unmarkHouseholdLoading(state, id) {
@@ -107,17 +181,19 @@ const store = createStore({
//// excluded
addExcludedNode(state, id) {
console.log('exclude list: +', id)
state.excludedNodesIds.push(id)
},
removeExcludedNode(state, id) {
console.log('exclude list: -', id)
state.excludedNodesIds = state.excludedNodesIds.filter(e => e !== id)
},
//// unfold
unfoldPerson(state, person) {
console.log('unfoldPerson', person)
//console.log('unfoldPerson', person)
if (person.label !== null) {
throw 'person is not expandable'
throw 'person is not folded'
}
person.label = person._label
delete person._label
@@ -132,7 +208,7 @@ const store = createStore({
*/
addPerson({ commit, dispatch }, person) {
commit('markPersonLoaded', person.id)
commit('addPerson', adapt2vis(person, { folded: false }))
commit('addPerson', [person, { folded: false }])
dispatch('fetchInfoForPerson', person)
},
@@ -156,14 +232,13 @@ const store = createStore({
* @param person
*/
fetchHouseholdForPerson({ commit, getters, dispatch }, person) {
console.log(' isHouseholdLoading ?', getters.isHouseholdLoading(person.current_household_id))
//console.log(' isHouseholdLoading ?', getters.isHouseholdLoading(person.current_household_id))
if (! getters.isHouseholdLoading(person.current_household_id)) {
commit('markHouseholdLoading', person.current_household_id)
getHouseholdByPerson(person)
.then(household => new Promise(resolve => {
//console.log('getHouseholdByPerson', household)
commit('addHousehold', adapt2vis(household))
//commit('addExcludedNode', household.id)
commit('addHousehold', household)
//dispatch('addExcludedNode', household.id) // layer uncheck when added
dispatch('addLinkFromPersonsToHousehold', household)
resolve()
})
@@ -179,9 +254,9 @@ const store = createStore({
* @param household
*/
addLinkFromPersonsToHousehold({ commit, getters, dispatch }, household) {
const currentMembers = household.members.filter(v => household.current_members_id.includes(v.id))
currentMembers.forEach(m => {
//console.log('-> addLink from person', m.person.id, 'to household', m.person.current_household_id)
let members = getters.getMembersByHousehold(household.id)
console.log('add link for', members.length, 'members')
members.forEach(m => {
commit('addLink', {
from: `${m.person.type}_${m.person.id}`,
to: `household_${m.person.current_household_id}`,
@@ -193,8 +268,7 @@ const store = createStore({
width: getHouseholdWidth(m),
})
if (!getters.isPersonLoaded(m.person.id)) {
console.log(' person is not loaded', m.person.id)
dispatch('addMissingPerson', m.person)
dispatch('addMissingPerson', [m.person, household])
}
})
},
@@ -208,7 +282,7 @@ const store = createStore({
//console.log('fetchCoursesByPerson', person)
getCoursesByPerson(person)
.then(courses => new Promise(resolve => {
console.log('fetch courses', courses.length)
//console.log('fetch courses', courses.length)
dispatch('addCourses', courses)
resolve()
}))
@@ -223,12 +297,12 @@ const store = createStore({
//console.log('addCourse', courses)
let currentCourses = courses.filter(c => c.closingDate === null)
currentCourses.forEach(course => {
console.log(' isCourseLoaded ?', getters.isCourseLoaded(course.id))
//console.log(' isCourseLoaded ?', getters.isCourseLoaded(course.id))
if (! getters.isCourseLoaded(course.id)) {
//console.log('course', course.id)
commit('markCourseLoaded', course.id)
commit('addCourse', adapt2vis(course))
commit('addExcludedNode', course.id)
commit('addCourse', course)
dispatch('addExcludedNode', course.id) // layer uncheck when added
dispatch('addLinkFromPersonsToCourse', course)
}
})
@@ -240,9 +314,10 @@ const store = createStore({
* @param course
*/
addLinkFromPersonsToCourse({ commit, getters, dispatch }, course) {
let currentParticipations = course.participations.filter(p => p.endDate === null)
console.log(' participations', currentParticipations.length)
currentParticipations.forEach(p => {
let participations = getters.getParticipationsByCourse(course.id)
console.log('add link for', participations.length, 'participations')
participations.forEach(p => {
//console.log(p.person.id)
commit('addLink', {
from: `${p.person.type}_${p.person.id}`,
to: `${course.id}`,
@@ -252,8 +327,7 @@ const store = createStore({
font: { color: 'darkorange' },
})
if (!getters.isPersonLoaded(p.person.id)) {
console.log(' person is not loaded', p.person.id)
dispatch('addMissingPerson', p.person)
dispatch('addMissingPerson', [p.person, course])
}
})
},
@@ -267,13 +341,12 @@ const store = createStore({
//console.log('fetchRelationshipByPerson', person)
getRelationshipsByPerson(person)
.then(relationships => new Promise(resolve => {
console.log('fetch relationships', relationships.length)
//console.log('fetch relationships', relationships.length)
dispatch('addRelationships', relationships)
resolve()
}))
},
/**
* 9) Add each distinct relationship
* @param object
@@ -281,11 +354,11 @@ const store = createStore({
*/
addRelationships({ commit, getters, dispatch }, relationships) {
relationships.forEach(relationship => {
console.log(' isRelationshipLoaded ?', getters.isRelationshipLoaded(relationship.id))
//console.log(' isRelationshipLoaded ?', getters.isRelationshipLoaded(relationship.id))
if (! getters.isRelationshipLoaded(relationship.id)) {
//console.log('relationship', relationship.id)
commit('markRelationshipLoaded', relationship.id)
commit('addRelationship', adapt2vis(relationship))
commit('addRelationship', relationship)
dispatch('addLinkFromRelationship', relationship)
}
})
@@ -311,8 +384,7 @@ const store = createStore({
})
for (let person of [r.fromPerson, r.toPerson]) {
if (!getters.isPersonLoaded(person.id)) {
console.log(' person is not loaded', person.id)
dispatch('addMissingPerson', person)
dispatch('addMissingPerson', [person, r])
}
}
},
@@ -321,28 +393,122 @@ const store = createStore({
* Add missing person. node is displayed without label (folded).
* We stop here and listen on events to unfold person and expand its fetch infos
* @param object
* @param person
* @param array
*/
addMissingPerson({ commit, getters, dispatch }, person) {
addMissingPerson({ commit, getters, dispatch }, [person, parent]) {
console.log('! add missing Person', person.id)
commit('markPersonLoaded', person.id)
commit('addPerson', adapt2vis(person, { folded: true }))
commit('addPerson', [person, { folded: true }])
if (getters.isExcludedNode(parent.id)) {
commit('addExcludedNode', person.id) //1
}
},
/**
* =============================================================================
*/
/**
* Triggered by a vis-network event when clicking on a Course Node.
* Each folded node is unfold, then expanded with fetch infos
* @param object
* @param course
*/
unfoldPersonsByCourse({ commit, dispatch }, course) {
let currentParticipations = course.participations.filter(p => p.endDate === null)
currentParticipations.forEach(p => {
unfoldPersonsByCourse({ getters, commit, dispatch }, course) {
const participations = getters.getParticipationsByCourse(course.id)
const folded = getters.getFoldedPersons(participations)
console.log('folded', folded)
participations.forEach(p => {
console.log('participation person', p.person.id)
if (p.person.label === null) {
console.log(' -> unfold folded')
commit('unfoldPerson', p.person)
dispatch('fetchInfoForPerson', p.person)
}
})
},
/**
* Triggered by a vis-network event when clicking on a Household Node.
* Each folded node is unfold, then expanded with fetch infos
* @param object
* @param household
*/
unfoldPersonsByHousehold({ getters, commit, dispatch }, household) {
const members = getters.getMembersByHousehold(household.id)
const folded = getters.getFoldedPersons(members)
console.log('folded', folded)
members.forEach(m => {
console.log('member person', m.person.id)
if (m.person.label === null) {
console.log(' -> unfold folded')
commit('unfoldPerson', m.person)
dispatch('fetchInfoForPerson', m.person)
}
})
},
/**
* For an excluded node, detect folded person and exclude too
* @param object
* @param id
*/
addExcludedNode({ getters, commit }, id) {
console.log('==> addExcludedNode')
commit('addExcludedNode', id)
switch (splitId(id, 'type')) {
case 'accompanying_period':
let participations = getters.getParticipationsByCourse(id)
participations.forEach(p => {
if (p.person.label === null) {
commit('addExcludedNode', p.person.id)
}
})
break
case 'household':
let members = getters.getMembersByHousehold(id)
members.forEach(m => {
if (m.person.label === null) {
commit('addExcludedNode', m.person.id)
}
})
break
default:
throw 'case undefined'
}
},
/**
* For an excluded node, remove relative persons excluded too
* @param object
* @param id
*/
removeExcludedNode({ getters, commit }, id) {
console.log('<== removeExcludedNode')
commit('removeExcludedNode', id)
switch (splitId(id, 'type')) {
case 'accompanying_period':
let participations = getters.getParticipationsByCourse(id)
participations.forEach(p => {
if (p.person.label === null) {
commit('removeExcludedNode', p.person.id)
}
})
break
case 'household':
let members = getters.getMembersByHousehold(id)
members.forEach(m => {
if (m.person.label === null) {
commit('removeExcludedNode', m.person.id)
}
})
break
default:
throw 'case undefined'
}
},
}
})