diff --git a/src/assets/main.scss b/src/assets/main.scss index 7a2f2e4..4f8e370 100644 --- a/src/assets/main.scss +++ b/src/assets/main.scss @@ -1333,4 +1333,6 @@ div.add-ressource-btn{ div.add-cerclepo-btn{ @include add-btn(); margin: 0 0 1em; + height: 60px; + line-height: 50px; } \ No newline at end of file diff --git a/src/components/ConcernementMapItem.vue b/src/components/ConcernementMapItem.vue index 9e19ff5..e099e47 100644 --- a/src/components/ConcernementMapItem.vue +++ b/src/components/ConcernementMapItem.vue @@ -1697,11 +1697,16 @@ export default { console.warn('no doleances group created nor found') return; } - + console.log('doleances main group: ', g); + this.concernement.doleances.forEach((d) => { + console.log('each doleance, d:', d); + let doleance_group; + console.log('is update: ', update); if (update) { - doleance_group = this.paper_main_object.children['doleances'][`doleance_${d.id}`]; + doleance_group = g.children[`doleance_${d.id}`]; + console.log('doleance_group', doleance_group); if (doleance_group) { this.setPaperDoleanceSteps(d, doleance_group); }else{ diff --git a/src/components/contents/Doleancer.vue b/src/components/contents/Doleancer.vue index 331a298..91d29ef 100644 --- a/src/components/contents/Doleancer.vue +++ b/src/components/contents/Doleancer.vue @@ -106,7 +106,9 @@ export default { } }, methods: { - ...mapActions(ConcernementsStore,['setOpenedDoleance']), + ...mapActions(ConcernementsStore,['setOpenedDoleance', + 'setOpenedDoleanceField' + ]), nextDoleance(){ this.doleance_index ++; this.$refs.prevDoleanceBTN.classList.add('animeleft'); @@ -216,6 +218,13 @@ export default { }) // resolve('test') }) + }, + reloadConcernementCerclePolAndChangeActiveField(field, field_index){ + this.reloadConcernementCerclePol(this.cid) + .then((concernement) => { + // this.opened_concernement.opened_doleance.field = field; + this.setOpenedDoleanceField(this.cid, this.doleance.id, field, field_index); + }); } }, components: { @@ -270,14 +279,29 @@ export default { field: {field_name: 'field_le_probleme', value:'value'} }" v-on:updated="reloadConcernementCerclePol(cid)"/> + {{ ct_cercle_politique.field_enquete_terraindevie.label }} - - {{ doleance.lenquete }} + + - - Ajouter un crecle politique - - - - Chargement - - + + Ajouter un crecle politique + + + + Chargement + +