- corretto saldi pendenti sulla lista circuiti e anche il calcolo

This commit is contained in:
Surya Paolo
2024-02-17 15:07:29 +01:00
parent c57132c468
commit 7068e457dc
9 changed files with 29 additions and 7 deletions

View File

@@ -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"

View File

@@ -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,

View File

@@ -112,7 +112,8 @@
:account="account"
:symbol="circuit.symbol"
:color="circuit.color"
:saldo="saldo"
:saldo="saldo_pend"
:valueextra="saldo_pend != saldo ? `* ` : ''"
:qtarem="qtarem"
>
</CSaldo>

View File

@@ -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>

View File

@@ -22,6 +22,11 @@ export default defineComponent({
type: String,
required: true,
},
valueextra: {
type: String,
required: false,
default: '',
},
saldo: {
type: Number,
required: true,

View File

@@ -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 + `)`

View File

@@ -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)

View File

@@ -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,
}
}
})

View File

@@ -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(