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 @@
>