From 4ac0acc2f36c0bbda01cdff6c0e94bcd5f74db08 Mon Sep 17 00:00:00 2001
From: Surya Paolo <paolo.arena77@gmail.com>
Date: Wed, 18 Sep 2024 14:56:25 +0200
Subject: [PATCH] - se annuncio cancellato (mostra avviso)

---
 .../CMyCardService/CMyCardService.ts          | 21 ++++++++++++-------
 .../CMyCardService/CMyCardService.vue         | 10 +++++++++
 src/store/NotifStore.ts                       |  2 +-
 src/store/UserStore.ts                        |  8 +++----
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/components/CMyCardService/CMyCardService.ts b/src/components/CMyCardService/CMyCardService.ts
index 24d931df..4a63de4e 100644
--- a/src/components/CMyCardService/CMyCardService.ts
+++ b/src/components/CMyCardService/CMyCardService.ts
@@ -87,6 +87,7 @@ export default defineComponent({
     const $router = useRouter()
 
     const contextDay = ref(<any>null)
+    const ismounted = ref(false)
 
     const usersList = ref(<any>{ show: false, title: '', list: [], loadfromDb: false, tipofavbook: 0 })
     const bookedList = ref(<any>{ show: false, title: '', list: [], loadfromDb: false, tipofavbook: 0 })
@@ -143,7 +144,7 @@ export default defineComponent({
       state: EState.Creating,
     })
 
-    const myrec = ref(<any>{})
+    const myrec = ref(<any>null)
     const col = ref(<IColGridTable>{})
 
     const idnotif = computed(() => $route.query.idnotif ? $route.query.idnotif.toString() : '')
@@ -187,13 +188,14 @@ export default defineComponent({
     }
 
     async function load() {
-
+      console.log('load')
       // Carica il record
       if (props.idRec) {
         await userStore.loadGeneric(props.table, props.idRec, idnotif.value).then((ris) => {
           // console.log('myrec', myrec)
           myrec.value = ris
-          notifStore.setAsRead(idnotif.value)
+          if (ris)
+            notifStore.setAsRead(idnotif.value)
         }).catch((err) => {
 
         })
@@ -203,7 +205,8 @@ export default defineComponent({
         await userStore.loadGeneric(props.table, props.prop_myrec._id, idnotif.value).then((ris) => {
           // console.log('myrec', myrec)
           myrec.value = ris
-          notifStore.setAsRead(idnotif.value)
+          if (ris)
+            notifStore.setAsRead(idnotif.value)
         })
 
       }
@@ -212,16 +215,19 @@ export default defineComponent({
         clicca(costanti.TIPOFAVBOOK.SEEN, true, myrec.value._id)
 
       col.value = fieldsTable.getArrColsByTable(props.table)
+
+      ismounted.value = true
+
     }
 
     watch(() => props.idRec, (to: any, from: any) => {
-      load()
+      if (ismounted.value)
+        load()
     })
 
     async function mounted() {
-      load()
+      await load()
       await nextTick()
-
     }
 
     function updateCard() {
@@ -708,6 +714,7 @@ export default defineComponent({
       smallHeight,
       toggleShowScheda,
       showInMap,
+      ismounted,
     }
   }
 })
diff --git a/src/components/CMyCardService/CMyCardService.vue b/src/components/CMyCardService/CMyCardService.vue
index 8468b7f5..98157fc1 100644
--- a/src/components/CMyCardService/CMyCardService.vue
+++ b/src/components/CMyCardService/CMyCardService.vue
@@ -1041,6 +1041,16 @@
       />
     </div>
   </div>
+  <div v-else-if="ismounted && !myrec">
+    <br /><br />
+    <q-banner rounded class="q-ma-md q-pa-md bg-negative text-white">
+      <div class="text-h6 text-center">
+        Pagina non trovata<br />
+        Probabilmente l'annuncio è stato cancellato
+      </div>
+    </q-banner>
+    <br /><br />
+  </div>
 
   <q-dialog v-model="usersList.loadfromDb">
     <q-card class="dialog_card">
diff --git a/src/store/NotifStore.ts b/src/store/NotifStore.ts
index 6d7bad7f..24b43001 100755
--- a/src/store/NotifStore.ts
+++ b/src/store/NotifStore.ts
@@ -225,7 +225,7 @@ export const useNotifStore = defineStore('NotifStore', {
     },
 
     async updateNotifDataFromServer({ username, lastdataread }: { username: string, lastdataread: Date }) {
-      // console.log('updateNotifDataFromServer', username, lastdataread)
+      console.log('updateNotifDataFromServer', username, lastdataread)
 
       return Api.SendReq(`/sendnotif/${username}/${lastdataread}/${process.env.APP_ID}`, 'GET', null)
         .then((res) => {
diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts
index 9914ef10..344cbb4f 100755
--- a/src/store/UserStore.ts
+++ b/src/store/UserStore.ts
@@ -515,7 +515,7 @@ export const useUserStore = defineStore('UserStore', {
       else
         arrout = tools.getCommon([...this.my.profile.mycircuits], [...user.profile.mycircuits], 'circuitname')
 
-      
+
 
       // controlla che il circuito sia Abilitato e Territoriale !
       for (const circuitname of arrout) {
@@ -1697,7 +1697,7 @@ export const useUserStore = defineStore('UserStore', {
           return res.data
         }).catch((error) => {
           console.error('err', error)
-          return {}
+          return null
         })
 
     },
@@ -1872,11 +1872,11 @@ export const useUserStore = defineStore('UserStore', {
               } else {
                 msg = t('db.recupdated')
                 tools.showPositiveNotif($q, msg)
-              }              
+              }
             } else {
               tools.showPositiveNotif($q, msg)
             }
-            
+
           }
         }).catch((error) => {
           tools.showNegativeNotif($q, t('db.recfailed'))