|
|
@@ -17,6 +17,7 @@ export const ConcernementsStore = defineStore({
|
|
|
id: 'concernements',
|
|
|
state: () => ({
|
|
|
map_mode: null,
|
|
|
+ concernements_loading_nb: 0,
|
|
|
concernements: [],
|
|
|
concernementsByID: {},
|
|
|
allEntitesById: {},
|
|
|
@@ -38,6 +39,8 @@ export const ConcernementsStore = defineStore({
|
|
|
p_mise_en_oeuvre_decision: {},
|
|
|
p_reception_application_decision: {},
|
|
|
concernements_loaded: false,
|
|
|
+ concernements_are_loading: false,
|
|
|
+ concernement_active_revision: null,
|
|
|
detailsZoomValue: 1,
|
|
|
}),
|
|
|
getters: {
|
|
|
@@ -51,6 +54,7 @@ export const ConcernementsStore = defineStore({
|
|
|
},
|
|
|
loadConcernements () {
|
|
|
console.log('concernements store loadConcernements');
|
|
|
+ this.concernements_are_loading = true;
|
|
|
return new Promise((resolve, reject) => {
|
|
|
const ast = gql`{
|
|
|
allconcernements {
|
|
|
@@ -62,199 +66,282 @@ export const ConcernementsStore = defineStore({
|
|
|
// console.log('ast', ast);
|
|
|
GQL.post('', { query: print(ast) })
|
|
|
.then(({ data : { data : { allconcernements } } }) => {
|
|
|
- console.log('loadconcernements all loaded', allconcernements)
|
|
|
+ console.log('loadconcernements loaded', allconcernements)
|
|
|
this.concernements = [];
|
|
|
- // parse concernements
|
|
|
- let temp_allSuperpositions = [];
|
|
|
- allconcernements.forEach(concernement => {
|
|
|
- concernement.visible = true;
|
|
|
-
|
|
|
- concernement.entites_byid = {};
|
|
|
- concernement.entitesagissantes_byid = {};
|
|
|
- concernement.has_proximites = false;
|
|
|
- concernement.has_superpositions = false;
|
|
|
- concernement.has_agissantes = false;
|
|
|
- // var entites_temp = concernement.entites; // record a temp entites liste
|
|
|
- // concernement.entites = []; // erase the concernement.entite array as we want to keep only visible entites
|
|
|
- concernement.entites.forEach(entite => {
|
|
|
- if (entite.entite) { // entite.entite may be null because of workflow confidentiality
|
|
|
- concernement.entites_byid[entite.entite.id] = entite;
|
|
|
- // record entite agissante
|
|
|
- if (entite.entite.agissante) {
|
|
|
- concernement.entitesagissantes_byid[entite.entite.id] = entite;
|
|
|
- concernement.has_agissantes = true;
|
|
|
- }
|
|
|
- // record a flat list of all entités of all concernement for map-popup
|
|
|
- this.allEntitesById[entite.entite.id] = entite;
|
|
|
- this.allEntitesById[entite.entite.id].cid = concernement.id;
|
|
|
- // concernement.entites.push(entite); // fill the entites array with visible entite only
|
|
|
-
|
|
|
- // PROXIMITES
|
|
|
- if (entite.entite.proximite.length) {
|
|
|
- console.log("proximite", entite.entite.proximite);
|
|
|
- concernement.has_proximites = true;
|
|
|
- }
|
|
|
-
|
|
|
- // SUPERPOSITIONS
|
|
|
- if (entite.entite.superposition.length) {
|
|
|
- // create properties for later
|
|
|
- concernement.superpositions = {};
|
|
|
- concernement.superposition_constraints_id = {};
|
|
|
- concernement.all_superposed_concernements_id = [];
|
|
|
- concernement.superposed_mapitem_id_by_mapitem_id = {};
|
|
|
-
|
|
|
- entite.entite.superposition.forEach(entite_superpose => {
|
|
|
- // console.log(`superposition eid:${entite.entite.id}, teid:${entite_superpose.id}`);
|
|
|
- let already_recorded = false;
|
|
|
- // loop through all already recorded superposition to complete the array instead of create duplicates
|
|
|
- // TODO check if target cid and eid are accessible before recording the superposition
|
|
|
- // check if half of the superpositions is already recorded, if yes complete it (add the missing concernement id)
|
|
|
- for(let superposition of temp_allSuperpositions) {
|
|
|
- for(let superposition_item of superposition) {
|
|
|
- if (superposition_item.eid === entite.entite.id && !superposition_item.cid) {
|
|
|
- // console.log(`already_recorded, eid:${entite.entite.id}, teid:${entite_superpose.id}`, entite.entite.title);
|
|
|
- already_recorded = true;
|
|
|
- superposition_item.cid = concernement.id;
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
- if (already_recorded) {
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
- // if not already recorded, add it to the array. It is incomplete has it's missing one concernement id wich will be filled in next loops
|
|
|
- if (!already_recorded) {
|
|
|
- // console.log(`NOT already_recorded, eid:${entite.entite.id}, teid:${entite_superpose.id}`, entite.entite.title);
|
|
|
- let s = [
|
|
|
- {
|
|
|
- cid: concernement.id,
|
|
|
- eid: entite.entite.id
|
|
|
- },
|
|
|
- {
|
|
|
- cid: null,
|
|
|
- eid: entite_superpose.id
|
|
|
- }
|
|
|
- ];
|
|
|
- // concernement.superpositions.push(s);
|
|
|
- temp_allSuperpositions.push(s);
|
|
|
-
|
|
|
- }
|
|
|
- })
|
|
|
- }
|
|
|
+ this.parseConcernements(allconcernements, true)
|
|
|
+ this.concernements_loaded = true;
|
|
|
+ this.concernements_loading_nb ++;
|
|
|
+ this.concernements_are_loading = false;
|
|
|
+ resolve();
|
|
|
+ })
|
|
|
+ .catch(error => {
|
|
|
+ console.warn('Issue with loadConcernements', error)
|
|
|
+ this.concernements_are_loading = false;
|
|
|
+ Promise.reject(error)
|
|
|
+ })
|
|
|
+ })
|
|
|
+ },
|
|
|
+ parseConcernements(allconcernements, init) {
|
|
|
+ console.log('parse concernements');
|
|
|
+ let temp_allSuperpositions = [];
|
|
|
+ allconcernements.forEach((concernement) => {
|
|
|
+ // console.log(`parsing concernement ${concernement.id}`);
|
|
|
+ concernement.visible = true;
|
|
|
|
|
|
- }
|
|
|
- });
|
|
|
-
|
|
|
-
|
|
|
- // revisions
|
|
|
- concernement.active_revision = concernement.revision_id;
|
|
|
- concernement.revisions_byid = {};
|
|
|
- concernement.revisions.forEach(rev => {
|
|
|
- concernement.revisions_byid[rev.revision_id] = rev;
|
|
|
- });
|
|
|
-
|
|
|
- // puissance d'agir
|
|
|
- concernement.has_puissancedagir = concernement.besoins.length ? true : false;
|
|
|
- concernement.besoins.forEach(besoin => {
|
|
|
- this.allBesoinsById[besoin.id] = besoin;
|
|
|
- });
|
|
|
-
|
|
|
- // doleance
|
|
|
- concernement.has_doleance = concernement.doleances.length ? true : false;
|
|
|
- if (concernement.has_doleance) {
|
|
|
- console.log('concernement has doleance', concernement.doleances);
|
|
|
- concernement.opened_doleance = {
|
|
|
- id: concernement.doleances[0].id
|
|
|
- };
|
|
|
+ concernement.entites_byid = {};
|
|
|
+ concernement.entitesagissantes_byid = {};
|
|
|
+ concernement.has_proximites = false;
|
|
|
+ concernement.has_superpositions = false;
|
|
|
+ concernement.has_agissantes = false;
|
|
|
+ // var entites_temp = concernement.entites; // record a temp entites liste
|
|
|
+ // concernement.entites = []; // erase the concernement.entite array as we want to keep only visible entites
|
|
|
+ concernement.entites.forEach(entite => {
|
|
|
+ // console.log(`parsing entite ${entite.id}`);
|
|
|
+ if (entite.entite) { // entite.entite may be null because of workflow confidentiality
|
|
|
+ if (!concernement.entites_byid[entite.entite.id]) {
|
|
|
+ concernement.entites_byid[entite.entite.id] = entite;
|
|
|
+ }
|
|
|
+ // record entite agissante
|
|
|
+ if (entite.entite.agissante) {
|
|
|
+ if (!concernement.entitesagissantes_byid[entite.entite.id]) {
|
|
|
+ concernement.entitesagissantes_byid[entite.entite.id] = entite;
|
|
|
}
|
|
|
-
|
|
|
- // recit
|
|
|
- concernement.has_recit = concernement.recit !== null;
|
|
|
-
|
|
|
- // common
|
|
|
- this.concernements.push(concernement);
|
|
|
- this.concernementsByID[concernement.id] = concernement;
|
|
|
-
|
|
|
- }); // end of concernements loop
|
|
|
- console.log('temp_allSuperpositions', temp_allSuperpositions);
|
|
|
-
|
|
|
- // cleaning superpositions, removing all incomplète onces
|
|
|
- temp_allSuperpositions.forEach(s => {
|
|
|
- if (s[0] && s[0].cid && s[0].eid && s[1] && s[1].cid && s[1].eid) {
|
|
|
- this.allSuperpositions.push(s);
|
|
|
- this.concernementsByID[s[0].cid].has_superpositions = true;
|
|
|
- this.concernementsByID[s[1].cid].has_superpositions = true;
|
|
|
+ concernement.has_agissantes = true;
|
|
|
+ }
|
|
|
+ // record a flat list of all entités of all concernement for map-popup
|
|
|
+ if (!this.allEntitesById[entite.entite.id]) {
|
|
|
+ this.allEntitesById[entite.entite.id] = entite;
|
|
|
+ this.allEntitesById[entite.entite.id].cid = concernement.id;
|
|
|
+ }
|
|
|
+ // concernement.entites.push(entite); // fill the entites array with visible entite only
|
|
|
+
|
|
|
+ // PROXIMITES
|
|
|
+ if (entite.entite.proximite.length) {
|
|
|
+ // console.log("proximite", entite.entite.proximite);
|
|
|
+ concernement.has_proximites = true;
|
|
|
+ }
|
|
|
+
|
|
|
+ // SUPERPOSITIONS
|
|
|
+ if (entite.entite.superposition.length) {
|
|
|
+ // create properties for later
|
|
|
+ if (init) {
|
|
|
+ concernement.superpositions = {};
|
|
|
+ concernement.superposition_constraints_id = {};
|
|
|
+ concernement.all_superposed_concernements_id = [];
|
|
|
+ concernement.superposed_mapitem_id_by_mapitem_id = {};
|
|
|
}
|
|
|
- });
|
|
|
- console.log('this.allSuperpositions', this.allSuperpositions);
|
|
|
-
|
|
|
-
|
|
|
- // get superpositions by cluster
|
|
|
- for(let superpos_to_record of this.allSuperpositions){
|
|
|
- let recorded = false;
|
|
|
- // console.log('-- -- --');
|
|
|
- // console.log(`superpos_to_record : ${superpos_to_record[0].cid}-${superpos_to_record[0].eid}, ${superpos_to_record[1].cid}-${superpos_to_record[1].eid}`);
|
|
|
- // loop through alredy recorded clusters
|
|
|
- for(let [cluster_index, superpo_cluster] of this.allSuperpositions_clustered.entries()){
|
|
|
- // console.log('cluster_index', cluster_index);
|
|
|
- // for each cluster loop throug each superposition
|
|
|
- in_cluster_loop:{
|
|
|
- for(let s of superpo_cluster){
|
|
|
- // console.log(`s : ${s.cid}-${s.eid}`);
|
|
|
- // loop through each cid_eid couple of superpo to be recorded
|
|
|
- for(let i = 0; i <= 1; i++){
|
|
|
- // if one couple already recorded in the cluster, add the other one to the same cluster
|
|
|
- if (superpos_to_record[i].cid === s.cid && superpos_to_record[i].eid === s.eid){
|
|
|
- // console.log('-- recorded');
|
|
|
- let j = i === 0 ? 1 : 0;
|
|
|
- // add the right item to the cluster
|
|
|
- this.allSuperpositions_clustered[cluster_index].push(superpos_to_record[j]);
|
|
|
- // record the superposition on the concernement BY cluster index
|
|
|
- // console.log(`superpos_to_record[j].cid:${superpos_to_record[j].cid}`);
|
|
|
- // console.log('concernement', this.concernementsByID[superpos_to_record[j].cid]);
|
|
|
- // create array if not already exists
|
|
|
- if(typeof this.concernementsByID[superpos_to_record[j].cid].superpositions[cluster_index] === 'undefined'){
|
|
|
- this.concernementsByID[superpos_to_record[j].cid].superpositions[cluster_index] = [superpos_to_record];
|
|
|
- }else{
|
|
|
- this.concernementsByID[superpos_to_record[j].cid].superpositions[cluster_index].push(superpos_to_record);
|
|
|
- }
|
|
|
- recorded = true;
|
|
|
- break in_cluster_loop;
|
|
|
- }
|
|
|
+
|
|
|
+ entite.entite.superposition.forEach(entite_superpose => {
|
|
|
+ // console.log(`superposition eid:${entite.entite.id}, teid:${entite_superpose.id}`);
|
|
|
+ let already_recorded = false;
|
|
|
+ // loop through all already recorded superposition to complete the array instead of create duplicates
|
|
|
+ // TODO check if target cid and eid are accessible before recording the superposition
|
|
|
+ // check if half of the superpositions is already recorded, if yes complete it (add the missing concernement id)
|
|
|
+ for(let superposition of temp_allSuperpositions) {
|
|
|
+ for(let superposition_item of superposition) {
|
|
|
+ if (superposition_item.eid === entite.entite.id && !superposition_item.cid) {
|
|
|
+ // console.log(`already_recorded, eid:${entite.entite.id}, teid:${entite_superpose.id}`, entite.entite.title);
|
|
|
+ already_recorded = true;
|
|
|
+ superposition_item.cid = concernement.id;
|
|
|
+ break;
|
|
|
}
|
|
|
}
|
|
|
+ if (already_recorded) {
|
|
|
+ break;
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
+ // if not already recorded, add it to the array. It is incomplete has it's missing one concernement id wich will be filled in next loops
|
|
|
+ if (!already_recorded) {
|
|
|
+ // console.log(`NOT already_recorded, eid:${entite.entite.id}, teid:${entite_superpose.id}`, entite.entite.title);
|
|
|
+ let s = [
|
|
|
+ {
|
|
|
+ cid: concernement.id,
|
|
|
+ eid: entite.entite.id
|
|
|
+ },
|
|
|
+ {
|
|
|
+ cid: null,
|
|
|
+ eid: entite_superpose.id
|
|
|
+ }
|
|
|
+ ];
|
|
|
+ // concernement.superpositions.push(s);
|
|
|
+ temp_allSuperpositions.push(s);
|
|
|
+
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ }); // end of concernement.entites loop
|
|
|
+
|
|
|
+
|
|
|
+ // revisions
|
|
|
+ concernement.active_revision = concernement.revision_id;
|
|
|
+ concernement.revisions_byid = {};
|
|
|
+ concernement.revisions.forEach(rev => {
|
|
|
+ concernement.revisions_byid[rev.revision_id] = rev;
|
|
|
+ });
|
|
|
+
|
|
|
+ // puissance d'agir
|
|
|
+ concernement.has_puissancedagir = concernement.besoins.length ? true : false;
|
|
|
+ concernement.besoins.forEach(besoin => {
|
|
|
+ this.allBesoinsById[besoin.id] = besoin;
|
|
|
+ });
|
|
|
|
|
|
- if(!recorded){
|
|
|
- // console.log('-- not recorded');
|
|
|
- // create cluster and fill it it with first couple
|
|
|
- this.allSuperpositions_clustered.push(superpos_to_record);
|
|
|
- // record superposition on each concernement of each couple member BY cluster index
|
|
|
- for( let i=0; i <= 1; i++){
|
|
|
- this.concernementsByID[superpos_to_record[i].cid].superpositions[this.allSuperpositions_clustered.length-1] = [superpos_to_record];
|
|
|
- // console.log(`concernement ${superpos_to_record[i].cid} superposition by cluster index`,this.concernementsByID[superpos_to_record[i].cid].superpositions);
|
|
|
+ // doleance
|
|
|
+ concernement.has_doleance = concernement.doleances.length ? true : false;
|
|
|
+ if (concernement.has_doleance) {
|
|
|
+ // console.log('concernement has doleance', concernement.doleances);
|
|
|
+ concernement.opened_doleance = {
|
|
|
+ id: concernement.doleances[0].id
|
|
|
+ };
|
|
|
+ }
|
|
|
+
|
|
|
+ // recit
|
|
|
+ concernement.has_recit = concernement.recit !== null;
|
|
|
+
|
|
|
+ // common
|
|
|
+ // if (!concernement_is_reloaded) {
|
|
|
+ this.concernements.push(concernement);
|
|
|
+ this.concernementsByID[concernement.id] = concernement;
|
|
|
+ // }else{
|
|
|
+ // // this.concernements[concernement_index] = concernement;
|
|
|
+ // this.concernementsByID[concernement.id] = concernement;
|
|
|
+ // // TODO check that this.concernements and this.concernementsByID contains the same item
|
|
|
+ // }
|
|
|
+
|
|
|
+ }); // end of concernements loop
|
|
|
+ // console.log('this.concernements', this.concernements);
|
|
|
+ // console.log('this.concernementsByID', this.concernementsByID);
|
|
|
+
|
|
|
+ // console.log('temp_allSuperpositions', temp_allSuperpositions);
|
|
|
+
|
|
|
+ // cleaning superpositions, removing all incomplète onces
|
|
|
+ this.allSuperpositions = [];
|
|
|
+ temp_allSuperpositions.forEach(s => {
|
|
|
+ if (s[0] && s[0].cid && s[0].eid && s[1] && s[1].cid && s[1].eid) {
|
|
|
+ this.allSuperpositions.push(s);
|
|
|
+ this.concernementsByID[s[0].cid].has_superpositions = true;
|
|
|
+ this.concernementsByID[s[1].cid].has_superpositions = true;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ // console.log('this.allSuperpositions', this.allSuperpositions);
|
|
|
+
|
|
|
+ // 1 check if cluster already exists and if yes complete with the next item of cluster
|
|
|
+ // 2 if cluster deos not exists, create the cluster and fill it with first item of cluster
|
|
|
+
|
|
|
+ // 1 check if cluster already exists and if yes complete with the next item of cluster
|
|
|
+ // get superpositions by cluster
|
|
|
+ for(let superpos_to_record of this.allSuperpositions){
|
|
|
+ let recorded = false;
|
|
|
+ // console.log('-- -- --');
|
|
|
+ // console.log(`superpos_to_record : ${superpos_to_record[0].cid}-${superpos_to_record[0].eid}, ${superpos_to_record[1].cid}-${superpos_to_record[1].eid}`);
|
|
|
+ // loop through alredy recorded clusters
|
|
|
+ for(let [cluster_index, superpo_cluster] of this.allSuperpositions_clustered.entries()){
|
|
|
+ // console.log('cluster_index', cluster_index);
|
|
|
+ // for each cluster loop throug each superposition
|
|
|
+ in_cluster_loop:{
|
|
|
+ for(let s of superpo_cluster){
|
|
|
+ // console.log(`s : ${s.cid}-${s.eid}`);
|
|
|
+ // loop through each cid_eid couple of superpo to be recorded
|
|
|
+ for(let i = 0; i <= 1; i++){
|
|
|
+ // if one couple already recorded in the cluster, add the other one to the same cluster
|
|
|
+ if (superpos_to_record[i].cid === s.cid && superpos_to_record[i].eid === s.eid){
|
|
|
+ // console.log('-- recorded');
|
|
|
+ let j = i === 0 ? 1 : 0;
|
|
|
+ // check if item is not already recorded in the cluster (in case of reparsing concernements)
|
|
|
+ let already_clustered = false;
|
|
|
+ for (let s2 of superpo_cluster) {
|
|
|
+ if (superpos_to_record[j].cid === s2.cid && superpos_to_record[j].eid === s2.eid){
|
|
|
+ already_clustered = true;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // if not already recorded
|
|
|
+ if (!already_clustered) {
|
|
|
+ // add the right item to the cluster
|
|
|
+ this.allSuperpositions_clustered[cluster_index].push(superpos_to_record[j]);
|
|
|
+ }
|
|
|
+
|
|
|
+ // record the superposition on the concernement BY cluster index
|
|
|
+ // create array if not already exists
|
|
|
+ if(typeof this.concernementsByID[superpos_to_record[j].cid].superpositions[cluster_index] === 'undefined'){
|
|
|
+ this.concernementsByID[superpos_to_record[j].cid].superpositions[cluster_index] = [superpos_to_record];
|
|
|
+ }else if(!already_clustered){
|
|
|
+ this.concernementsByID[superpos_to_record[j].cid].superpositions[cluster_index].push(superpos_to_record);
|
|
|
+ }
|
|
|
+ recorded = true;
|
|
|
+ break in_cluster_loop;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- console.log('this.allSuperpositions_clustered', this.allSuperpositions_clustered);
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
+ // 2 if cluster deos not exists, create the cluster and fill it with first item of cluster
|
|
|
+ if(!recorded){
|
|
|
+ // console.log('-- not recorded');
|
|
|
+ // create cluster and fill it with first item of couple
|
|
|
+ this.allSuperpositions_clustered.push(superpos_to_record);
|
|
|
+ // record superposition on each concernement of each couple member BY cluster index
|
|
|
+ for( let i=0; i <= 1; i++){
|
|
|
+ this.concernementsByID[superpos_to_record[i].cid].superpositions[this.allSuperpositions_clustered.length-1] = [superpos_to_record];
|
|
|
+ // console.log(`concernement ${superpos_to_record[i].cid} superposition by cluster index`,this.concernementsByID[superpos_to_record[i].cid].superpositions);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // console.log('this.allSuperpositions_clustered', this.allSuperpositions_clustered);
|
|
|
+ // console.log(`end of parsing concernements`);
|
|
|
|
|
|
- this.concernements_loaded = true;
|
|
|
- })
|
|
|
- .catch(error => {
|
|
|
- console.warn('Issue with loadConcernements', error)
|
|
|
- Promise.reject(error)
|
|
|
- })
|
|
|
- })
|
|
|
},
|
|
|
reloadConcernements () {
|
|
|
console.log('reloadConcernements');
|
|
|
- // reset the arrays
|
|
|
- // this.concernements = [];
|
|
|
- // this.concernementsByID = {};
|
|
|
- // this.concernements_loaded = false;
|
|
|
- this.loadConcernements();
|
|
|
+ return new Promise((resolve, reject) => {
|
|
|
+ // reset the arrays
|
|
|
+ this.concernements = [];
|
|
|
+ this.concernementsByID = {};
|
|
|
+ // this.concernements_loaded = false;
|
|
|
+ this.loadConcernements()
|
|
|
+ .then(()=>{
|
|
|
+ resolve();
|
|
|
+ });
|
|
|
+ })
|
|
|
+ },
|
|
|
+ reloadConcernementEntites(nid){
|
|
|
+ // console.log('reloadConcernementEntites nid', nid);
|
|
|
+ // const ast = gql`{
|
|
|
+ // concernement(id:${nid}) {
|
|
|
+ // entites {
|
|
|
+ // id
|
|
|
+ // revision_id
|
|
|
+ // menacemaintien
|
|
|
+ // actuelfuture
|
|
|
+ // entite {
|
|
|
+ // title
|
|
|
+ // id
|
|
|
+ // agissante
|
|
|
+ // proximite {
|
|
|
+ // id
|
|
|
+ // title
|
|
|
+ // }
|
|
|
+ // superposition {
|
|
|
+ // id
|
|
|
+ // title
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // `
|
|
|
+ // // console.log('ast', ast);
|
|
|
+ // GQL.post('', { query: print(ast) })
|
|
|
+ // .then(({ data : { data : { concernement } } }) => {
|
|
|
+ // console.log('reloadConcernementEntites loaded', concernement)
|
|
|
+ // // this.concernementsByID[concernement.id].entites = concernement.entites;
|
|
|
+ // })
|
|
|
+ // .catch(error => {
|
|
|
+ // console.warn('Issue with reloadConcernementEntites', error)
|
|
|
+ // Promise.reject(error)
|
|
|
+ // })
|
|
|
},
|
|
|
loadContentTypeDefinition () {
|
|
|
const body = {
|
|
|
@@ -372,15 +459,15 @@ export const ConcernementsStore = defineStore({
|
|
|
this.opened_concernement = null;
|
|
|
this.opened_recit = null;
|
|
|
this.concernements.forEach((c, i) => {
|
|
|
- state = cid === c.id;
|
|
|
// console.log(`openCloseConcernements foreach id: ${id}, c.id: ${c.id}, state: ${state}`, id, c.id);
|
|
|
- c.opened = this.concernements[i].opened = this.concernementsByID[c.id].opened = state;
|
|
|
- if (state) {
|
|
|
+ c.opened = this.concernements[i].opened = this.concernementsByID[c.id].opened = cid === c.id;
|
|
|
+ if (c.opened) {
|
|
|
this.opened_concernement = c;
|
|
|
this.opened_concernement.opened_mapitem_id = mapitem_id;
|
|
|
if (c.has_recit && this.map_mode === "terraindevie") {
|
|
|
this.opened_recit = c.recit;
|
|
|
}
|
|
|
+ this.concernement_active_revision = {cid: cid, rid: c.active_revision}
|
|
|
// console.log('openCloseConcernements', this.opened_concernement.opened);
|
|
|
}
|
|
|
});
|
|
|
@@ -440,8 +527,9 @@ export const ConcernementsStore = defineStore({
|
|
|
this.recit_plyr_player = player;
|
|
|
},
|
|
|
setActiveRevision (cid, rid) {
|
|
|
- // console.log(`setActiveRevision, cid:${cid}, rid:${rid}`);
|
|
|
- this.concernementsByID[cid].active_revision = rid;
|
|
|
+ console.log(`setActiveRevision, cid:${cid}, rid:${rid}`);
|
|
|
+ // this.concernementsByID[cid].active_revision = rid;
|
|
|
+ this.concernement_active_revision = {cid: cid, rid: rid};
|
|
|
},
|
|
|
setDetailsZoomValue (z) {
|
|
|
console.log(`concernement store setDetailsZoomValue ${z}`);
|
