From 86074b4bb0ba2176935f86b9e511a6f2476d4bae Mon Sep 17 00:00:00 2001
From: bach <bachir@figureslibres.io>
Date: Thu, 13 Mar 2025 12:02:21 +0100
Subject: [PATCH] cercle politique admin front fine tunning

---
 src/components/ConcernementMapItem.vue |  4 ++-
 src/components/contents/Doleancer.vue  | 49 ++++++++++++++------------
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/components/ConcernementMapItem.vue b/src/components/ConcernementMapItem.vue
index 1f43b25..f27a0a0 100644
--- a/src/components/ConcernementMapItem.vue
+++ b/src/components/ConcernementMapItem.vue
@@ -382,6 +382,7 @@ export default {
         console.log(`${this.id} watch concernement.doleances o, n`, o, n);
         if (this.is_open && this.map_mode === "doleancer") {
           this.setPaperDoleances(true); // true for update=true
+          this.focusOpenedDoleanceStep();
         }
       },
       deep: true
@@ -2270,7 +2271,7 @@ export default {
             // focus on opened doleance step
             if (this.concernement.opened_doleance.field) {
               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) =>{
                 // console.log('step.item_type', step.item_type);
                 let active = false;
@@ -2289,6 +2290,7 @@ export default {
                 if (active) {
                   // step.data.prevStrokeColor is for hover_elmt watch in MapConcernements.vue 
                   step.data.prevStrokeColor = step.strokeColor = "#01ffe2";
+                  step.bringToFront();
                 } else {
                   step.data.prevStrokeColor = step.strokeColor = "#fff";
                 }
diff --git a/src/components/contents/Doleancer.vue b/src/components/contents/Doleancer.vue
index 4adc0b7..1cb8e9c 100644
--- a/src/components/contents/Doleancer.vue
+++ b/src/components/contents/Doleancer.vue
@@ -77,7 +77,7 @@ export default {
   },
   created () {
     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) => {
       if (doleance.id === this.concernement.opened_doleance.id) {
         this.doleance = doleance;
@@ -110,9 +110,11 @@ export default {
           
         } else {
           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) => {
             if (doleance.id === this.concernement.opened_doleance.id) {
+              console.log('yes');
+              
               this.doleance = doleance;
               this.doleance_index = index;
             }
@@ -220,7 +222,10 @@ export default {
     },
     // groupe interet
     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){
       this.createCerclepoParagGeneric('reception_et_traitement', 'field_receptions_et_traitements', 'reception_traitement');
@@ -412,7 +417,8 @@ export default {
           <section
             v-if="opened_dol.field === 'leprobleme' || !opened_dol.field">
             <!-- <span class="date">{{ doleance.date_leprobleme.start }}</span> -->
-             <DateEditable
+            <h5>{{ ct_cercle_politique.field_le_probleme.label }}</h5>
+            <DateEditable
               :value="doleance.date_leprobleme.start"
               class="leprobleme-date" 
               :contenteditable="opened_concernement.can_update"
@@ -423,7 +429,6 @@ export default {
                 field: {field_name: 'field_date_leprobleme'}
               }"
               v-on:updated="reloadConcernementCerclePol(cid)"/>
-            <h5>{{ ct_cercle_politique.field_le_probleme.label }}</h5>
             <ContentEditable
               tag="h4"
               :value="doleance.leprobleme" 
@@ -464,6 +469,7 @@ export default {
           <section 
             v-if="opened_dol.field === 'groupesinterets'"
             class="groupesinterets">
+            <h5>Construction de groupes d'intérets avec qui composer la doléance</h5>
             <span class="date">
               <!-- {{ groupeinteret.date.start }}
               &#x2192;
@@ -483,7 +489,6 @@ export default {
                 }"
                 v-on:updated="reloadConcernementCerclePol(cid)"/>
             </span>
-            <h5>Construction de groupes d'intérets avec qui composer la doléance</h5>
             <section>
               <label for="groupe">{{ p_groupes_interets.field_groupe_interets.label }}</label>
               <!-- <p 
@@ -619,6 +624,7 @@ export default {
           <section
             v-if="opened_dol.field === 'reception_traitement'"
             class="reception_traitement">
+            <h5>Reception et traitement de la doléance</h5>
             <span class="date">
               <!-- {{ doleance.reception_traitement[opened_dol.field_index].date.start }}
               &#x2192;
@@ -638,7 +644,6 @@ export default {
                 }"
                 v-on:updated="reloadConcernementCerclePol(cid)"/>
             </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>
             <!-- <p 
               name="entite_recoit_doleance"
@@ -1066,7 +1071,7 @@ export default {
 
     <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'">
           <div 
@@ -1081,7 +1086,7 @@ export default {
           </div>
         </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 
             v-if="!reloading_concernements" 
             @click="addReceptionEtTraitement" 
@@ -1171,26 +1176,26 @@ export default {
             <div class="loading">Chargement</div>
           </div>
         </template>
-
-        <template v-if="opened_concernement.opened_doleance.field === 'leprobleme' || opened_concernement.opened_doleance.field === 'lenquete'">
-          <div v-if="!reloading_concernements" 
-            @click="addCerclePo" 
-            class="add-cerclepo-btn btn">
-              <span>Ajouter un cercle politique</span>
-              <svg-icon type="mdi" :path="mdiStickerPlusOutline_path"/>
-          </div>
-          <div v-else class="add-cerclepo-btn btn">
-            <div class="loading">Chargement</div>
-          </div>
-        </template>
         
       </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" 
+          @click="addCerclePo" 
+          class="add-cerclepo-btn btn">
+            <span>Ajouter un cercle politique</span>
+            <svg-icon type="mdi" :path="mdiStickerPlusOutline_path"/>
+        </div>
+        <div v-else class="add-cerclepo-btn btn">
+          <div class="loading">Chargement</div>
+        </div>
+      </template>
 
+      
       <!-- <vue-plyr>
         <div class="plyr__video-embed"> -->
           <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"
             allowfullscreen
             allowtransparency