From 744812eb391fb48e4a540720343aadc8d273a1d3 Mon Sep 17 00:00:00 2001
From: Surya Paolo <paolo.arena77@gmail.com>
Date: Sun, 29 Sep 2024 23:26:44 +0200
Subject: [PATCH] =?UTF-8?q?-=20Transazioni=20Pendenti=20(all'Admin=20compa?=
 =?UTF-8?q?iono=20tutte=20quelle=20pendenti=20e=20con=20la=20possibilit?=
 =?UTF-8?q?=C3=A0=20di=20accettarle)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CMovements/CMovements.scss     |   5 +
 src/components/CMovements/CMovements.vue      |   4 +-
 src/components/CNotifAtTop/CNotifAtTop.vue    |   6 +-
 .../toolbar/coinsPopover/coinsPopover.ts      |  11 +-
 src/statics/lang/it.js                        |   1 +
 src/store/CircuitStore.ts                     |   3 +-
 src/views/admin/dbop/dbop.vue                 |  16 +++
 tsconfig.json                                 | 115 +++++++++++++-----
 8 files changed, 127 insertions(+), 34 deletions(-)

diff --git a/src/components/CMovements/CMovements.scss b/src/components/CMovements/CMovements.scss
index 3753f15e..ef472d54 100755
--- a/src/components/CMovements/CMovements.scss
+++ b/src/components/CMovements/CMovements.scss
@@ -18,4 +18,9 @@
 
 .rigamov {
     background-color: lightgray;
+}
+
+.causale {
+    font-weight: bold;
+    margin-bottom: 8px;
 }
\ No newline at end of file
diff --git a/src/components/CMovements/CMovements.vue b/src/components/CMovements/CMovements.vue
index 36b48457..547b7c70 100755
--- a/src/components/CMovements/CMovements.vue
+++ b/src/components/CMovements/CMovements.vue
@@ -18,7 +18,9 @@
       </q-item-section>
 
       <q-item-section>
-        <q-item-label v-if="mov.causal">{{ mov.causal }}</q-item-label>
+        <q-item-label class="causale" v-if="mov.causal">{{
+          mov.causal
+        }}</q-item-label>
         <q-item-label lines="1">
           {{ t('movement.from') }} <span class="myfrom">{{ mov.myfrom }}</span>
         </q-item-label>
diff --git a/src/components/CNotifAtTop/CNotifAtTop.vue b/src/components/CNotifAtTop/CNotifAtTop.vue
index 43ae0110..f42defb0 100755
--- a/src/components/CNotifAtTop/CNotifAtTop.vue
+++ b/src/components/CNotifAtTop/CNotifAtTop.vue
@@ -2,7 +2,11 @@
   <div class="q-ma-sm text-center">
     <q-btn
       v-if="num_notifs > 0"
-      :label="(num_notifs > 1) ? t('circuit.mov_in_arrivo', {mov: num_notifs}) : t('circuit.ris_in_arrivo')"
+      :label="
+        num_notifs > 1
+          ? t('circuit.mov_in_arrivo', { mov: num_notifs })
+          : t('circuit.ris_in_arrivo')
+      "
       @click="shownotif = true"
       icon="fas fa-coins"
       rounded
