From bd3a9557e2da521a1364a428f335966b85ab54f2 Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Mon, 5 Jun 2023 16:36:06 +0200 Subject: [PATCH] Filtra Ricerca... --- src/components/CBarSelection/CBarSelection.ts | 2 + .../CBarSelection/CBarSelection.vue | 394 ++-- src/components/CFinder/CFinder.ts | 62 +- src/components/CGridTableRec/CGridTableRec.ts | 17 +- .../CGridTableRec/CGridTableRec.vue | 82 +- src/components/CMyUser/CMyUser.ts | 8 +- src/components/CMyUser/CMyUser.vue | 36 +- .../CNotifSettings/CNotifSettings.vue | 18 +- src/components/CSendCoins/CSendCoins.ts | 10 +- src/components/CSendCoins/CSendCoins.vue | 489 ++-- src/statics/lang/it.js | 5 +- src/views/user/mycircuit/mycircuit.ts | 4 + src/views/user/mycircuit/mycircuit.vue | 2005 ++++++++--------- 13 files changed, 1604 insertions(+), 1528 deletions(-) diff --git a/src/components/CBarSelection/CBarSelection.ts b/src/components/CBarSelection/CBarSelection.ts index cfe19653..bb00eee0 100755 --- a/src/components/CBarSelection/CBarSelection.ts +++ b/src/components/CBarSelection/CBarSelection.ts @@ -100,6 +100,7 @@ export default defineComponent({ const serverData: any = ref([]) const numRecLoaded = ref(0) const changetable = ref(false) + const filtri = ref(false) const searchList = ref([] as ISearchList[]) const actual = '' @@ -349,6 +350,7 @@ export default defineComponent({ createNewRecordDialog, toHome, iconsel, + filtri, } } }) diff --git a/src/components/CBarSelection/CBarSelection.vue b/src/components/CBarSelection/CBarSelection.vue index 9e7bcb5d..00fe2a9e 100755 --- a/src/components/CBarSelection/CBarSelection.vue +++ b/src/components/CBarSelection/CBarSelection.vue @@ -3,7 +3,7 @@ :class="$q.screen.lt.sm ? `` : `q-pa-xs`" v-if="isfinishLoading && mycolumns" > - +
-
- - -
- - Immagine Logo - -
-
- - - - -
- - -
- + + +
- + + - - - - - - - + + +
+
+
+
-
+
- +
diff --git a/src/components/CMyUser/CMyUser.ts b/src/components/CMyUser/CMyUser.ts index aee3c86a..c7027fef 100755 --- a/src/components/CMyUser/CMyUser.ts +++ b/src/components/CMyUser/CMyUser.ts @@ -15,7 +15,7 @@ import { useCircuitStore } from '@store/CircuitStore' export default defineComponent({ name: 'CMyUser', components: { CSendCoins, CSaldo, CUserInfoAccount }, - emits: ['setCmd'], + emits: ['setCmd', 'showInnerDialog'], props: { mycontact: { type: Object as PropType, @@ -111,6 +111,11 @@ export default defineComponent({ } } + function showsendCoin(value: boolean) { + showsendCoinTo.value = value + emit('showInnerDialog', showsendCoinTo.value) + } + onMounted(mounted) return { @@ -125,6 +130,7 @@ export default defineComponent({ circuit, showAccountInfo, showsendCoinTo, + showsendCoin, } }, }) diff --git a/src/components/CMyUser/CMyUser.vue b/src/components/CMyUser/CMyUser.vue index 215cd236..2e2fd752 100755 --- a/src/components/CMyUser/CMyUser.vue +++ b/src/components/CMyUser/CMyUser.vue @@ -391,6 +391,17 @@ + + + + {{ $t('shared.profile') }} + + - {{ $t('circuit.sendcoins') }} + --> + + + + + {{ $t('shared.profile') }} + +
diff --git a/src/components/CNotifSettings/CNotifSettings.vue b/src/components/CNotifSettings/CNotifSettings.vue index 7e244062..743ec06f 100755 --- a/src/components/CNotifSettings/CNotifSettings.vue +++ b/src/components/CNotifSettings/CNotifSettings.vue @@ -35,21 +35,21 @@
- - + +
diff --git a/src/components/CSendCoins/CSendCoins.ts b/src/components/CSendCoins/CSendCoins.ts index 1480fbfe..9a322e2d 100755 --- a/src/components/CSendCoins/CSendCoins.ts +++ b/src/components/CSendCoins/CSendCoins.ts @@ -240,7 +240,7 @@ export default defineComponent({ } } - function mounted() { + async function mounted() { arrTypesAccounts.value = [ { @@ -259,13 +259,13 @@ export default defineComponent({ } else { circuitsel.value = tools.getCookie(tools.CIRCUIT_USE, bothcircuits.value[0]) } - if (!userStore.IsMyCircuitByName(circuitsel.value)) { + if (bothcircuits.value && bothcircuits.value.find((name: any) => name !== circuitsel.value)) { circuitsel.value = bothcircuits.value[0] } qty.value = props.qtydefault - aggiorna() + await aggiorna() showpage.value = true } @@ -283,7 +283,7 @@ export default defineComponent({ circuitsel.value = bothcircuits.value[0] } - aggiorna() + await aggiorna() showpage.value = true } @@ -296,7 +296,7 @@ export default defineComponent({ circuitsel.value = bothcircuits.value[0] } - aggiorna() + await aggiorna() showpage.value = true } diff --git a/src/components/CSendCoins/CSendCoins.vue b/src/components/CSendCoins/CSendCoins.vue index d8a30f6a..6cc2ab82 100755 --- a/src/components/CSendCoins/CSendCoins.vue +++ b/src/components/CSendCoins/CSendCoins.vue @@ -1,207 +1,205 @@