From 7068e457dc9c5b024f6d83e6409a4d49c1e17c32 Mon Sep 17 00:00:00 2001
From: Surya Paolo <paolo.arena77@gmail.com>
Date: Sat, 17 Feb 2024 15:07:29 +0100
Subject: [PATCH] - corretto saldi pendenti sulla lista circuiti e anche il
 calcolo

---
 src/components/CCurrencyValue/CCurrencyValue.vue     | 3 ++-
 src/components/CMyCircuit/CMyCircuit.ts              | 2 ++
 src/components/CMyCircuit/CMyCircuit.vue             | 3 ++-
 src/components/CMyUser/CMyUser.vue                   | 3 ++-
 src/components/CSaldo/CSaldo.ts                      | 5 +++++
 src/components/CSaldo/CSaldo.vue                     | 7 ++++++-
 src/components/CUserInfoAccount/CUserInfoAccount.vue | 2 ++
 src/views/user/mycircuit/mycircuit.ts                | 5 ++++-
 src/views/user/mycircuit/mycircuit.vue               | 6 ++++--
 9 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/components/CCurrencyValue/CCurrencyValue.vue b/src/components/CCurrencyValue/CCurrencyValue.vue
index 844dfc9d..b22e63d9 100755
--- a/src/components/CCurrencyValue/CCurrencyValue.vue
+++ b/src/components/CCurrencyValue/CCurrencyValue.vue
@@ -1,4 +1,5 @@
 <template>
+
   <div v-if="small">
     <q-chip
       dense
@@ -8,7 +9,7 @@
       text-color="white"
       icon="fas fa-coins"
     >
-      {{ tools.roundDec2(modelValue) }}
+      {{ valueextra }} {{ tools.roundDec2(modelValue) }}
       <span class="text-currency"
         >&nbsp;<em
           class="q-pa-xxs text-white rounded-borders shadow-2"
