From f62ac90b34dd49cdf60a331f67a0dfeada105148 Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Wed, 1 Feb 2023 01:19:58 +0100 Subject: [PATCH] go on Conto Comunitario --- .../CCheckAppRunning/CCheckAppRunning.vue | 4 +- src/components/CContactUser/CContactUser.vue | 2 +- src/components/CMyUser/CMyUser.vue | 2 +- src/components/CSendCoins/CSendCoins.ts | 30 ++- src/components/CSendCoins/CSendCoins.vue | 12 +- src/store/UserStore.ts | 9 +- src/views/admin/dbop/dbop.vue | 6 + src/views/user/mycircuit/mycircuit.ts | 7 +- src/views/user/mycircuit/mycircuit.vue | 217 ++++++++++-------- 9 files changed, 186 insertions(+), 103 deletions(-) diff --git a/src/components/CCheckAppRunning/CCheckAppRunning.vue b/src/components/CCheckAppRunning/CCheckAppRunning.vue index fedf4583..961c2c59 100755 --- a/src/components/CCheckAppRunning/CCheckAppRunning.vue +++ b/src/components/CCheckAppRunning/CCheckAppRunning.vue @@ -23,7 +23,7 @@ , required: false, @@ -123,6 +128,9 @@ export default defineComponent({ arrGroupsList.value.push({ label: group.groupname, value: group.groupname }); } + if (tools.iAmAdminCircuit(circuitloaded.value.name)) + arrGroupsList.value.push({ label: circuitloaded.value.name, value: circuitloaded.value.path }); + // accountdest.value = userStore.getAccountByCircuitId(circuitloaded.value._id) if (accountloaded.value) { remainingCoins.value = circuitStore.getRemainingCoinsToSend(accountloaded.value) @@ -196,6 +204,19 @@ export default defineComponent({ aggiorna() + show.value = true + } + if (props.to_contocom) { + bothcircuits.value = userStore.getMyCircuits() + + console.log('to_contocom', props.to_contocom) + circuitsel.value = props.circuitname + if (!userStore.IsMyCircuitByName(circuitsel.value)) { + circuitsel.value = bothcircuits.value[0] + } + + aggiorna() + show.value = true } } @@ -205,9 +226,12 @@ export default defineComponent({ } function sendCoin() { - console.log('sendcoin', qty.value, props.to_group ? props.to_group.groupname : props.to_user.username) + console.log('sendcoin', qty.value, props.to_group ? props.to_group.groupname : (props.to_user ? props.to_user.username : props.to_contocom)) + + let ok = (props.to_user && props.to_user.username) || + (props.to_group && props.to_group.groupname) || + (props.to_contocom) - let ok = (props.to_user && props.to_user.username) || (props.to_group && props.to_group.groupname) if (ok && qty.value && circuitloaded.value) { let myrecsendcoin: ISendCoin = { @@ -220,7 +244,7 @@ export default defineComponent({ symbol: circuitloaded.value.symbol, } - myrecsendcoin.groupdest = props.to_group ? props.to_group.groupname : '' + myrecsendcoin.groupdest = props.to_group ? props.to_group.groupname : props.to_contocom myrecsendcoin.dest = props.to_user ? props.to_user.username : '' myrecsendcoin.grouporig = tipoConto.value === costanti.AccountType.COMMUNITY_ACCOUNT ? from_groupname.value : '' diff --git a/src/components/CSendCoins/CSendCoins.vue b/src/components/CSendCoins/CSendCoins.vue index c1589861..d2b1b709 100755 --- a/src/components/CSendCoins/CSendCoins.vue +++ b/src/components/CSendCoins/CSendCoins.vue @@ -113,6 +113,13 @@ :circuitname="circuitloaded.name" > + +
@@ -208,14 +215,15 @@ ? qtyRef.hasError || !circuitloaded.transactionsEnabled || ((tipoConto === costanti.AccountType.USER) && to_user && (from_username === to_user.username)) || ((tipoConto === costanti.AccountType.COMMUNITY_ACCOUNT) && !from_groupname) || - ((tipoConto === costanti.AccountType.COMMUNITY_ACCOUNT) && to_group && from_groupname && (to_group.groupname === from_groupname)) + ((tipoConto === costanti.AccountType.COMMUNITY_ACCOUNT) && to_group && from_groupname && (to_group.groupname === from_groupname)) || + ((tipoConto === costanti.AccountType.COMMUNITY_ACCOUNT) && !to_contocom) : false " :label=" $t('circuit.sendcoinsto', { qty, coin: circuitsel, - dest: to_group ? to_group.groupname : to_user.username, + dest: to_group ? to_group.groupname : (to_user ? to_user.username : to_contocom), }) " color="positive" diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts index 74bf0d71..a606ef13 100755 --- a/src/store/UserStore.ts +++ b/src/store/UserStore.ts @@ -248,7 +248,7 @@ export const useUserStore = defineStore('UserStore', { return this.my.profile.manage_mygroups }, - hoContiComunitariDaAmministrare(): boolean { + hoContiCollettiviDaAmministrare(): boolean { const arr = this.my.profile.manage_mygroups.find((group: IMyGroup) => group.account) return arr ? true : false }, @@ -386,6 +386,13 @@ export const useUserStore = defineStore('UserStore', { return tools.getCommon([...this.my.profile.mycircuits], [...user.profile.mycircuits], 'circuitname') }, + getMyCircuits(): any[] { + + if (!this.my.profile.mycircuits) + return [] + return this.my.profile.mycircuits.map(item => item.circuitname) + }, + getMyCircuitsInCommonByGroup(group: IMyGroup): any[] { if (!this.my.profile.mycircuits || (!group || !group.mycircuits)) diff --git a/src/views/admin/dbop/dbop.vue b/src/views/admin/dbop/dbop.vue index e12c07b3..3acde99c 100755 --- a/src/views/admin/dbop/dbop.vue +++ b/src/views/admin/dbop/dbop.vue @@ -280,6 +280,12 @@ @click="EseguiFunz('ReplaceUsername', search_username, replace_username)">
+
+ +
+
[]) const groupnameSel = ref('') + const showsendCoinTo = ref(false) + const animation = ref('fade') const path = computed(() => $route.params.path ? $route.params.path.toString() : '') @@ -450,6 +454,7 @@ export default defineComponent({ filterextra_group, groupsListAdmin, groupnameSel, + showsendCoinTo, } } }) diff --git a/src/views/user/mycircuit/mycircuit.vue b/src/views/user/mycircuit/mycircuit.vue index 702ebc13..7fdb0a86 100755 --- a/src/views/user/mycircuit/mycircuit.vue +++ b/src/views/user/mycircuit/mycircuit.vue @@ -242,84 +242,82 @@
- - - - Chiedi di Entrare nei Circuiti: - - - - - - - - - - - - + + Chiedi di Entrare nei Circuiti: + - - - - + + + + + + + + + + + + + +
@@ -546,10 +544,7 @@ > -
+
-
+
+ + +
+ {{ t('circuit.contocomunitario') }}: +
+ + + + +
+ + + + + + + +
+ + @@ -873,14 +906,6 @@
- -
- {{t('circuit.contocomunitario')}} -
-
- ... -
- +
+ + +