From 8d7bbe2b688649324fa12800fd145ae9e9200383 Mon Sep 17 00:00:00 2001 From: bach Date: Mon, 2 Oct 2023 16:33:10 +0200 Subject: [PATCH] do not fill doleance step with empty fields #2311 --- src/components/ConcernementMapItem.vue | 232 +++++++++++++------------ 1 file changed, 124 insertions(+), 108 deletions(-) diff --git a/src/components/ConcernementMapItem.vue b/src/components/ConcernementMapItem.vue index f50654e..27896e4 100644 --- a/src/components/ConcernementMapItem.vue +++ b/src/components/ConcernementMapItem.vue @@ -934,67 +934,73 @@ export default { // l'enquete // // camenbert - let cam = new paper.Path({ - strokeColor: '#fff', - strokeWidth: 2, - fillColor: "rgba(255, 255, 255, 0.4)", - item_type: 'doleance_step', - item_id: `lenquete`, - did: doleance.id, - field: 'lenquete', - field_index: null - }); - cam.add({x: this.pos.x , y: this.pos.y + dr}); - cam.lineTo({x: this.pos.x, y: this.pos.y + r}); - cam.arcTo({x: this.pos.x - p, y: this.pos.y + o}, {x: this.pos.x - m, y: this.pos.y + m}); - cam.lineTo({x: this.pos.x - n, y: this.pos.y + n}); - cam.arcTo({x: this.pos.x - p_d, y: this.pos.y + o_d}, {x: this.pos.x , y: this.pos.y + dr}); - // texte - // enquete.addChild(new paper.PointText({ - // point: { - // x:this.pos.x + Math.sin(22.5*(Math.PI/180)) * r*0.75, - // y:this.pos.y + Math.cos(22.5*(Math.PI/180)) * r*0.75 - // }, - // content: doleance['lenquete'], - // fontSize: fontsize, - // fillColor: '#fff', - // justification: 'center', - // locked: true - // })); - g.addChild(cam); + if (doleance.lenquete) { + let cam = new paper.Path({ + strokeColor: '#fff', + strokeWidth: 2, + fillColor: "rgba(255, 255, 255, 0.4)", + item_type: 'doleance_step', + item_id: `lenquete`, + did: doleance.id, + field: 'lenquete', + field_index: null + }); + cam.add({x: this.pos.x , y: this.pos.y + dr}); + cam.lineTo({x: this.pos.x, y: this.pos.y + r}); + cam.arcTo({x: this.pos.x - p, y: this.pos.y + o}, {x: this.pos.x - m, y: this.pos.y + m}); + cam.lineTo({x: this.pos.x - n, y: this.pos.y + n}); + cam.arcTo({x: this.pos.x - p_d, y: this.pos.y + o_d}, {x: this.pos.x , y: this.pos.y + dr}); + // texte + // enquete.addChild(new paper.PointText({ + // point: { + // x:this.pos.x + Math.sin(22.5*(Math.PI/180)) * r*0.75, + // y:this.pos.y + Math.cos(22.5*(Math.PI/180)) * r*0.75 + // }, + // content: doleance['lenquete'], + // fontSize: fontsize, + // fillColor: '#fff', + // justification: 'center', + // locked: true + // })); + g.addChild(cam); + } + // // probleme_initial_resolu // // camenbert - let rescam = new paper.Path({ - strokeColor: '#fff', - strokeWidth: 2, - fillColor: "rgba(255, 255, 255, 0.4)", - closed: true, - item_type: 'doleance_step', - item_id: `probleme_initial_resolu`, - did: doleance.id, - field: 'probleme_initial_resolu', - field_index: null - }); - rescam.add({x: this.pos.x + n, y: this.pos.y + n}); - rescam.lineTo({x: this.pos.x + m , y: this.pos.y + m}); - rescam.arcTo({x: this.pos.x + p, y: this.pos.y + o}, {x: this.pos.x, y: this.pos.y + r}); - rescam.lineTo({x: this.pos.x, y: this.pos.y + dr}); - rescam.arcTo({x: this.pos.x + p_d, y: this.pos.y + o_d}, {x: this.pos.x + n, y: this.pos.y + n}); - // texte - // resolution.addChild(new paper.PointText({ - // point: { - // x:this.pos.x - Math.sin(22.5*(Math.PI/180)) * r*0.75, - // y:this.pos.y + Math.cos(22.5*(Math.PI/180)) * r*0.75 - // }, - // content: doleance['probleme_initial_resolu'] ? doleance['oui_nouvelle_situation'] : doleance['non_adresse_doleance'], - // fontSize: fontsize, - // fillColor: '#fff', - // justification: 'center' - // })); - g.addChild(rescam) + if(doleance.probleme_initial_resolu === 0 || doleance.probleme_initial_resolu === 1){ + let rescam = new paper.Path({ + strokeColor: '#fff', + strokeWidth: 2, + fillColor: "rgba(255, 255, 255, 0.4)", + closed: true, + item_type: 'doleance_step', + item_id: `probleme_initial_resolu`, + did: doleance.id, + field: 'probleme_initial_resolu', + field_index: null + }); + rescam.add({x: this.pos.x + n, y: this.pos.y + n}); + rescam.lineTo({x: this.pos.x + m , y: this.pos.y + m}); + rescam.arcTo({x: this.pos.x + p, y: this.pos.y + o}, {x: this.pos.x, y: this.pos.y + r}); + rescam.lineTo({x: this.pos.x, y: this.pos.y + dr}); + rescam.arcTo({x: this.pos.x + p_d, y: this.pos.y + o_d}, {x: this.pos.x + n, y: this.pos.y + n}); + // texte + // resolution.addChild(new paper.PointText({ + // point: { + // x:this.pos.x - Math.sin(22.5*(Math.PI/180)) * r*0.75, + // y:this.pos.y + Math.cos(22.5*(Math.PI/180)) * r*0.75 + // }, + // content: doleance['probleme_initial_resolu'] ? doleance['oui_nouvelle_situation'] : doleance['non_adresse_doleance'], + // fontSize: fontsize, + // fillColor: '#fff', + // justification: 'center' + // })); + g.addChild(rescam) + } + // // MULTIPLE FIELDS @@ -1063,64 +1069,74 @@ export default { // POINTS CARDINAUX // leprobleme - g.addChild(new paper.Path.Circle({ - center: [this.pos.x, this.pos.y + r], - radius: 3 * this.scale, - style: { - strokeColor: '#fff', - strokeWidth: 2, - fillColor: "rgba(255, 255, 255, 0.9)", - }, - item_type: 'doleance_step', - item_id: `leprobleme`, - did: doleance.id, - field: 'leprobleme' - })); + if (doleance.leprobleme) { + g.addChild(new paper.Path.Circle({ + center: [this.pos.x, this.pos.y + r], + radius: 3 * this.scale, + style: { + strokeColor: '#fff', + strokeWidth: 2, + fillColor: "rgba(255, 255, 255, 0.9)", + }, + 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 * this.scale, - 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' - })); + if (doleance.entite_addresse_doleance || doleance.aqui_addresse_doleance || doleance.comment_ennonce_doleance) { + g.addChild(new paper.Path.Circle({ + center: [this.pos.x - r, this.pos.y], + radius: 3 * this.scale, + 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 * this.scale, - style: { - strokeColor: '#fff', - strokeWidth: 2, - fillColor: "rgba(255, 255, 255, 0.9)", - }, - item_type: 'doleance_step', - item_id: `decision`, - did: doleance.id, - field: 'decision' - })); + if (doleance.entites_decisionnaires || doleance.decision_formule) { + g.addChild(new paper.Path.Circle({ + center: [this.pos.x, this.pos.y - r], + radius: 3 * this.scale, + 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 * this.scale, - 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' - })); + if (doleance.entite_adresse_application || doleance.aqui_adresse_decision || doleance.comment_formule_decision) { + g.addChild(new paper.Path.Circle({ + center: [this.pos.x + r, this.pos.y], + radius: 3 * this.scale, + 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;