diff --git a/src/layouts/toolbar/coinsPopover/coinsPopover.ts b/src/layouts/toolbar/coinsPopover/coinsPopover.ts
index 747ef33a..39373da6 100755
--- a/src/layouts/toolbar/coinsPopover/coinsPopover.ts
+++ b/src/layouts/toolbar/coinsPopover/coinsPopover.ts
@@ -111,8 +111,15 @@ export default defineComponent({
 
     function getlastnotifcoins(username: string): any {
       // Get msg for this chat
-      if (notifStore.last_notifcoins)
-        return notifStore.last_notifcoins.find((rec: INotif) => rec.dest === username)
+      if (notifStore.last_notifcoins) {
+        if (userStore.isAdmin) {
+          console.log('userStore.isAdmin', userStore.isAdmin, notifStore.last_notifcoins)
+          return notifStore.last_notifcoins
+        } else {
+          return notifStore.last_notifcoins.find((rec: INotif) => rec.dest === username)
+        }
+
+      }
       // return users_msg_saved[username]
     }
 
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index 11e082c5..3d656727 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -1465,6 +1465,7 @@ const msg_it = {
       movements: 'Movimenti',
       ris_in_arrivo: '👉🏻 Apri, hai RIS da ricevere !',
       mov_in_arrivo: '👉🏻 Apri {mov} transazioni in RIS!',
+      mov_in_arrivo_sent: '👉🏻  {mov} transazioni UTENTI in RIS!',
       transaz: 'mov',
       movements_made: 'Movimenti effettuati',
       contocomunitario: 'Conto Comunitario',
diff --git a/src/store/CircuitStore.ts b/src/store/CircuitStore.ts
index 29e78dd6..95f501b9 100755
--- a/src/store/CircuitStore.ts
+++ b/src/store/CircuitStore.ts
@@ -109,7 +109,8 @@ export const useCircuitStore = defineStore('CircuitStore', {
       let arrcircnaz = this.listcircuits.filter((rec: ICircuit) => rec.showAlways)
 
       for (const circ of arrcircnaz) {
-        circ.account = userStore.my.profile.useraccounts.find((rec: IAccount) => rec.circuitId === circ._id)
+        if (userStore.my.profile.useraccounts)
+          circ.account = userStore.my.profile.useraccounts.find((rec: IAccount) => rec.circuitId === circ._id)
       }
 
       return arrcircnaz
diff --git a/src/views/admin/dbop/dbop.vue b/src/views/admin/dbop/dbop.vue
index b50e66de..6398633b 100755
--- a/src/views/admin/dbop/dbop.vue
+++ b/src/views/admin/dbop/dbop.vue
@@ -655,6 +655,22 @@
     ></q-btn>
     <br />
   </div>
+  <div class="row">
+    <q-btn
+      label="Rimuovi Transazioni Pendenti"
+      color="primary"
+      @click="EseguiFunz('RemovePendentTransactions')"
+    ></q-btn>
+    <br />
+  </div>
+  <div class="row">
+    <q-btn
+      label="Rimuovi Vecchie Notifiche (indietro di 3 mesi)"
+      color="primary"
+      @click="EseguiFunz('RemoveOldNotif90')"
+    ></q-btn>
+    <br />
+  </div>
   <div class="row">
     <q-btn
       label="Correggi Transazioni Circuiti"
diff --git a/tsconfig.json b/tsconfig.json
index fe3b5f5c..84fc3f0b 100755
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -6,9 +6,8 @@
     "tests",
     "src-pwa",
     "public/js",
-
     // these are the eslint-only inclusions
-      "**/*.config.js" // for *.config.js files
+    "**/*.config.js" // for *.config.js files
   ],
   "compilerOptions": {
     "sourceMap": true,
@@ -16,37 +15,95 @@
     "experimentalDecorators": true,
     "baseUrl": ".",
     "paths": {
-      "@components": ["src/components/index.ts"],
-      "@costanti": ["src/store/Modules/costanti.ts"],
-      "@boot": ["src/boot/*"],
-      "@views": ["src/views/*"],
-      "@src/*": ["src/*"],
-      "@/*": ["src/*"],
-      "@css": ["src/public/css/variables.scss"],
-      "@icons": ["src/public/icons/*"],
-      "@images": ["src/public/images/*"],
-      "@maps": ["src/public/maps/*"],
-      "@classes": ["src/classes/index.ts"],
-      "@utils": ["src/utils/index.ts"],
-      "@router": ["src/router/index.ts"],
-      "@validators": ["src/utils/validators.ts"],
-      "@methods": ["src/utils/methods.ts"],
-      "@api": ["src/store/Api/index.ts"],
-      "@api/*": ["src/store/Api/*"],
-      "@paths": ["src/store/Api/ApiRoutes.ts"],
-      "@storemod": ["src/store/Modules/*"],
-      "@store/*": ["src/store/*"],
-      "@modules": ["src/store/Modules/index.ts"],
-      "@model": ["src/model/index.ts"],
-      "@model/*": ["src/model/*"],
-      "model": ["src/model/index.ts"],
-      "enums": ["src/enums/*"],
+      "@components": [
+        "src/components/index.ts"
+      ],
+      "@costanti": [
+        "src/store/Modules/costanti.ts"
+      ],
+      "@boot": [
+        "src/boot/*"
+      ],
+      "@views": [
+        "src/views/*"
+      ],
+      "@src/*": [
+        "src/*"
+      ],
+      "@/*": [
+        "src/*"
+      ],
+      "@css": [
+        "src/public/css/variables.scss"
+      ],
+      "@icons": [
+        "src/public/icons/*"
+      ],
+      "@images": [
+        "src/public/images/*"
+      ],
+      "@maps": [
+        "src/public/maps/*"
+      ],
+      "@classes": [
+        "src/classes/index.ts"
+      ],
+      "@utils": [
+        "src/utils/index.ts"
+      ],
+      "@router": [
+        "src/router/index.ts"
+      ],
+      "@validators": [
+        "src/utils/validators.ts"
+      ],
+      "@methods": [
+        "src/utils/methods.ts"
+      ],
+      "@api": [
+        "src/store/Api/index.ts"
+      ],
+      "@api/*": [
+        "src/store/Api/*"
+      ],
+      "@paths": [
+        "src/store/Api/ApiRoutes.ts"
+      ],
+      "@storemod": [
+        "src/store/Modules/*"
+      ],
+      "@store/*": [
+        "src/store/*"
+      ],
+      "@modules": [
+        "src/store/Modules/index.ts"
+      ],
+      "@model": [
+        "src/model/index.ts"
+      ],
+      "@model/*": [
+        "src/model/*"
+      ],
+      "model": [
+        "src/model/index.ts"
+      ],
+      "enums": [
+        "src/enums/*"
+      ],
       "crypto": [
         "node_modules/bcryptjs"
       ],
     }
   },
   "exclude": [
-    "node_modules"
+    "node_modules",
+    "dist",
+    "build",
+    "public/js",
+    "_ALL_SITES",
+    "__riso.app",
+    "docs",
+    "statics",
+    "upload",
   ]
-}
+}
\ No newline at end of file