From e805088da717de491b23ea51b9305bb50057c687 Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Thu, 1 Jun 2023 11:40:26 +0200 Subject: [PATCH] - L'utente entra direttamente sul circuito, con fido a zero. ++Abilitazione Fido utente (per admin). --- .env.development | 2 +- .env.example.production | 2 +- .env.test.risosrv | 2 +- _ALL_SITES/riso.app/.env.development | 2 +- _ALL_SITES/riso.app/.env.production | 2 +- .../terradellavisione.app/.env.development | 2 +- package.json | 11 +- src/common/shared_vuejs.ts | 2 + src/components/CContactUser/CContactUser.vue | 4 +- .../CCurrencyValue/CCurrencyValue.ts | 7 + .../CCurrencyValue/CCurrencyValue.vue | 22 ++- src/components/CGridTableRec/CGridTableRec.ts | 2 +- .../CGridTableRec/CGridTableRec.vue | 2 +- .../CMyCardService/CMyCardService.vue | 4 +- src/components/CMyCircuit/CMyCircuit.vue | 17 +- src/components/CMyGroup/CMyGroup.vue | 18 ++ .../CMyProfileTutorial/CMyProfileTutorial.vue | 15 +- src/components/CMyUser/CMyUser.vue | 156 ++++++++++++------ .../CMyUserOnlyView/CMyUserOnlyView.vue | 31 ---- src/components/CSaldo/CSaldo.ts | 3 + src/components/CSaldo/CSaldo.vue | 66 +++++++- src/components/CSendCoins/CSendCoins.vue | 16 +- src/model/GlobalStore.ts | 1 + src/statics/lang/it.js | 24 ++- src/store/Modules/fieldsTable.ts | 42 ++++- src/store/Modules/tools.ts | 137 ++++++++++----- src/store/UserStore.ts | 52 +++++- src/views/admin/dbop/dbop.vue | 8 + src/views/user/mycircuit/mycircuit.vue | 1 + src/views/user/mygroup/mygroup.vue | 2 +- src/views/user/mypagebacheca/mypagebacheca.ts | 3 +- .../user/mypagebacheca/mypagebacheca.vue | 10 +- 32 files changed, 481 insertions(+), 187 deletions(-) diff --git a/.env.development b/.env.development index 8a1cb971..b6ef94c1 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.6.5" +APP_VERSION="0.6.7" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index ebd550a8..1d9e8a98 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="0.6.5" +APP_VERSION="0.6.7" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.risosrv b/.env.test.risosrv index 4626f3d1..84109295 100755 --- a/.env.test.risosrv +++ b/.env.test.risosrv @@ -1,4 +1,4 @@ -APP_VERSION="0.6.5" +APP_VERSION="0.6.7" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index 8a1cb971..b6ef94c1 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.6.5" +APP_VERSION="0.6.7" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.production b/_ALL_SITES/riso.app/.env.production index 57d7f76a..9a0b8aca 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="0.6.5" +APP_VERSION="0.6.7" 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 62681e50..91276c6a 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.6.5" +APP_VERSION="0.6.7" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL="newfreeplanet" diff --git a/package.json b/package.json index 4d2a25ce..0c8f0176 100755 --- a/package.json +++ b/package.json @@ -123,7 +123,16 @@ "crypto": false }, "browserslist": [ - "> 0.05%", + "last 80 Chrome versions", + "last 40 Firefox versions", + "last 20 Edge versions", + "last 55 Safari versions", + "last 90 Android versions", + "last 250 ChromeAndroid versions", + "last 60 FirefoxAndroid versions", + "last 30 iOS versions", + "last 10 Opera versions", + "> 0.03%", "not dead" ], "engines": { diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index 79103b01..bae2c82c 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -133,6 +133,7 @@ export const shared_consts = { CIRCUITCMD: { REQ: 2000, SET: 2001, + SETFIDO: 2005, REMOVE_FROM_MYLIST: 2144, REFUSE_REQ: 2145, CANCEL_REQ: 2146, @@ -1112,6 +1113,7 @@ export const shared_consts = { ID_CIRCUIT_SENDCOINSREQ_SENT: 4096, ID_CIRCUIT_COINS_ACCEPTED_SENT: 8192, ID_CIRCUIT_COINS_REFUSED_SENT: 16384, + ID_CIRCUIT_SETFIDO: 32768, TYPEDIR_BOOKING: 6, diff --git a/src/components/CContactUser/CContactUser.vue b/src/components/CContactUser/CContactUser.vue index 9cca1554..b373b572 100755 --- a/src/components/CContactUser/CContactUser.vue +++ b/src/components/CContactUser/CContactUser.vue @@ -55,7 +55,7 @@
diff --git a/src/components/CCurrencyValue/CCurrencyValue.ts b/src/components/CCurrencyValue/CCurrencyValue.ts index 9e608a40..da03a5eb 100755 --- a/src/components/CCurrencyValue/CCurrencyValue.ts +++ b/src/components/CCurrencyValue/CCurrencyValue.ts @@ -30,6 +30,11 @@ export default defineComponent({ required: false, default: '', }, + strfido: { + type: String, + required: false, + default: '', + }, readonly: { type: Boolean, required: false, @@ -80,6 +85,7 @@ export default defineComponent({ const { t } = useI18n() const showingtooltip = ref(false) + const showinghouse = ref(false) function created() { // created @@ -89,6 +95,7 @@ export default defineComponent({ return { showingtooltip, + showinghouse, t, tools, costanti, diff --git a/src/components/CCurrencyValue/CCurrencyValue.vue b/src/components/CCurrencyValue/CCurrencyValue.vue index a0d1281e..94e7e16e 100755 --- a/src/components/CCurrencyValue/CCurrencyValue.vue +++ b/src/components/CCurrencyValue/CCurrencyValue.vue @@ -16,6 +16,13 @@ >{{ symbol }} +
+ +
@@ -61,7 +68,6 @@ :color="modelValue > 0 ? `green` : `red`" >
diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index bd064ca0..2d71ea0a 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -643,7 +643,7 @@ export default defineComponent({ function getObjSort(sortBy: any, descending: any) { let myobj: any = {} if (tools.isObject(sortBy)) { - console.log('sortBy', sortBy) + // console.log('sortBy', sortBy) return sortBy } else if (sortBy) { sortBy = sortBy + '' diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index c1c65401..932b9a84 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -376,7 +376,7 @@
{{ diff --git a/src/components/CMyCardService/CMyCardService.vue b/src/components/CMyCardService/CMyCardService.vue index cbe3b7fb..f36822d7 100644 --- a/src/components/CMyCardService/CMyCardService.vue +++ b/src/components/CMyCardService/CMyCardService.vue @@ -426,7 +426,7 @@ > - + {{ tools.getstrDateMonthLong(myrec.date_created) }} -
{{ $t('reg.who_updated') }} {{ diff --git a/src/components/CMyCircuit/CMyCircuit.vue b/src/components/CMyCircuit/CMyCircuit.vue index 79e5183c..9d785dd9 100755 --- a/src/components/CMyCircuit/CMyCircuit.vue +++ b/src/components/CMyCircuit/CMyCircuit.vue @@ -328,7 +328,8 @@ -
+
+ - - -
- + + + + + {{ $t('circuit.enablefido') }} + + -
-
+

- +
- +
+
{{ labelFooter }} - Prov: {{ contact.profile.resid_province }} + Prov: + {{ + contact.profile.resid_province + }} - - - - - @@ -264,7 +254,12 @@ {{ $t('groups.accept_group') }} - + @@ -397,7 +392,7 @@ - {{ - $t('circuit.sendcoins') - }} + {{ $t('circuit.sendcoins') }} - + + + + + + {{ $t('circuit.enablefido') }} + + + @@ -466,6 +479,70 @@ $t('shared.cancel_ask_short') }} + + + + + {{ + $t('circuit.addasadmin') + }} + + + + + + {{ + $t('circuit.remove_as_admin') + }} + + + + + + {{ + $t('circuit.remove_from_mycircuit') + }} + @@ -543,24 +620,6 @@ $t('circuit.remove_from_mycircuit') }} - - - - - {{ - $t('friends.report_user') - }} - @@ -719,7 +778,7 @@ - {{ - $t('circuit.sendcoins') - }} + {{ $t('circuit.sendcoins') }} + diff --git a/src/components/CMyUserOnlyView/CMyUserOnlyView.vue b/src/components/CMyUserOnlyView/CMyUserOnlyView.vue index c65f9665..4dcf7f56 100755 --- a/src/components/CMyUserOnlyView/CMyUserOnlyView.vue +++ b/src/components/CMyUserOnlyView/CMyUserOnlyView.vue @@ -325,19 +325,6 @@ $t('shared.cancel_ask_short') }} - - - - - - - - - - - - - - {{ - $t('friends.report_user') - }} - diff --git a/src/components/CSaldo/CSaldo.ts b/src/components/CSaldo/CSaldo.ts index 0f1c3e5d..c32fa7f5 100755 --- a/src/components/CSaldo/CSaldo.ts +++ b/src/components/CSaldo/CSaldo.ts @@ -9,6 +9,7 @@ import { IAccount, ISpecialField } from 'model' import { CMyFieldDb } from '@/components/CMyFieldDb' import { CMyFieldRec } from '@/components/CMyFieldRec' import { colTableNotifCoins } from '@store/Modules/fieldsTable' +import { costanti } from '@costanti' export default defineComponent({ name: 'CSaldo', @@ -70,6 +71,8 @@ export default defineComponent({ tools, color_border, visuTransac, + costanti, + } }, }) diff --git a/src/components/CSaldo/CSaldo.vue b/src/components/CSaldo/CSaldo.vue index 65022e2a..082b61be 100755 --- a/src/components/CSaldo/CSaldo.vue +++ b/src/components/CSaldo/CSaldo.vue @@ -15,6 +15,7 @@ v-else :symbol="symbol" :tips="t('account.saldo_tips', { fido: qtarem, symbol })" + :strfido="t('account.fido_casa', { fido: account ? account.fidoConcesso : '', symbol })" :color="color" v-model="saldo" :valueextra=" @@ -29,7 +30,6 @@ :myrecparam="account" > - -
-
+
- +
{{ index + 1 }}°
+ + + + + + + + + + + + + +
diff --git a/src/components/CSendCoins/CSendCoins.vue b/src/components/CSendCoins/CSendCoins.vue index 6f0d8473..d8a30f6a 100755 --- a/src/components/CSendCoins/CSendCoins.vue +++ b/src/components/CSendCoins/CSendCoins.vue @@ -1,7 +1,6 @@