diff --git a/.env.development b/.env.development index 406fec36..3916f6ee 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.8" +APP_VERSION="0.5.9" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index 23b5da26..606e946d 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.8" +APP_VERSION="0.5.9" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/insiemesipuo.app/.env.development b/_ALL_SITES/insiemesipuo.app/.env.development index 139be229..cb43446f 100755 --- a/_ALL_SITES/insiemesipuo.app/.env.development +++ b/_ALL_SITES/insiemesipuo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.8" +APP_VERSION="0.5.9" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/popolodelnuovomondo.app/.env.development b/_ALL_SITES/popolodelnuovomondo.app/.env.development index e3a87b54..7994338f 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/.env.development +++ b/_ALL_SITES/popolodelnuovomondo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.8" +APP_VERSION="0.5.9" SERVICE_WORKER_FILE="service-worker.js" APP_ID="12" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index 1e2d2424..dd695e43 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.8" +APP_VERSION="0.5.9" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.test b/_ALL_SITES/riso.app/.env.test index e3ccdbd3..177a5c20 100755 --- a/_ALL_SITES/riso.app/.env.test +++ b/_ALL_SITES/riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="0.5.8" +APP_VERSION="0.5.9" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/terradellavisione.app/.env.development b/_ALL_SITES/terradellavisione.app/.env.development index 1b7f2395..739a748d 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.8" +APP_VERSION="0.5.9" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/terradellavisione.app/.env.test b/_ALL_SITES/terradellavisione.app/.env.test index 3cdc42fa..1bcb1184 100755 --- a/_ALL_SITES/terradellavisione.app/.env.test +++ b/_ALL_SITES/terradellavisione.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="0.5.8" +APP_VERSION="0.5.9" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL=newfreeplanet diff --git a/src/components/CCurrencyValue/CCurrencyValue.ts b/src/components/CCurrencyValue/CCurrencyValue.ts index 280cbfee..6372848c 100755 --- a/src/components/CCurrencyValue/CCurrencyValue.ts +++ b/src/components/CCurrencyValue/CCurrencyValue.ts @@ -45,6 +45,11 @@ export default defineComponent({ type: Number, required: true, }, + valueextra: { + type: String, + required: false, + default: '', + }, }, components: {}, setup(props, { emit }) { diff --git a/src/components/CCurrencyValue/CCurrencyValue.vue b/src/components/CCurrencyValue/CCurrencyValue.vue index 4f05e457..67525e51 100755 --- a/src/components/CCurrencyValue/CCurrencyValue.vue +++ b/src/components/CCurrencyValue/CCurrencyValue.vue @@ -28,7 +28,7 @@ diff --git a/src/components/CMyCircuit/CMyCircuit.vue b/src/components/CMyCircuit/CMyCircuit.vue index 676293ae..633ce47d 100755 --- a/src/components/CMyCircuit/CMyCircuit.vue +++ b/src/components/CMyCircuit/CMyCircuit.vue @@ -14,6 +14,7 @@ {{ circuit.longdescr }} - + @@ -111,7 +111,7 @@ - + diff --git a/src/components/CSaldo/CSaldo.ts b/src/components/CSaldo/CSaldo.ts index 5e63f15c..47c92a8d 100755 --- a/src/components/CSaldo/CSaldo.ts +++ b/src/components/CSaldo/CSaldo.ts @@ -5,6 +5,10 @@ import { CCurrencyValue } from '../CCurrencyValue' import { date, useQuasar } from 'quasar' import { useI18n } from '@/boot/i18n' +import { IAccount, ISpecialField } from 'model' +import { CMyFieldDb } from '@/components/CMyFieldDb' +import { CMyFieldRec } from '@/components/CMyFieldRec' +import { colTableNotifCoins } from '@store/Modules/fieldsTable' export default defineComponent({ name: 'CSaldo', @@ -18,6 +22,11 @@ export default defineComponent({ required: true, default: 0, }, + account: { + type: Object as PropType, + required: false, + default: null, + }, qtarem: { type: Number, required: false, @@ -29,10 +38,11 @@ export default defineComponent({ default: '', }, }, - components: { CCurrencyValue }, + components: { CCurrencyValue, CMyFieldRec }, setup(props, { emit }) { const $q = useQuasar() const { t } = useI18n() + const color_border = ref('red') const showingtooltip = ref(false) @@ -46,6 +56,9 @@ export default defineComponent({ return { showingtooltip, t, + colTableNotifCoins, + tools, + color_border, } }, }) diff --git a/src/components/CSaldo/CSaldo.vue b/src/components/CSaldo/CSaldo.vue index 7d5edef8..e58a4991 100755 --- a/src/components/CSaldo/CSaldo.vue +++ b/src/components/CSaldo/CSaldo.vue @@ -5,9 +5,42 @@ :tips="t('account.saldo_tips', {fido: qtarem, symbol})" :color="color" :value="saldo" + :valueextra="account && account.notifspending ? `* `: ''" :label="t('account.saldo') + ` (` + t('account.dispon') + `: ` + qtarem + `)`"> + +
+
+ {{ t('movement.pendingtransaction') }} +
+ +
+
+ +
+ + {{ index + 1 }} + + + +
+
+
+
+
+ +