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

cercle politique nav is done #2156

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2023-07-11 22:55:25 +02:00
parent 28c653dcab
commit 58f77d22e3
7 changed files with 359 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
src/components/ConcernementMapItem.vue
View File

@@ -727,37 +727,6 @@ export default {
// let fontsize = 4;
// TODO POINTS CARDINAUX
// //
// // le problème
// //
// g.addChild(new paper.Path.Circle({
// center: [this.pos.x, this.pos.y + r],
// radius: 0.5,
// style: {
// fillColor: '#fff'
// }
// }));
// g.addChild(new paper.Path.Line({
// from: [this.pos.x, this.pos.y + r],
// to: [this.pos.x, this.pos.y + r + 8],
// strokeColor: '#fff'
// }));
// g.addChild(new paper.PointText({
// point: [this.pos.x, this.pos.y + r + 10],
// content: "Début du cercle\nLe problème (injustice, indignation, plainte...)",
// fontSize: fontsize,
// fillColor: '#000',
// justification: 'center'
// }));
// g.addChild(new paper.PointText({
// point: [this.pos.x, this.pos.y + r + 16],
// content: doleance['leprobleme'],
// fontSize: 2.3,
// fillColor: '#fff',
// justification: 'center'
// }));
//
// CAMENBERT STATIQUES
//
@@ -889,6 +858,70 @@ export default {
}
});
// POINTS CARDINAUX
//
// // leprobleme
// g.addChild(new paper.Path.Circle({
// center: [this.pos.x, this.pos.y + r],
// radius: 3,
// style: {
// strokeColor: '#fff',
// strokeWidth: 2,
// fillColor: "rgba(255, 255, 255, 0.4)",
// },
// item_type: 'doleance_step',
// item_id: `leprobleme`,
// did: doleance.id,
// field: 'leprobleme'
// }));
// adresse de la doleance
g.addChild(new paper.Path.Circle({
center: [this.pos.x - r, this.pos.y],
radius: 3,
style: {
strokeColor: '#fff',
strokeWidth: 2,
fillColor: "rgba(255, 255, 255, 0.9)",
},
item_type: 'doleance_step',
item_id: `adresse_de_la_doleance`,
did: doleance.id,
field: 'adresse_de_la_doleance'
}));
// decision
g.addChild(new paper.Path.Circle({
center: [this.pos.x, this.pos.y - r],
radius: 3,
style: {
strokeColor: '#fff',
strokeWidth: 2,
fillColor: "rgba(255, 255, 255, 0.9)",
},
item_type: 'doleance_step',
item_id: `decision`,
did: doleance.id,
field: 'decision'
}));
// adresse_de_la_decision
g.addChild(new paper.Path.Circle({
center: [this.pos.x + r, this.pos.y],
radius: 3,
style: {
strokeColor: '#fff',
strokeWidth: 2,
fillColor: "rgba(255, 255, 255, 0.9)",
},
item_type: 'doleance_step',
item_id: `adresse_de_la_decision`,
did: doleance.id,
field: 'adresse_de_la_decision'
}));
return g;
},
// PAPER VISIBILITY
@@ -1001,7 +1034,7 @@ export default {
this.paper_main_object.children.doleances.visible = true;
// display the right (opened) doleance
this.concernement.doleances.forEach((d) => {
this.paper_main_object.children.doleances.children[`doleance_${d.id}`].visible = d.id === this.concernement.opened_doleance;
this.paper_main_object.children.doleances.children[`doleance_${d.id}`].visible = d.id === this.concernement.opened_doleance.id;
})
}
} else {
@@ -1049,7 +1082,7 @@ export default {
paper_group_tohit = this.paper_main_object.children['puissanceagir_besoins'];
break;
case "doleancer":
paper_group_tohit = this.paper_main_object.children['doleances'].children[`doleance_${this.concernement.opened_doleance}`];
paper_group_tohit = this.paper_main_object.children['doleances'].children[`doleance_${this.concernement.opened_doleance.id}`];
break;
}
@@ -1112,7 +1145,7 @@ export default {
group_to_hit = this.paper_main_object.children['agissantes'];
break;
case "doleancer":
group_to_hit = this.paper_main_object.children['doleances'].children[`doleance_${this.concernement.opened_doleance}`];
group_to_hit = this.paper_main_object.children['doleances'].children[`doleance_${this.concernement.opened_doleance.id}`];
break;
}
if (group_to_hit) {