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

cercle politique admin front fine tunning

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi 2025-03-13 12:02:21 +01:00
parent 076a0b4c67
commit 86074b4bb0
2 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/ConcernementMapItem.vue
View File

@ -382,6 +382,7 @@ export default {
console.log(`${this.id} watch concernement.doleances o, n`, o, n); console.log(`${this.id} watch concernement.doleances o, n`, o, n);
if (this.is_open && this.map_mode === "doleancer") { if (this.is_open && this.map_mode === "doleancer") {
this.setPaperDoleances(true); // true for update=true this.setPaperDoleances(true); // true for update=true
this.focusOpenedDoleanceStep();
} }
}, },
deep: true deep: true
@ -2270,7 +2271,7 @@ export default {
// focus on opened doleance step // focus on opened doleance step
if (this.concernement.opened_doleance.field) { if (this.concernement.opened_doleance.field) {
let paper_doleance = this.paper_main_object.children.doleances.children[`doleance_${this.concernement.opened_doleance.id}`]; let paper_doleance = this.paper_main_object.children.doleances.children[`doleance_${this.concernement.opened_doleance.id}`];
console.log('paper_doleance', paper_doleance); // console.log('paper_doleance', paper_doleance);
paper_doleance.children.forEach((step) =>{ paper_doleance.children.forEach((step) =>{
// console.log('step.item_type', step.item_type); // console.log('step.item_type', step.item_type);
let active = false; let active = false;
@ -2289,6 +2290,7 @@ export default {
if (active) { if (active) {
// step.data.prevStrokeColor is for hover_elmt watch in MapConcernements.vue // step.data.prevStrokeColor is for hover_elmt watch in MapConcernements.vue
step.data.prevStrokeColor = step.strokeColor = "#01ffe2"; step.data.prevStrokeColor = step.strokeColor = "#01ffe2";
step.bringToFront();
} else { } else {
step.data.prevStrokeColor = step.strokeColor = "#fff"; step.data.prevStrokeColor = step.strokeColor = "#fff";
} }

29
src/components/contents/Doleancer.vue
View File

@ -77,7 +77,7 @@ export default {
}, },
created () { created () {
this.concernement = this.concernementsByID[this.cid]; this.concernement = this.concernementsByID[this.cid];
console.log(`Doleancer content created, id: ${this.cid}, doleances:`,this.concernement.doleances); console.log(`Doleancer content created, id: ${this.cid}, doleances:`,this.concernement.doleances, "opened_doleance" ,this.concernement.opened_doleance);
this.concernement.doleances.forEach((doleance, index) => { this.concernement.doleances.forEach((doleance, index) => {
if (doleance.id === this.concernement.opened_doleance.id) { if (doleance.id === this.concernement.opened_doleance.id) {
this.doleance = doleance; this.doleance = doleance;
@ -110,9 +110,11 @@ export default {
} else { } else {
this.concernement = this.concernementsByID[this.cid]; this.concernement = this.concernementsByID[this.cid];
console.log(`Doleancer content created, id: ${this.cid}, doleances:`,this.concernement.doleances); console.log(`Doleancer watched opened_concernement, id: ${this.cid}, doleances:`,this.concernement.doleances, "opened_doleance", this.concernement.opened_doleance);
this.concernement.doleances.forEach((doleance, index) => { this.concernement.doleances.forEach((doleance, index) => {
if (doleance.id === this.concernement.opened_doleance.id) { if (doleance.id === this.concernement.opened_doleance.id) {
console.log('yes');
this.doleance = doleance; this.doleance = doleance;
this.doleance_index = index; this.doleance_index = index;
} }
@ -220,7 +222,10 @@ export default {
}, },
// groupe interet // groupe interet
addgroupInteret(e){ addgroupInteret(e){
this.createCerclepoParagGeneric('groupes_interets', 'field_groupes', 'groupesinterets'); this.createCerclepoParagGeneric('groupes_interets', 'field_groupes', 'groupesinterets')
.then(()=>{
this.setOpenedDoleanceField(this.cid, this.doleance.id, "groupesinterets", this.doleance.groupesinterets.length-1);
});
}, },
addReceptionEtTraitement(e){ addReceptionEtTraitement(e){
this.createCerclepoParagGeneric('reception_et_traitement', 'field_receptions_et_traitements', 'reception_traitement'); this.createCerclepoParagGeneric('reception_et_traitement', 'field_receptions_et_traitements', 'reception_traitement');
@ -412,6 +417,7 @@ export default {
<section <section
v-if="opened_dol.field === 'leprobleme' || !opened_dol.field"> v-if="opened_dol.field === 'leprobleme' || !opened_dol.field">
<!-- <span class="date">{{ doleance.date_leprobleme.start }}</span> --> <!-- <span class="date">{{ doleance.date_leprobleme.start }}</span> -->
<h5>{{ ct_cercle_politique.field_le_probleme.label }}</h5>
<DateEditable <DateEditable
:value="doleance.date_leprobleme.start" :value="doleance.date_leprobleme.start"
class="leprobleme-date" class="leprobleme-date"
@ -423,7 +429,6 @@ export default {
field: {field_name: 'field_date_leprobleme'} field: {field_name: 'field_date_leprobleme'}
}" }"
v-on:updated="reloadConcernementCerclePol(cid)"/> v-on:updated="reloadConcernementCerclePol(cid)"/>
<h5>{{ ct_cercle_politique.field_le_probleme.label }}</h5>
<ContentEditable <ContentEditable
tag="h4" tag="h4"
:value="doleance.leprobleme" :value="doleance.leprobleme"
@ -464,6 +469,7 @@ export default {
<section <section
v-if="opened_dol.field === 'groupesinterets'" v-if="opened_dol.field === 'groupesinterets'"
class="groupesinterets"> class="groupesinterets">
<h5>Construction de groupes d'intérets avec qui composer la doléance</h5>
<span class="date"> <span class="date">
<!-- {{ groupeinteret.date.start }} <!-- {{ groupeinteret.date.start }}
&#x2192; &#x2192;
@ -483,7 +489,6 @@ export default {
}" }"
v-on:updated="reloadConcernementCerclePol(cid)"/> v-on:updated="reloadConcernementCerclePol(cid)"/>
</span> </span>
<h5>Construction de groupes d'intérets avec qui composer la doléance</h5>
<section> <section>
<label for="groupe">{{ p_groupes_interets.field_groupe_interets.label }}</label> <label for="groupe">{{ p_groupes_interets.field_groupe_interets.label }}</label>
<!-- <p <!-- <p
@ -619,6 +624,7 @@ export default {
<section <section
v-if="opened_dol.field === 'reception_traitement'" v-if="opened_dol.field === 'reception_traitement'"
class="reception_traitement"> class="reception_traitement">
<h5>Reception et traitement de la doléance</h5>
<span class="date"> <span class="date">
<!-- {{ doleance.reception_traitement[opened_dol.field_index].date.start }} <!-- {{ doleance.reception_traitement[opened_dol.field_index].date.start }}
&#x2192; &#x2192;
@ -638,7 +644,6 @@ export default {
}" }"
v-on:updated="reloadConcernementCerclePol(cid)"/> v-on:updated="reloadConcernementCerclePol(cid)"/>
</span> </span>
<h5>Reception et traitement de la doléance</h5>
<label for="entite_recoit_doleance">{{ p_reception_et_traitement.field_entite_recoit_doleance.label }}</label> <label for="entite_recoit_doleance">{{ p_reception_et_traitement.field_entite_recoit_doleance.label }}</label>
<!-- <p <!-- <p
name="entite_recoit_doleance" name="entite_recoit_doleance"
@ -1066,7 +1071,7 @@ export default {
<template v-slot:footer> <template v-slot:footer>
<template v-if="concernement.can_update"> <template v-if="concernement.can_update && opened_concernement.opened_doleance">
<template v-if="opened_concernement.opened_doleance.field === 'decision' || opened_concernement.opened_doleance.field === 'mise_en_oeuvre_decision'"> <template v-if="opened_concernement.opened_doleance.field === 'decision' || opened_concernement.opened_doleance.field === 'mise_en_oeuvre_decision'">
<div <div
@ -1081,7 +1086,7 @@ export default {
</div> </div>
</template> </template>
<template v-if="opened_concernement.opened_doleance.field === 'adresse_de_la_doleance' || opened_concernement.opened_doleance.field === 'reception_et_traitement'"> <template v-if="opened_concernement.opened_doleance.field === 'adresse_de_la_doleance' || opened_concernement.opened_doleance.field === 'reception_traitement'">
<div <div
v-if="!reloading_concernements" v-if="!reloading_concernements"
@click="addReceptionEtTraitement" @click="addReceptionEtTraitement"
@ -1172,7 +1177,9 @@ export default {
</div> </div>
</template> </template>
<template v-if="opened_concernement.opened_doleance.field === 'leprobleme' || opened_concernement.opened_doleance.field === 'lenquete'"> </template>
<template v-if="!opened_concernement.opened_doleance || opened_concernement.opened_doleance.field === 'leprobleme' || opened_concernement.opened_doleance.field === 'lenquete'">
<div v-if="!reloading_concernements" <div v-if="!reloading_concernements"
@click="addCerclePo" @click="addCerclePo"
class="add-cerclepo-btn btn"> class="add-cerclepo-btn btn">
@ -1184,13 +1191,11 @@ export default {
</div> </div>
</template> </template>
</template>
<!-- <vue-plyr> <!-- <vue-plyr>
<div class="plyr__video-embed"> --> <div class="plyr__video-embed"> -->
<iframe <iframe
v-if="opened_concernement.opened_doleance.field === 'leprobleme' || opened_concernement.opened_doleance.field === 'lenquete'" v-if="!opened_concernement.opened_doleance || opened_concernement.opened_doleance.field === 'leprobleme' || opened_concernement.opened_doleance.field === 'lenquete'"
src="https://www.youtube.com/embed/_Uogb4tJ9c4?amp;iv_load_policy=3&amp;modestbranding=1&amp;playsinline=1&amp;showinfo=0&amp;rel=0&amp;enablejsapi=1" src="https://www.youtube.com/embed/_Uogb4tJ9c4?amp;iv_load_policy=3&amp;modestbranding=1&amp;playsinline=1&amp;showinfo=0&amp;rel=0&amp;enablejsapi=1"
allowfullscreen allowfullscreen
allowtransparency allowtransparency