From a250700c8b24af4e5c1278ea74aeb70abb2f9142 Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Thu, 23 Feb 2023 17:20:54 +0100 Subject: [PATCH] ver 0.5.71: - Info Conto - Admin: poter modificare Fido e QtaMax, sia per i Conti Collettivi sia per gli Utenti. --- src/components/CMyUser/CMyUser.ts | 6 +- src/components/CMyUser/CMyUser.vue | 76 +++++++++--- .../CUserInfoAccount/CUserInfoAccount.scss | 25 ++++ .../CUserInfoAccount/CUserInfoAccount.ts | 117 ++++++++++++++++++ .../CUserInfoAccount/CUserInfoAccount.vue | 99 +++++++++++++++ src/components/CUserInfoAccount/index.ts | 1 + src/model/UserStore.ts | 2 + src/store/Modules/tools.ts | 4 + src/views/user/mycircuit/mycircuit.ts | 4 + 9 files changed, 318 insertions(+), 16 deletions(-) create mode 100755 src/components/CUserInfoAccount/CUserInfoAccount.scss create mode 100755 src/components/CUserInfoAccount/CUserInfoAccount.ts create mode 100755 src/components/CUserInfoAccount/CUserInfoAccount.vue create mode 100755 src/components/CUserInfoAccount/index.ts diff --git a/src/components/CMyUser/CMyUser.ts b/src/components/CMyUser/CMyUser.ts index cec40ebe..6890602e 100755 --- a/src/components/CMyUser/CMyUser.ts +++ b/src/components/CMyUser/CMyUser.ts @@ -7,13 +7,14 @@ import { tools } from '@store/Modules/tools' import { useQuasar } from 'quasar' import { CSendCoins } from '@/components/CSendCoins' import { CSaldo } from '@/components/CSaldo' +import { CUserInfoAccount } from '@/components/CUserInfoAccount' import { useI18n } from '@/boot/i18n' import { useRoute, useRouter } from 'vue-router' import { useCircuitStore } from '@store/CircuitStore' export default defineComponent({ name: 'CMyUser', - components: { CSendCoins, CSaldo }, + components: { CSendCoins, CSaldo, CUserInfoAccount }, emits: ['setCmd'], props: { mycontact: { @@ -71,6 +72,8 @@ export default defineComponent({ const $router = useRouter() const $route = useRoute() + const showAccountInfo = ref(false) + const username = ref('') const showsendCoinTo = ref(false) @@ -128,6 +131,7 @@ export default defineComponent({ tools, showsendCoinTo, circuit, + showAccountInfo, } }, }) diff --git a/src/components/CMyUser/CMyUser.vue b/src/components/CMyUser/CMyUser.vue index addd4f47..c90a5290 100755 --- a/src/components/CMyUser/CMyUser.vue +++ b/src/components/CMyUser/CMyUser.vue @@ -59,7 +59,9 @@ - + + + + + {{ + $t('groups.infoaccount') + }} + + + + + + {{ + $t('groups.infoaccount') + }} + @@ -594,7 +612,10 @@ - + - + {{ $t('handshake.remove_from_myhandshake') }} - + + + + + {{ + $t('groups.infoaccount') + }} + + + + + + {{ tools.getNomeUtenteByRecUser(contact) }} + + + + + + + + diff --git a/src/components/CUserInfoAccount/index.ts b/src/components/CUserInfoAccount/index.ts new file mode 100755 index 00000000..70bd9a07 --- /dev/null +++ b/src/components/CUserInfoAccount/index.ts @@ -0,0 +1 @@ +export { default as CUserInfoAccount } from './CUserInfoAccount.vue' diff --git a/src/model/UserStore.ts b/src/model/UserStore.ts index 93dc340c..ca238100 100755 --- a/src/model/UserStore.ts +++ b/src/model/UserStore.ts @@ -168,6 +168,8 @@ export interface IUserFields { cart?: ICart ordercart?: IOrderCart calcstat?: ICalcStat|null + + account?: IAccount } export interface IUserExport { diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index f3c57a22..12a0d91f 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -7689,6 +7689,10 @@ export const tools = { return myrec ? myrec.field : '' }, + getNomeUtenteByRecUser(user: IUserFields) { + return user.name ? user.name + ' ' + (user.surname ? user.surname : '') : user.username + }, + // FINE ! // getLocale() { diff --git a/src/views/user/mycircuit/mycircuit.ts b/src/views/user/mycircuit/mycircuit.ts index f9265135..afeea3d5 100755 --- a/src/views/user/mycircuit/mycircuit.ts +++ b/src/views/user/mycircuit/mycircuit.ts @@ -328,7 +328,11 @@ export default defineComponent({ 'profile.img': 1, 'profile.mycircuits': 1, 'profile.qualifica': 1, + 'account._id': 1, 'account.saldo': 1, + 'account.fidoConcesso': 1, + 'account.qta_maxConcessa': 1, + 'account.totTransato': 1, reported: 1, date_report: 1, username_who_report: 1,