- tutorial Circuito Ris Italia

- Invia RIS (visibile per tutti)

src/store/CircuitStore.ts

@@ -59,7 +59,7 @@ export const useCircuitStore = defineStore('CircuitStore', {
 
       for (const circ of circNazionali) {
         const trovato = userStore.my.profile.mycircuits.findIndex((mycirc: any) => mycirc.circuitname === circ.name) >= 0
-        if (trovato){
+        if (trovato) {
           return true
         }
       }
@@ -69,18 +69,20 @@ export const useCircuitStore = defineStore('CircuitStore', {
     },
 
     EDentroAlCircuitoNazionale(user: IUserFields) {
-      
+
       const circNazionali: any = this.listcircuits.filter((circ: any) => circ.showAlways)
 
-      for (const circ of circNazionali) {
-        const trovato = user.profile.mycircuits.findIndex((mycirc: any) => mycirc.circuitname === circ.name) >= 0
-        if (trovato){
-          return true
+      if (user.profile.mycircuits && user.profile.mycircuits.length > 0) {
+        for (const circ of circNazionali) {
+          const trovato = user.profile.mycircuits.findIndex((mycirc: any) => mycirc.circuitname === circ.name) >= 0
+          if (trovato) {
+            return true
+          }
         }
       }
 
       return false
-      
+
     },
 
     isCircuitNational(circuitname: string): boolean {
@@ -94,6 +96,21 @@ export const useCircuitStore = defineStore('CircuitStore', {
 
     },
 
+    SonoDentroAdAlmeno1CircuitoConFido() {
+      const userStore = useUserStore()
+
+      const accountsConFido = userStore.my.profile.useraccounts.filter((rec: IAccount) => rec.fidoConcesso > 0)
+
+      for (const account of accountsConFido) {
+        const mycircuit = this.listcircuits.find((circ: ICircuit) => circ._id === account.circuitId)
+        if (mycircuit && !mycircuit.showAlways) {
+          return mycircuit
+        }
+      }
+
+      return null
+    },
+
     getCircuitClass(circuit: ICircuit) {
       if (circuit.status === shared_consts.CIRCUIT_STATUS.FASE3_MONETA_ABILITATA)
         return 'circuito_abilitato'
@@ -117,8 +134,19 @@ export const useCircuitStore = defineStore('CircuitStore', {
       return this.listcircuits.find((rec: ICircuit) => rec.name === circuitname)
     },
 
-    getCircuitByProvince(prov: string): ICircuit | undefined | null {
-      return this.listcircuits.find((rec: ICircuit) => rec.strProv === prov)
+    getCircuitByProvinceAndCard(prov: string, card: string): ICircuit | undefined | null {
+      return this.listcircuits.find((rec: ICircuit) => rec.strProv === prov && ((rec.card === card) || (!card)))
+    },
+
+    getCircuitsByProvince(prov: string): ICircuit[] {
+      return this.listcircuits.filter((rec: ICircuit) => rec.strProv === prov)
+    },
+
+    getCircuitsNameByProvince(prov: string): ICircuit[] {
+      const filterarr = this.listcircuits.filter((rec: ICircuit) => rec.strProv === prov)
+      return filterarr.map((subArray: any) => {
+        return subArray.name;
+      })
     },
 
     getCircuitByCircuitId(circuitId: string): ICircuit | null | undefined {

src/store/Modules/costanti.ts

@@ -159,6 +159,7 @@ export const costanti = {
     {
       visible: false,
       title: 'Circuiti RIS',
+      strsingolo: 'Circuito',
       subtitle: 'Unisciti al circuito della tua provincia per utilizzare <strong>i RIS come strumento di scambio</strong>',
       to: '/circuits',
       table: 'circuits',

src/store/Modules/fieldsTable.ts

@@ -2314,6 +2314,12 @@ export const colTableUsers = [
     subfield: 'resid_province',
     label_trans: 'reg.resid_province', fieldtype: costanti.FieldType.string
   }),
+  AddCol({
+    name: 'profile.resid_card',
+    field: 'profile',
+    subfield: 'resid_card',
+    label_trans: 'reg.resid_card', fieldtype: costanti.FieldType.string
+  }),
   AddCol({
     name: 'profile.resplist',
     field: 'profile',
@@ -2750,6 +2756,12 @@ export const colTableUsersISP = [
     subfield: 'resid_province',
     label_trans: 'reg.resid_province', fieldtype: costanti.FieldType.string
   }),
+  AddCol({
+    name: 'profile.resid_card',
+    field: 'profile',
+    subfield: 'resid_card',
+    label_trans: 'reg.resid_card', fieldtype: costanti.FieldType.string
+  }),
 
   AddCol({
     name: 'profile.cell', field: 'profile', subfield: 'cell', label_trans: 'reg.cell', maxlength: 12,

src/store/Modules/tools.ts

@@ -7887,13 +7887,13 @@ export const tools = {
   updateLink(link: string) {
     const userStore = useUserStore()
 
-    if (link === '/circuits') {
+    /*if (link === '/circuits') {
       let path = userStore.my.profile.last_circuitpath
       if (path) {
         return '/circuit/' + path
       }
       return link
-    }
+    }*/
     return link
   },
 

src/store/UserStore.ts

@@ -108,6 +108,7 @@ export const DefaultUser: IUserFields = {
     useraccounts: [],
     calc: { numGoodsAndServices: 0 },
     resid_province: '',
+    resid_card: '',
   },
   cart: {
     userId: '',
@@ -177,6 +178,7 @@ export const DefaultProfile: IUserProfile = {
   useraccounts: [],
   calc: { numGoodsAndServices: 0 },
   resid_province: '',
+  resid_card: '',
 }
 
 export const useUserStore = defineStore('UserStore', {
@@ -1888,7 +1890,8 @@ export const useUserStore = defineStore('UserStore', {
         }
       }
 
-      return yes
+      return true
+      // return yes
     },
 
     async setSeen($q: any, t: any, id: any, table: string, myrec: any) {