diff --git a/src/components/CMyCircuit/CMyCircuit.ts b/src/components/CMyCircuit/CMyCircuit.ts
index 25ca31fb..84ddf6df 100755
--- a/src/components/CMyCircuit/CMyCircuit.ts
+++ b/src/components/CMyCircuit/CMyCircuit.ts
@@ -66,6 +66,7 @@ export default defineComponent({
     const account = computed(() => circuit.value ? userStore.getAccountByCircuitId(circuit.value._id) : null )
 
     const qtarem = computed(() => account.value ? circuitStore.getRemainingCoinsToSend(account.value) : 0)
+    const saldo_pend = computed(() => account.value ? account.value.saldo_pend : 0)
     const saldo = computed(() => account.value ? account.value.saldo : 0)
 
     const table = ref(toolsext.TABCIRCUITS)
@@ -151,6 +152,7 @@ export default defineComponent({
       account,
       qtarem,
       saldo,
+      saldo_pend,
       globalStore,
       showingtooltip,
       showrules,
diff --git a/src/components/CMyCircuit/CMyCircuit.vue b/src/components/CMyCircuit/CMyCircuit.vue
index 1b930e3d..bbca6df9 100755
--- a/src/components/CMyCircuit/CMyCircuit.vue
+++ b/src/components/CMyCircuit/CMyCircuit.vue
@@ -112,7 +112,8 @@
               :account="account"
               :symbol="circuit.symbol"
               :color="circuit.color"
-              :saldo="saldo"
+              :saldo="saldo_pend"
+              :valueextra="saldo_pend != saldo ? `* ` : ''"
               :qtarem="qtarem"
             >
             </CSaldo>
diff --git a/src/components/CMyUser/CMyUser.vue b/src/components/CMyUser/CMyUser.vue
index 624895cf..dc1221c5 100755
--- a/src/components/CMyUser/CMyUser.vue
+++ b/src/components/CMyUser/CMyUser.vue
@@ -62,7 +62,8 @@
               :account="contact.account"
               :symbol="tools.getSymbolByCircuit(circuit)"
               :color="tools.getColorByCircuit(circuit)"
-              :saldo="contact.account.saldo"
+              :saldo="contact.account.saldo_pend"
+              :valueextra="contact.account.saldo_pend !== contact.account.saldo ? '*': ''"
             >
             </CSaldo>
           </div>
diff --git a/src/components/CSaldo/CSaldo.ts b/src/components/CSaldo/CSaldo.ts
index 0ca0cd98..60407110 100755
--- a/src/components/CSaldo/CSaldo.ts
+++ b/src/components/CSaldo/CSaldo.ts
@@ -22,6 +22,11 @@ export default defineComponent({
       type: String,
       required: true,
     },
+    valueextra: {
+      type: String,
+      required: false,
+      default: '',
+    },
     saldo: {
       type: Number,
       required: true,
diff --git a/src/components/CSaldo/CSaldo.vue b/src/components/CSaldo/CSaldo.vue
index 1eff78a8..0f04e4d0 100755
--- a/src/components/CSaldo/CSaldo.vue
+++ b/src/components/CSaldo/CSaldo.vue
@@ -9,6 +9,11 @@
     :label="t('account.saldo')"
     :paramTypeAccount="paramTypeAccount"
     :myrecparam="account"
+    :valueextra="
+      account && account.notifspending && account.notifspending.length > 0
+        ? `* `
+        : (valueextra ? valueextra : '')
+    "
   >
   </CCurrencyValue>
   <CCurrencyValue
@@ -22,7 +27,7 @@
     :valueextra="
       account && account.notifspending && account.notifspending.length > 0
         ? `* `
-        : ''
+        : (valueextra ? valueextra : '')
     "
     :label="
       `(` + t('account.dispon') + `: ` + qtarem + ` ` + symbol + `)`
diff --git a/src/components/CUserInfoAccount/CUserInfoAccount.vue b/src/components/CUserInfoAccount/CUserInfoAccount.vue
index 5d48b9ff..97fc3aa9 100755
--- a/src/components/CUserInfoAccount/CUserInfoAccount.vue
+++ b/src/components/CUserInfoAccount/CUserInfoAccount.vue
@@ -33,6 +33,7 @@
       :symbol="circuit.symbol"
       :color="circuit.color"
       :saldo="myaccount.saldo_pend"
+      :valueextra="myaccount.saldo_pend !== myaccount.saldo ? '*': ''"
       :qtarem="myaccount ? circuitStore.getRemainingCoinsToSend(myaccount) : 0"
     >
     </CSaldo>
@@ -71,6 +72,7 @@
           :symbol="circnaz.symbol"
           :color="circnaz.color"
           :saldo="circnaz.account.saldo_pend"
+          :valueextra="circnaz.account.saldo_pend !== circnaz.account.saldo ? '*': ''"
           :qtarem="
             myaccount
               ? circuitStore.getRemainingCoinsToSend(circnaz.account)
diff --git a/src/views/user/mycircuit/mycircuit.ts b/src/views/user/mycircuit/mycircuit.ts
index 93951a46..6eb17339 100755
--- a/src/views/user/mycircuit/mycircuit.ts
+++ b/src/views/user/mycircuit/mycircuit.ts
@@ -76,6 +76,7 @@ export default defineComponent({
 
     const qtarem = ref(0)
     const saldo = ref(0)
+    const saldo_pend = ref(0)
 
     const loading = ref(false)
     const requestToEnterCircuit = ref(false)
@@ -121,7 +122,8 @@ export default defineComponent({
       fidoConcesso.value = account.value ? account.value.fidoConcesso : (circuit.value ? circuit.value.fido_scoperto_default : 0)
       qtaMax.value = account.value ? account.value.qta_maxConcessa : (circuit.value ? circuit.value.qta_max_default : 0)
       qtarem.value = account.value ? circuitStore.getRemainingCoinsToSend(account.value) : 0
-      saldo.value = account.value ? account.value.saldo_pend : 0
+      saldo.value = account.value ? account.value.saldo : 0
+      saldo_pend.value = account.value ? account.value.saldo_pend : 0
     }
 
 
@@ -554,6 +556,7 @@ export default defineComponent({
       loadSaldo,
       optionsmov,
       globalStore,
+      saldo_pend,
     }
   }
 })
diff --git a/src/views/user/mycircuit/mycircuit.vue b/src/views/user/mycircuit/mycircuit.vue
index a888649c..19b9f266 100755
--- a/src/views/user/mycircuit/mycircuit.vue
+++ b/src/views/user/mycircuit/mycircuit.vue
@@ -125,8 +125,9 @@
               :symbol="circuit.symbol"
               :account="account"
               :color="circuit.color"
-              :saldo="saldo"
+              :saldo="saldo_pend"
               :qtarem="account ? qtarem : 0"
+              :valueextra="saldo_pend != saldo ? `* ` : ''"
             >
             </CSaldo>
           </div>
@@ -1093,7 +1094,8 @@
                       :account="circuit.account"
                       :symbol="circuit.symbol"
                       :color="circuit.color"
-                      :saldo="circuit.account.saldo"
+                      :saldo="circuit.account.saldo_pend"
+                      :valueextra="circuit.account.saldo != circuit.account.saldo_pend ? `* ` : ''"
                       :qtarem="
                         circuit.account
                           ? circuitStore.getRemainingCoinsToSend(