diff --git a/src/assets/main.scss b/src/assets/main.scss index 3888a4c..59addc2 100644 --- a/src/assets/main.scss +++ b/src/assets/main.scss @@ -1305,7 +1305,8 @@ div.add-cerclepo-btn, div.add-groupinteret-btn, div.add-adressedoleance-btn, div.add-receptiontraitement-btn, -div.add-decision-btn{ +div.add-decision-btn, +div.add-miseenoeuvre-btn{ @include add-btn(); margin: 0 0 1em; height: 60px; diff --git a/src/components/ConcernementMapItem.vue b/src/components/ConcernementMapItem.vue index fbeb75f..1f43b25 100644 --- a/src/components/ConcernementMapItem.vue +++ b/src/components/ConcernementMapItem.vue @@ -2287,7 +2287,7 @@ export default { } if (active) { - // step.data.prevStrokeColor is for hover_elmt wtahc in MapConcernements.vue + // step.data.prevStrokeColor is for hover_elmt watch in MapConcernements.vue step.data.prevStrokeColor = step.strokeColor = "#01ffe2"; } else { step.data.prevStrokeColor = step.strokeColor = "#fff"; diff --git a/src/components/contents/Doleancer.vue b/src/components/contents/Doleancer.vue index 0745a72..5512b9a 100644 --- a/src/components/contents/Doleancer.vue +++ b/src/components/contents/Doleancer.vue @@ -67,6 +67,9 @@ export default { }, receptionettraitment() { return this.doleance.reception_traitement[this.opened_dol.field_index]; + }, + miseenoeuvredecision() { + return this.doleance.mise_en_oeuvre_decision[this.opened_dol.field_index]; } }, created () { @@ -207,6 +210,9 @@ export default { addReceptionEtTraitement(e){ this.createCerclepoParagGeneric('reception_et_traitement', 'field_receptions_et_traitements', 'reception_traitement'); }, + addMiseEnOeuvre(e){ + this.createCerclepoParagGeneric('mise_en_oeuvre_decision', 'field_mise_en_oeuvre_decision', 'mise_en_oeuvre_decision'); + }, createCerclepoParagGeneric(type, prt_field_name, obj_name){ console.log('createCerclepoParagGeneric',type, prt_field_name, obj_name); this.reloading_concernements = true; @@ -747,24 +753,77 @@ export default {
- - {{ doleance.mise_en_oeuvre_decision[opened_dol.field_index].date.start }} - → - {{ doleance.mise_en_oeuvre_decision[opened_dol.field_index].date.end }} -
{{ ct_cercle_politique.field_mise_en_oeuvre_decision.label }}
+ + + + -

--> + + :value="miseenoeuvredecision.entite_adressee_decision" + :html="true" + :class="{ ellipsed: headerreduced }" + :contenteditable="opened_concernement.can_update" + :data="{ + entitytype: 'paragraph', + bundle: 'mise_en_oeuvre_decision', + id: miseenoeuvredecision.id, + revision_id: miseenoeuvredecision.revision_id, + field: {field_name: 'field_entite_adresse_decision', value:'value'} + }" + v-on:updated="reloadConcernementCerclePol(cid)"/> -

--> + + :value="miseenoeuvredecision.formule_decision" + :html="true" + :class="{ ellipsed: headerreduced }" + :contenteditable="opened_concernement.can_update" + :data="{ + entitytype: 'paragraph', + bundle: 'mise_en_oeuvre_decision', + id: miseenoeuvredecision.id, + revision_id: miseenoeuvredecision.revision_id, + field: {field_name: 'field_formule_decision', value:'value'} + }" + v-on:updated="reloadConcernementCerclePol(cid)"/> -

--> + + :value="miseenoeuvredecision.entite_metenoeuvre_decisio" + :html="true" + :class="{ ellipsed: headerreduced }" + :contenteditable="opened_concernement.can_update" + :data="{ + entitytype: 'paragraph', + bundle: 'mise_en_oeuvre_decision', + id: miseenoeuvredecision.id, + revision_id: miseenoeuvredecision.revision_id, + field: {field_name: 'field_entite_metenoeuvre_decisio', value:'value'} + }" + v-on:updated="reloadConcernementCerclePol(cid)"/>

@@ -837,7 +896,18 @@ export default {