diff --git a/.env.development b/.env.development index cb9bd8de..7828fb02 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.67" +APP_VERSION="0.5.71" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index 12d93e45..82168c27 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.67" +APP_VERSION="0.5.71" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.risosrv b/.env.test.risosrv index 573dd34e..95d9de54 100755 --- a/.env.test.risosrv +++ b/.env.test.risosrv @@ -1,4 +1,4 @@ -APP_VERSION="0.5.67" +APP_VERSION="0.5.71" 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 cb9bd8de..7828fb02 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.67" +APP_VERSION="0.5.71" 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 fff951b9..42135f7f 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.67" +APP_VERSION="0.5.71" 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 6242ef71..f53dfe18 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.67" +APP_VERSION="0.5.71" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL="newfreeplanet" diff --git a/src/components/CCheckAppRunning/CCheckAppRunning.vue b/src/components/CCheckAppRunning/CCheckAppRunning.vue index 961c2c59..48f58f53 100755 --- a/src/components/CCheckAppRunning/CCheckAppRunning.vue +++ b/src/components/CCheckAppRunning/CCheckAppRunning.vue @@ -19,7 +19,7 @@ text-color="white" >
-
+
null) + + function created() { + // created + myvalue.value = props.modelValue + } + + function changedParamValue(value: boolean) { + changeParamValue.value = value + } + + function save(value: any) { + + // ricarico + emit('save', value) + + myvalue.value = value + + } + + onMounted(created) + + return { + showingtooltip, + t, + tools, + changeParamValue, + changedParamValue, + costanti, + save, + myvalue, + } + }, +}) diff --git a/src/components/CCurrencyV2/CCurrencyV2.vue b/src/components/CCurrencyV2/CCurrencyV2.vue new file mode 100755 index 00000000..6dc2c275 --- /dev/null +++ b/src/components/CCurrencyV2/CCurrencyV2.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/src/components/CCurrencyV2/index.ts b/src/components/CCurrencyV2/index.ts new file mode 100755 index 00000000..ca67f08f --- /dev/null +++ b/src/components/CCurrencyV2/index.ts @@ -0,0 +1 @@ +export {default as CCurrencyV2} from './CCurrencyV2.vue' diff --git a/src/components/CCurrencyValue/CCurrencyValue.ts b/src/components/CCurrencyValue/CCurrencyValue.ts index a8aecc7d..9e608a40 100755 --- a/src/components/CCurrencyValue/CCurrencyValue.ts +++ b/src/components/CCurrencyValue/CCurrencyValue.ts @@ -4,9 +4,18 @@ import { tools } from '@src/store/Modules/tools' import { date, useQuasar } from 'quasar' import { useI18n } from '@/boot/i18n' +import { costanti } from '@costanti' + export default defineComponent({ name: 'CCurrencyValue', + components: { }, + emits: ['changedParamValue' ], props: { + modelValue: { + type: [String, Number], + required: false, + default: '', + }, small: { type: Boolean, default: false, @@ -45,17 +54,27 @@ export default defineComponent({ required: false, default: '', }, - value: { - type: Number, - required: true, - }, valueextra: { type: String, required: false, default: '', }, + paramTypeAccount: { + type: Number, + required: false, + default: 0, + }, + myrecparam: { + type: Object, + required: false, + default: null, + }, + admin: { + type: Boolean, + required: false, + default: false, + }, }, - components: {}, setup(props, { emit }) { const $q = useQuasar() const { t } = useI18n() @@ -66,13 +85,13 @@ export default defineComponent({ // created } - onMounted(created) return { showingtooltip, t, tools, + costanti, } }, }) diff --git a/src/components/CCurrencyValue/CCurrencyValue.vue b/src/components/CCurrencyValue/CCurrencyValue.vue index a94be8fb..a0d1281e 100755 --- a/src/components/CCurrencyValue/CCurrencyValue.vue +++ b/src/components/CCurrencyValue/CCurrencyValue.vue @@ -4,11 +4,11 @@ dense class="cltexth4 chipbooked shadow-5 q-pa-sm2" size="md" - :color="value > 0 ? `green` : value === 0 ? `gray` : `red`" + :color="modelValue > 0 ? `green` : modelValue === 0 ? `gray` : `red`" text-color="white" icon="fas fa-coins" > - {{ tools.roundDec2(value) }} + {{ tools.roundDec2(modelValue) }}  
-
+
diff --git a/src/components/CDashboard/CDashboard.scss b/src/components/CDashboard/CDashboard.scss index 43eea64e..a08b3146 100755 --- a/src/components/CDashboard/CDashboard.scss +++ b/src/components/CDashboard/CDashboard.scss @@ -20,7 +20,7 @@ } .progress-base { - height: 3px; + height: 5px; border-radius: 3px; background-color: #e9ecef; } diff --git a/src/components/CDashboard/CDashboard.vue b/src/components/CDashboard/CDashboard.vue index af54d83f..3a4212e2 100755 --- a/src/components/CDashboard/CDashboard.vue +++ b/src/components/CDashboard/CDashboard.vue @@ -42,34 +42,32 @@ {{ rec.title }} - + - - - - - + + @@ -104,9 +102,9 @@ - @@ -131,7 +129,7 @@ v-else :name="rec.icon" :class="`text-` + rec.color" - size="25px" + size="20px" > diff --git a/src/components/CInfoAccount/CInfoAccount.scss b/src/components/CInfoAccount/CInfoAccount.scss new file mode 100755 index 00000000..fc6d6911 --- /dev/null +++ b/src/components/CInfoAccount/CInfoAccount.scss @@ -0,0 +1,25 @@ +.myflex{ + display: flex; + flex: 1; +} + +.container{ + vertical-align: center; + padding: 5px; + font-size: 1.15rem; +} + +.element{ + font-weight: bold; + vertical-align: center; + padding: 5px; + font-size: 1.15rem; +} + + +.title_param{ + font-size: 1.25rem; +} +.iconcirc { + margin-right: 4px; +} diff --git a/src/components/CInfoAccount/CInfoAccount.ts b/src/components/CInfoAccount/CInfoAccount.ts new file mode 100755 index 00000000..c06e132a --- /dev/null +++ b/src/components/CInfoAccount/CInfoAccount.ts @@ -0,0 +1,117 @@ +import { defineComponent, onMounted, PropType, ref, watch } from 'vue' +import { useUserStore } from '@store/UserStore' +import { IMyGroup, IImgGallery, IUserFields, IUserProfile, IFriends, ICircuit, IAccount } from 'model' +import { costanti } from '@costanti' +import { shared_consts } from '@/common/shared_vuejs' +import { tools } from '@store/Modules/tools' +import { useQuasar } from 'quasar' +import { useI18n } from '@/boot/i18n' +import { useRoute, useRouter } from 'vue-router' +import { CUserNonVerif } from '@/components/CUserNonVerif' +import { toolsext } from '@store/Modules/toolsext' +import { CSaldo } from '@/components/CSaldo' +import { CSendCoins } from '@/components/CSendCoins' +import { CCurrencyValue } from '@/components/CCurrencyValue' +import { CCurrencyV2 } from '@/components/CCurrencyV2' +import { useCircuitStore } from '@store/CircuitStore' + +export default defineComponent({ + name: 'CInfoAccount', + emits: ['setCmd'], + components: {CUserNonVerif, CSaldo, CSendCoins, CCurrencyValue, CCurrencyV2 }, + props: { + grp: { + type: Object as PropType, + required: true, + }, + circuitname: { + type: String, + required: false, + default: '', + }, + admin: { + type: Boolean, + required: false, + default: false, + }, + account: { + type: Object as PropType, + required: false, + default: null, + }, + }, + + setup(props, { emit }) { + + const userStore = useUserStore() + const $q = useQuasar() + const { t } = useI18n() + const $router = useRouter() + + const myaccount = ref(undefined) + + const circuitStore = useCircuitStore() + + const table = ref(toolsext.TABMYGROUPS) + + const circuit = ref(null) + + watch(() => props.grp, (newval, oldval) => { + mounted() + }) + + function mounted() { + circuit.value = circuitStore.getCircuitByName(props.circuitname) + + if (props.account) { + myaccount.value = props.account + } else { + myaccount.value = props.grp.account + } + } + + function getImgGroup(group: IMyGroup) { + return userStore.getImgByGroup(group) + } + + function naviga(path: string) { + $router.push(path) + } + + function setCmd(cmd: number, myusername: string, value: any = '') { + emit('setCmd', cmd, myusername, value) + } + + function myusername() { + return userStore.my.username + } + + async function save(value: any) { + console.log('save and mounted') + await tools.loadCircuits() + // ricarico + mounted() + + + } + + onMounted(mounted) + + return { + costanti, + getImgGroup, + naviga, + setCmd, + shared_consts, + userStore, + tools, + table, + myusername, + circuit, + circuitStore, + t, + myaccount, + save, + } + }, +}) diff --git a/src/components/CInfoAccount/CInfoAccount.vue b/src/components/CInfoAccount/CInfoAccount.vue new file mode 100755 index 00000000..5108e293 --- /dev/null +++ b/src/components/CInfoAccount/CInfoAccount.vue @@ -0,0 +1,99 @@ + + + + + diff --git a/src/components/CInfoAccount/index.ts b/src/components/CInfoAccount/index.ts new file mode 100755 index 00000000..087df596 --- /dev/null +++ b/src/components/CInfoAccount/index.ts @@ -0,0 +1 @@ +export { default as CInfoAccount } from './CInfoAccount.vue' diff --git a/src/components/CMyFieldDb/CMyFieldDb.ts b/src/components/CMyFieldDb/CMyFieldDb.ts index b88ddfbc..24bb2562 100755 --- a/src/components/CMyFieldDb/CMyFieldDb.ts +++ b/src/components/CMyFieldDb/CMyFieldDb.ts @@ -140,8 +140,9 @@ export default defineComponent({ function showandsel(row: any, col: any, newval: any, valinitial: any) { console.log('showandsel CMyFieldDb', row, col, newval) - if (newval !== valinitial) + if (newval !== valinitial) { setValDb($q, props.mykey, newval, props.type, props.serv, props.table, props.mysubkey, props.id, props.indrec, props.mysubsubkey, props.specialField) + } } diff --git a/src/components/CMyGroup/CMyGroup.ts b/src/components/CMyGroup/CMyGroup.ts index d90a404a..e832e885 100755 --- a/src/components/CMyGroup/CMyGroup.ts +++ b/src/components/CMyGroup/CMyGroup.ts @@ -10,6 +10,7 @@ import { useRoute, useRouter } from 'vue-router' import { CUserNonVerif } from '@/components/CUserNonVerif' import { toolsext } from '@store/Modules/toolsext' import { CSaldo } from '@/components/CSaldo' +import { CInfoAccount } from '@/components/CInfoAccount' import { CSendCoins } from '@/components/CSendCoins' import { CCurrencyValue } from '@/components/CCurrencyValue' import { useCircuitStore } from '@store/CircuitStore' @@ -17,7 +18,7 @@ import { useCircuitStore } from '@store/CircuitStore' export default defineComponent({ name: 'CMyGroup', emits: ['setCmd'], - components: {CUserNonVerif, CSaldo, CSendCoins, CCurrencyValue }, + components: {CInfoAccount, CUserNonVerif, CSaldo, CSendCoins, CCurrencyValue }, props: { mygrp: { type: Object as PropType, diff --git a/src/components/CMyGroup/CMyGroup.vue b/src/components/CMyGroup/CMyGroup.vue index 13c8d47b..ac265960 100755 --- a/src/components/CMyGroup/CMyGroup.vue +++ b/src/components/CMyGroup/CMyGroup.vue @@ -562,95 +562,14 @@
- + {{ grp.title }} - -
{{ t('groups.infoaccount') }}
-
- - - - - - - -
- - {{ - $t('shared.createddate', { - date: tools.getstrDateYY(grp.account.date_created), - }) - }} -
-
- - {{ - $t('shared.lastmodify', { - date: tools.getstrDateYY(grp.account.date_updated), - }) - }} -
- -
-
- - -
-
- - -
-
- - -
-
-
+
diff --git a/src/components/CMyPageElem/CMyPageElem.vue b/src/components/CMyPageElem/CMyPageElem.vue index 2f2054d1..bc5e6712 100755 --- a/src/components/CMyPageElem/CMyPageElem.vue +++ b/src/components/CMyPageElem/CMyPageElem.vue @@ -3,8 +3,10 @@
diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.vue b/src/components/CMyPopupEdit/CMyPopupEdit.vue index 9225dd58..a75ad31c 100755 --- a/src/components/CMyPopupEdit/CMyPopupEdit.vue +++ b/src/components/CMyPopupEdit/CMyPopupEdit.vue @@ -309,7 +309,7 @@ @@ -1099,7 +1099,7 @@ diff --git a/src/components/CSaldo/CSaldo.ts b/src/components/CSaldo/CSaldo.ts index a26c0ed8..578265b1 100755 --- a/src/components/CSaldo/CSaldo.ts +++ b/src/components/CSaldo/CSaldo.ts @@ -41,6 +41,11 @@ export default defineComponent({ required: false, default: '', }, + paramTypeAccount: { + type: Number, + required: false, + default: 0, + }, }, components: { CCurrencyValue, CMyFieldRec }, setup(props, { emit }) { diff --git a/src/components/CSaldo/CSaldo.vue b/src/components/CSaldo/CSaldo.vue index eb638bbc..ec665c77 100755 --- a/src/components/CSaldo/CSaldo.vue +++ b/src/components/CSaldo/CSaldo.vue @@ -5,17 +5,23 @@ :symbol="symbol" :color_border="saldo > 0 ? `green` : `red`" :color="color" - :value="saldo" - :label="t('account.saldo')"> + v-model="saldo" + :label="t('account.saldo')" + :paramTypeAccount="paramTypeAccount" + :myrecparam="account" + > + :label="t('account.saldo') + ` (` + t('account.dispon') + `: ` + qtarem + `)`" + :paramTypeAccount="paramTypeAccount" + :myrecparam="account" + > diff --git a/src/css/app.scss b/src/css/app.scss index c6e8058d..acb10a7a 100755 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -1219,6 +1219,13 @@ h3 { letter-spacing: 0.15px; } +.title_view_subtitle { + font-family: Arial, sans-serif; + font-size: 0.7rem; + letter-spacing: 0.15px; + min-height: 40px; +} + .text-normal { font-family: 'Open Sans', Arial, sans-serif; @@ -1565,3 +1572,7 @@ h3 { .elem { padding: 0; } + +.small_side { + padding-left: 4px !important; +} diff --git a/src/root/eventi/eventi.vue b/src/root/eventi/eventi.vue index 16a0daa6..2c2505ed 100755 --- a/src/root/eventi/eventi.vue +++ b/src/root/eventi/eventi.vue @@ -5,7 +5,7 @@
diff --git a/src/root/goods/goods.vue b/src/root/goods/goods.vue index f03fe041..e4e3a83a 100755 --- a/src/root/goods/goods.vue +++ b/src/root/goods/goods.vue @@ -7,7 +7,7 @@
diff --git a/src/root/hosp/hosp.vue b/src/root/hosp/hosp.vue index 36857927..3cd6755f 100755 --- a/src/root/hosp/hosp.vue +++ b/src/root/hosp/hosp.vue @@ -7,7 +7,7 @@
diff --git a/src/root/services/services.vue b/src/root/services/services.vue index 8632b261..c27d61ed 100755 --- a/src/root/services/services.vue +++ b/src/root/services/services.vue @@ -6,7 +6,7 @@
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index 7e8caa7a..007c7103 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -1279,6 +1279,8 @@ const msg_it = { }, account: { + updateval: 'Aggiorna', + settings: 'Impostazioni', deperibile: 'Deperibile', fidoConcesso: 'Capacità di finanziamento', qta_maxConcessa: 'Capacità massima accumulabile', diff --git a/src/store/Modules/costanti.ts b/src/store/Modules/costanti.ts index ce683a67..c08357b0 100755 --- a/src/store/Modules/costanti.ts +++ b/src/store/Modules/costanti.ts @@ -62,6 +62,27 @@ export const costanti = { SHOW_ONLY_TOCOMPLETE: 201, SHOW_ALL: 202, }, + + ParamTypeAccount: { + FIDO_CONCESSO: 1, + QTA_MAXCONCESSA: 2, + }, + + ParamTypeAccountStr: [ + { + labeltrans: 'account.fidoConcesso', + value: 1, // FIDO_CONCESSO + field: 'fidoConcesso', + type: 4, //string + }, + { + labeltrans: 'account.qta_maxConcessa', + field: 'qta_maxConcessa', + value: 2, // QTA_MAXCONCESSA + type: 4, //string + }, + ], + CONFIG_ID_CFG: '1', CONFIG_ID_STATE_CONN: '2', CONFIG_ID_SHOW_TYPE_TODOS: '3', @@ -75,7 +96,7 @@ export const costanti = { { visible: true, title: ' Beni ', - subtitle: 'Autoproduzioni, artigianato, cibo, abbigliamento ...', + subtitle: 'Autoproduzioni, artigianato, cibo, abbigliamento, attrezzature, arredamento', strsingolo: 'Bene', to: '/goods', icon: 'fas fa-tshirt', @@ -89,7 +110,7 @@ export const costanti = { visible: true, strsingolo: 'Servizio', title: 'Servizi', - subtitle: 'Competenze, formazione, aiuti, benessere, comunità', + subtitle: 'Competenze, formazione, aiuti, benessere, salute, casa, riparazioni', to: '/services', icon: 'fas fa-house-user', color: 'red-6', @@ -101,7 +122,7 @@ export const costanti = { { visible: true, title: 'Ospitalità', - subtitle: 'Conosci persone, ospita viaggiatori, esplora nuovi paesi', + subtitle: 'Conosci persone nuove, ospita viaggiatori o esplora tu nuovi paesi', strsingolo: 'Ospitalità', to: '/hosps', icon: 'fas fa-bed', @@ -125,11 +146,38 @@ export const costanti = { small: false, table: '', }, + { + visible: false, + title: 'Circuiti RIS', + subtitle: 'Unisciti al circuito della tua provincia per utilizzare i RIS come moneta di scambio', + to: '/circuits', + table: 'circuits', + icon: 'fas fa-coins', + image: 'images/1ris_rosso_100.png', + color: 'orange-6', + hint: '', + disable: true, + small: true, + visuonstat: true, + }, + { + visible: false, + title: 'Gruppi', + subtitle: 'Conosci gruppi locali, associazioni, progetti, comunità', + to: '/groups', + table: 'mygroups', + icon: 'fas fa-users', + color: 'blue-6', + hint: '', + disable: true, + small: true, + visuonstat: true, + }, { visible: true, title: 'Eventi', strsingolo: 'Evento', - subtitle: 'Mercatini, incontri, corsi, feste', + subtitle: 'Mercatini, incontri, conferenze, corsi formativi, feste e divertimento', to: '/events', icon: 'event', color: 'green-6', @@ -199,38 +247,9 @@ export const costanti = { small: true, table: '', }, - { - visible: false, - title: 'Gruppi', // ! IND_MYGROUPS - subtitle: 'Conosci gruppi, associazioni, progetti, comunità', - to: '/groups', - table: 'mygroups', - icon: 'fas fa-users', - color: 'blue-6', - hint: '', - disable: true, - small: true, - visuonstat: true, - }, - { - visible: false, // ! IND_CIRCUIT: 11, - title: 'Circuiti RIS', - subtitle: 'Entra nel territorio e Invia e Ricevi monete', - to: '/circuits', - table: 'circuits', - icon: 'fas fa-coins', - image: 'images/1ris_rosso_100.png', - color: 'orange-6', - hint: '', - disable: true, - small: true, - visuonstat: true, - }, ], - IND_CIRCUIT: 11, - IND_MYGROUPS: 10, BINARY_CHECK: 1, diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index 15c9c6ba..f3c57a22 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -7663,6 +7663,32 @@ export const tools = { }) }, + isDevelop() { + return process.env.DEV + }, + + getIndMainCardsByTable(table: string) { + for (let i = 0; i < costanti.MAINCARDS.length; i++) { + if (costanti.MAINCARDS[i].table === table) + return i + } + return -1 + }, + + getStrByParamTypeAccount(paramTypeAccount: string): string { + const myrec = costanti.ParamTypeAccountStr.find((rec: any) => rec.value === paramTypeAccount) + return myrec ? translate(myrec.labeltrans) : '' + }, + + getTypeByParamTypeAccount(paramTypeAccount: string): number { + const myrec = costanti.ParamTypeAccountStr.find((rec: any) => rec.value === paramTypeAccount) + return myrec ? myrec.type : 0 + }, + getFieldByParamTypeAccount(paramTypeAccount: string): string { + const myrec = costanti.ParamTypeAccountStr.find((rec: any) => rec.value === paramTypeAccount) + return myrec ? myrec.field : '' + }, + // FINE ! // getLocale() { diff --git a/src/views/user/mycircuit/mycircuit.vue b/src/views/user/mycircuit/mycircuit.vue index d20ebb26..7081fd9e 100755 --- a/src/views/user/mycircuit/mycircuit.vue +++ b/src/views/user/mycircuit/mycircuit.vue @@ -621,7 +621,7 @@ :symbol="tools.getSymbolByCircuit(circuit)" :color="tools.getColorByCircuit(circuit)" color_border="red" - :value="circuit.fido_scoperto_default" + v-model="circuit.fido_scoperto_default" icon="fas fa-battery-quarter" :label="t('circuit.fido_scoperto_default')" :tips="t('circuit.fido_scoperto_default_tips')" @@ -633,7 +633,7 @@ :symbol="tools.getSymbolByCircuit(circuit)" :color="tools.getColorByCircuit(circuit)" color_border="green" - :value="circuit.qta_max_default" + v-model="circuit.qta_max_default" icon="fas fa-battery-quarter" :label="t('circuit.qta_max_default')" :tips="t('circuit.qta_max_default_tips')" @@ -645,7 +645,7 @@ :symbol="tools.getSymbolByCircuit(circuit)" :color="tools.getColorByCircuit(circuit)" color_border="red" - :value="circuit.fido_scoperto_default_grp" + v-model="circuit.fido_scoperto_default_grp" icon="fas fa-battery-quarter" :label="t('circuit.fido_scoperto_default_grp')" :tips="t('circuit.fido_scoperto_default_tips_grp')" @@ -657,7 +657,7 @@ :symbol="tools.getSymbolByCircuit(circuit)" :color="tools.getColorByCircuit(circuit)" color_border="green" - :value="circuit.qta_max_default_grp" + v-model="circuit.qta_max_default_grp" icon="fas fa-battery-quarter" :label="t('circuit.qta_max_default_grp')" :tips="t('circuit.qta_max_default_tips_grp')" @@ -675,7 +675,7 @@ :symbol="tools.getSymbolByCircuit(circuit)" :color="tools.getColorByCircuit(circuit)" color_border="blue" - :value="circuit.totTransato" + v-model="circuit.totTransato" icon="fas fa-battery-quarter" :label="t('circuit.totTransato')" :tips="t('circuit.totTransato_tips')" @@ -687,7 +687,7 @@ :symbol="tools.getSymbolByCircuit(circuit)" :color="tools.getColorByCircuit(circuit)" color_border="blue" - :value="circuit.totCircolante" + v-model="circuit.totCircolante" icon="fas fa-battery-quarter" :label="t('circuit.totCircolante')" :tips="t('circuit.totCircolante_tips')" diff --git a/src/views/user/mygroup/mygroup.ts b/src/views/user/mygroup/mygroup.ts index e957bb2b..5a56b420 100755 --- a/src/views/user/mygroup/mygroup.ts +++ b/src/views/user/mygroup/mygroup.ts @@ -7,7 +7,7 @@ import { CCheckIfIsLogged } from '@/components/CCheckIfIsLogged' import { CMyFieldRec } from '@/components/CMyFieldRec' import { CSkill } from '@/components/CSkill' import { CDateTime } from '@/components/CDateTime' -import { CSaldo } from '@/components/CSaldo' +import { CInfoAccount } from '@/components/CInfoAccount' import { tools } from '@store/Modules/tools' import { computed, defineComponent, onMounted, ref, watch } from 'vue' import { useUserStore } from '@store/UserStore' @@ -22,14 +22,13 @@ import { shared_consts } from '@/common/shared_vuejs' import { colmyUserPeople, colmyUserGroup } from '@store/Modules/fieldsTable' import { useNotifStore } from '@store/NotifStore' import { useCircuitStore } from '@src/store/CircuitStore' -import circuitsList from '@src/rootgen/admin/circuitsList/circuitsList' export default defineComponent({ name: 'mygroup', components: { CProfile, CTitleBanner, CMyFieldRec, - CSaldo, CSkill, CDateTime, CMyFriends, CGridTableRec, CMyUser, CCheckIfIsLogged + CInfoAccount, CSkill, CDateTime, CMyFriends, CGridTableRec, CMyUser, CCheckIfIsLogged }, props: {}, setup() { @@ -76,6 +75,7 @@ export default defineComponent({ } async function loadGroup() { + console.log('loadGroup') // Carica il profilo di quest'utente if (groupname.value) { await userStore.loadGroup(groupname.value, idnotif.value).then(({ data, status }: { data: any, status: number }) => { @@ -87,9 +87,11 @@ export default defineComponent({ notifStore.setAsRead(idnotif.value) users_in_group.value = data.users_in_group - if (mygrp.value && tools.iAmAdminGroup(groupname.value)) { + if (mygrp.value) circuitslist.value = circuitStore.getCircuitsListByGroup(mygrp.value) - } + + /*if (mygrp.value && tools.iAmAdminGroup(groupname.value)) { + }*/ if (circuitslist.value) { for (let i = 0; i < circuitslist.value.length; i++) { let myc = data.mygroup.mycircuits.find((circ: IMyCircuit) => circ.circuitname === circuitslist.value[i].name) diff --git a/src/views/user/mygroup/mygroup.vue b/src/views/user/mygroup/mygroup.vue index 7786b62d..cd4f8a74 100755 --- a/src/views/user/mygroup/mygroup.vue +++ b/src/views/user/mygroup/mygroup.vue @@ -488,18 +488,9 @@
{{ circuit.name }}:
- - +
diff --git a/src/views/user/mygroups/mygroups.ts b/src/views/user/mygroups/mygroups.ts index 2cdcc6d6..894b4e45 100755 --- a/src/views/user/mygroups/mygroups.ts +++ b/src/views/user/mygroups/mygroups.ts @@ -38,6 +38,7 @@ export default defineComponent({ return { filter, + tools, costanti, shared_consts, colmyUserGroup, diff --git a/src/views/user/mygroups/mygroups.vue b/src/views/user/mygroups/mygroups.vue index 0e495fe0..48545f61 100755 --- a/src/views/user/mygroups/mygroups.vue +++ b/src/views/user/mygroups/mygroups.vue @@ -20,7 +20,7 @@ >