diff --git a/src/assets/main.scss b/src/assets/main.scss index 6d0413b..6ffaa92 100644 --- a/src/assets/main.scss +++ b/src/assets/main.scss @@ -1307,7 +1307,8 @@ div.add-adressedoleance-btn, div.add-receptiontraitement-btn, div.add-decision-btn, div.add-miseenoeuvre-btn, -div.add-adressedecision-btn{ +div.add-adressedecision-btn, +div.add-receptionapplicationdecision-btn{ @include add-btn(); margin: 0 0 1em; height: 60px; diff --git a/src/components/contents/Doleancer.vue b/src/components/contents/Doleancer.vue index 175ba04..4adc0b7 100644 --- a/src/components/contents/Doleancer.vue +++ b/src/components/contents/Doleancer.vue @@ -24,8 +24,8 @@ import { mdiStickerPlusOutline } from '@mdi/js'; import ContentEditable from '@components/editable/ContentEditable.vue'; import DateEditable from '@components/editable/DateEditable.vue'; +import SelectEditable from '@components/editable/SelectEditable.vue'; // import CheckboxEditable from '@components/editable/CheckboxEditable.vue'; -// import SelectEditable from '@components/editable/SelectEditable.vue'; export default { @@ -70,6 +70,9 @@ export default { }, miseenoeuvredecision() { return this.doleance.mise_en_oeuvre_decision[this.opened_dol.field_index]; + }, + receptionsetapplications() { + return this.doleance.receptions_et_applications[this.opened_dol.field_index]; } }, created () { @@ -207,6 +210,14 @@ export default { addAdresseDecision(e){ this.setOpenedDoleanceField(this.cid, this.doleance.id, "adresse_de_la_decision"); }, + // reception et application decision + addReceptionApplicationDecision(e){ + this.createCerclepoParagGeneric('reception_application_decision', 'field_receptions_et_applications', 'receptions_et_applications'); + }, + // reussite / echec + addReussiteEchec(e){ + this.setOpenedDoleanceField(this.cid, this.doleance.id, "probleme_initial_resolu"); + }, // groupe interet addgroupInteret(e){ this.createCerclepoParagGeneric('groupes_interets', 'field_groupes', 'groupesinterets'); @@ -219,22 +230,25 @@ export default { }, createCerclepoParagGeneric(type, prt_field_name, obj_name){ console.log('createCerclepoParagGeneric',type, prt_field_name, obj_name); - this.reloading_concernements = true; - // 1 create paragraphe - this.createParag(type, prt_field_name) - .then((parag) => { - console.log('createParag then parag', parag); - // 3 record on concernement field_entites - this.recordCerclepoParagField(parag, obj_name, prt_field_name) - .then((cercle_politique) => { - console.log('cercle_politique', cercle_politique); - // reload concernement doleances - this.reloadConcernementCerclePol(this.concernement.id) - .then(() => { - this.reloading_concernements = false; - }); - }) - }) + return new Promise((resolve, reject) => { + this.reloading_concernements = true; + // 1 create paragraphe + this.createParag(type, prt_field_name) + .then((parag) => { + console.log('createParag then parag', parag); + // 3 record on concernement field_entites + this.recordCerclepoParagField(parag, obj_name, prt_field_name) + .then((cercle_politique) => { + console.log('cercle_politique', cercle_politique); + // reload concernement doleances + this.reloadConcernementCerclePol(this.concernement.id) + .then(() => { + this.reloading_concernements = false; + resolve(); + }); + }) + }) + }); }, createParag(type, prt_field_name){ return new Promise((resolve, reject) => { @@ -363,8 +377,8 @@ export default { SvgIcon, ContentEditable, DateEditable, + SelectEditable // CheckboxEditable, - // SelectEditable } } @@ -901,27 +915,88 @@ export default {
- +
{{ ct_cercle_politique.field_receptions_et_applications.label }}
+ + + + -

+ v-html="doleance.receptions_et_applications[opened_dol.field_index].applique_decision" /> --> + -

+ v-html="doleance.receptions_et_applications[opened_dol.field_index].formule_decision_applic" /> --> + -

+ v-html="doleance.receptions_et_applications[opened_dol.field_index].entite_recoit_decision" /> --> + +

Réussite / échec / reprise du cercle politique -

+ v-html="doleance.probleme_initial_resolu" /> --> + -

+ v-html="doleance.oui_nouvelle_situation" /> --> + -

+ v-html="doleance.non_adresse_doleance" /> --> +

@@ -991,6 +1106,32 @@ export default {
Chargement
+ + + +