bachir/ouatterrir-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

concernement with less than 3 entites are visible only if can_update

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi 2024-05-21 17:01:23 +02:00
parent 433383437d
commit fc947913f7
2 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/App.vue
View File

@ -75,47 +75,51 @@ export default {
// console.log('App couple_ids', couple_ids); // console.log('App couple_ids', couple_ids);
// loop through all concernement // loop through all concernement
for(let [concernement_id, concernement] of Object.entries(this.concernementsByID)){ for(let [concernement_id, concernement] of Object.entries(this.concernementsByID)){
// create the main mapitem object // TODO check if more than 3 entities or if connected user if author
let mapitem = { if (concernement.entites.length > 3 || concernement.can_update) {
id: concernement.id, // create the main mapitem object
cid: concernement.id, let mapitem = {
visible: concernement.visible, id: concernement.id,
// concernement: concernement, cid: concernement.id,
// superposition_ids: [], visible: concernement.visible,
superposition_cluster_index: -1, // concernement: concernement,
clone: false, // superposition_ids: [],
concernements_loading_nb: this.concernements_loading_nb superposition_cluster_index: -1,
} clone: false,
concernements_loading_nb: this.concernements_loading_nb
// loop through all superposition_clusters
for( let [cluster_index, cluster] of this.allSuperpositions_clustered.entries()){
let cids = [];
// console.log(`cluster ${cluster_index}`, cluster);
for( let s of cluster){
cids.push(s.cid)
} }
// console.log(`cids:${cids}`);
if(cids.indexOf(concernement.id) !== -1){ // loop through all superposition_clusters
// console.log('concernement in cluster'); for( let [cluster_index, cluster] of this.allSuperpositions_clustered.entries()){
if (mapitem.superposition_cluster_index === -1) { let cids = [];
// if main map item does not yet have a superposition use it and alter his id (for matter constraints) // console.log(`cluster ${cluster_index}`, cluster);
mapitem.superposition_cluster_index = cluster_index for( let s of cluster){
mapitem.id = `${concernement.id}___${cluster_index}` cids.push(s.cid)
}else{ }
let mapitem_superposition = { // console.log(`cids:${cids}`);
id: `${concernement.id}___${cluster_index}`, if(cids.indexOf(concernement.id) !== -1){
cid: concernement.id, // console.log('concernement in cluster');
// concernement: concernement, if (mapitem.superposition_cluster_index === -1) {
superposition_cluster_index: cluster_index, // if main map item does not yet have a superposition use it and alter his id (for matter constraints)
clone: true mapitem.superposition_cluster_index = cluster_index
}; mapitem.id = `${concernement.id}___${cluster_index}`
this.mapitems.push(mapitem_superposition); }else{
this.allMapItems_byid[mapitem_superposition.id] = mapitem_superposition; let mapitem_superposition = {
id: `${concernement.id}___${cluster_index}`,
cid: concernement.id,
// concernement: concernement,
superposition_cluster_index: cluster_index,
clone: true
};
this.mapitems.push(mapitem_superposition);
this.allMapItems_byid[mapitem_superposition.id] = mapitem_superposition;
}
} }
} }
this.mapitems.push(mapitem)
this.allMapItems_byid[mapitem.id] = mapitem;
} }
this.mapitems.push(mapitem)
this.allMapItems_byid[mapitem.id] = mapitem;
} }
console.log('App mapitems', this.mapitems); console.log('App mapitems', this.mapitems);
} }

6
src/stores/concernements.js
View File

@ -95,8 +95,7 @@ export const ConcernementsStore = defineStore({
concernement.has_proximites = false; concernement.has_proximites = false;
concernement.has_superpositions = false; concernement.has_superpositions = false;
concernement.has_agissantes = 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 => { concernement.entites.forEach(entite => {
// console.log(`parsing entite ${entite.id}`); // console.log(`parsing entite ${entite.id}`);
if (entite.entite) { // entite.entite may be null because of workflow confidentiality if (entite.entite) { // entite.entite may be null because of workflow confidentiality
@ -115,8 +114,7 @@ export const ConcernementsStore = defineStore({
this.allEntitesById[entite.entite.id] = entite; this.allEntitesById[entite.entite.id] = entite;
this.allEntitesById[entite.entite.id].cid = concernement.id; this.allEntitesById[entite.entite.id].cid = concernement.id;
} }
// concernement.entites.push(entite); // fill the entites array with visible entite only
// PROXIMITES // PROXIMITES
if (entite.entite.proximite.length) { if (entite.entite.proximite.length) {
// console.log("proximite", entite.entite.proximite); // console.log("proximite", entite.entite.proximite);