From 962335a15465614ddc80f5c1fa16dbdc57321368 Mon Sep 17 00:00:00 2001
From: bach <bachir@figureslibres.io>
Date: Fri, 7 Jul 2023 12:49:32 +0200
Subject: [PATCH] fixed auto open concernement on first load

---
 src/components/ConcernementMapItem.vue   | 17 +++++++++--------
 src/components/contents/TerrainDeVie.vue |  7 ++++---
 src/stores/concernements.js              |  6 ++++--
 src/views/Concernement.vue               |  5 ++---
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/components/ConcernementMapItem.vue b/src/components/ConcernementMapItem.vue
index 8d0be25..b17cc5b 100644
--- a/src/components/ConcernementMapItem.vue
+++ b/src/components/ConcernementMapItem.vue
@@ -62,14 +62,14 @@ export default {
   },
   props: ['concernement', 'is_opened'],
   computed: {
-    ...mapState(ConcernementsStore,['map_mode']),
-    ...mapState(ConcernementsStore,['concernementsByID']),
-    ...mapState(ConcernementsStore,['opened_concernement']),
-    ...mapState(ConcernementsStore,['opened_entite_id']),
-    ...mapState(CommonStore,['hover_elmt']),
-    ...mapState(CommonStore,['map_item_ray']),
-    ...mapState(CommonStore,['cartouch_width']),
-    ...mapState(CommonStore,['paper_symbol_definitions'])
+    ...mapState(ConcernementsStore,['map_mode',
+                                    'concernementsByID',
+                                    'opened_concernement',
+                                    'opened_entite_id']),
+    ...mapState(CommonStore,['hover_elmt',
+                            'map_item_ray',
+                            'cartouch_width',
+                            'paper_symbol_definitions'])
   },
   created () {
     // console.log(`ConcernementsMapItem ${this.concernement.id} created`, this.canvasMap, this.matterEngine);
@@ -122,6 +122,7 @@ export default {
     },
     is_opened: {
       handler (n, o) {
+        // console.log('mapItem watch is_opened', n, this.is_opened);
         if(n){ // opened
           this.openClose(true);
         }else{ // closed
diff --git a/src/components/contents/TerrainDeVie.vue b/src/components/contents/TerrainDeVie.vue
index f0a92fd..b715937 100644
--- a/src/components/contents/TerrainDeVie.vue
+++ b/src/components/contents/TerrainDeVie.vue
@@ -24,9 +24,10 @@ export default {
     }
   },
   computed: {
-    ...mapState(ConcernementsStore,['opened_concernement']),
-    ...mapState(ConcernementsStore,['ct_concernement']),
-    ...mapState(ConcernementsStore,['ct_entite']),
+    ...mapState(ConcernementsStore,['map_mode',
+                                    'opened_concernement',
+                                    'ct_concernement',
+                                    'ct_entite']),
     ...mapState(UserStore,['name']),
     created(){
       let d = new Date(this.opened_concernement.created); 
diff --git a/src/stores/concernements.js b/src/stores/concernements.js
index 8837e12..8172f14 100644
--- a/src/stores/concernements.js
+++ b/src/stores/concernements.js
@@ -214,7 +214,7 @@ export const ConcernementsStore = defineStore({
 
     },
     hideShowConcernement (id, state) {
-      console.log(`disableConcernement id: ${id}`);
+      // console.log(`disableConcernement id: ${id}`);
       this.concernements.forEach((c, i) => {
         if (c.id === id) {
           this.concernements[i].visible = this.concernementsByID[id].visible = state;  
@@ -226,9 +226,11 @@ export const ConcernementsStore = defineStore({
       var state;
       this.concernements.forEach((c, i) => {
         state = id === c.id;
-        this.concernements[i].opened = this.concernementsByID[c.id].opened = state;
+        // console.log(`openCloseConcernements foreach id: ${id}, c.id: ${c.id}, state: ${state}`, id, c.id);
+        c.opened = this.concernements[i].opened = this.concernementsByID[c.id].opened = state;
         if (state) {
           this.opened_concernement = c;
+          // console.log('openCloseConcernements', this.opened_concernement.opened);
         }
       });
     },
diff --git a/src/views/Concernement.vue b/src/views/Concernement.vue
index 4677aa2..2b6db97 100644
--- a/src/views/Concernement.vue
+++ b/src/views/Concernement.vue
@@ -42,12 +42,11 @@ export default {
   watch: {
     concernements_loaded: {
       handler (n, o){
-        console.log(`watch concernements_loaded n: ${n}, opened_concernement:${this.opened_concernement}, id:${this.id}`);
+        // console.log(`watch concernements_loaded n: ${n}, opened_concernement:${this.opened_concernement}, id:${this.id}`);
         // when we arrived directly to the url then all concernement are loaded: do open the concernement
         if (!this.opened_concernement) {
-          this.openCloseConcernements(this.id)
+          this.openCloseConcernements(parseInt(this.id))
         }
-   
       },
       deep: true
     },