l'admin non riesce a cambiare il fido degli utenti...

.env.development

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.11"
+APP_VERSION="1.0.13"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"

.env.example.production

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.11"
+APP_VERSION="1.0.13"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

.env.test.risosrv

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.11"
+APP_VERSION="1.0.13"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/riso.app/.env.development

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.11"
+APP_VERSION="1.0.13"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"

_ALL_SITES/riso.app/.env.production

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.11"
+APP_VERSION="1.0.13"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/terradellavisione.app/.env.development

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.11"
+APP_VERSION="1.0.13"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="14"
 DIRECTORY_LOCAL="newfreeplanet"

src/db/static_data.ts

@@ -101,6 +101,17 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       inmenu: true,
       infooter: true,
     },
+    {
+      active: site.confpages && site.confpages.enableCircuits,
+      order: 16,
+      path: '/circuits',
+      materialIcon: 'fas fa-coins',
+      name: 'mypages.circuits',
+      component: () => import('@/views/user/mycircuits/mycircuits.vue'),
+      meta: { requiresAuth: true },
+      inmenu: true,
+      infooter: true,
+    },
     {
       active: true,
       order: 20,
@@ -156,17 +167,6 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       inmenu: false,
       infooter: false,
     },
-    {
-      active: site.confpages && site.confpages.enableCircuits,
-      order: 133,
-      path: '/circuits',
-      materialIcon: 'fas fa-coins',
-      name: 'mypages.circuits',
-      component: () => import('@/views/user/mycircuits/mycircuits.vue'),
-      meta: { requiresAuth: true },
-      inmenu: false,
-      infooter: false,
-    },
     {
       active: true,
       order: 136,

src/store/Modules/fieldsTable.ts

@@ -3052,12 +3052,12 @@ export const colTableCircuit = [
   AddCol({
     name: 'name', label_trans: 'circuit.name',
     required: true,
-    maxlength: 30,
+    maxlength: 40,
     showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InView
   }),
   AddCol({
     name: 'path', label_trans: 'circuit.path', required: true,
-    maxlength: 30,
+    maxlength: 40,
     showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InView,
     allowchar: costanti.ALLOWCHAR_CODE,
   }),

src/store/NotifStore.ts

@@ -232,7 +232,7 @@ export const useNotifStore = defineStore('NotifStore', {
 
       return Api.SendReq('/sendnotif', 'POST', data)
         .then((res) => {
-          console.log('res', res)
+          // console.log('res', res)
           if (res.status === 200) {
             if (res.data.code === serv_constants.RIS_CODE_OK && res.data.record) {
               if (res.data.record.dest === userStore.my.username) {

src/store/UserStore.ts

@@ -488,6 +488,7 @@ export const useUserStore = defineStore('UserStore', {
 
     getMyCircuitsInCommonByUser(user: IUserFields): any[] {
       let arrout = []
+      let arrfinale = []
       let vuoto = false
 
       const circuitStore = useCircuitStore()
@@ -497,21 +498,30 @@ export const useUserStore = defineStore('UserStore', {
       else
         arrout = tools.getCommon([...this.my.profile.mycircuits], [...user.profile.mycircuits], 'circuitname')
 
+      // controlla che il circuito sia Abilitato!
+      for (const circuitname of arrout) {
+        const circuit = circuitStore.getCircuitByName(circuitname)
+        if (circuit && circuit.transactionsEnabled) {
+          arrfinale.push(circuitname)
+        }
+      }
+
       // se non ho neanche 1 circuito in comune, metto il mio preferito
-      if (arrout.length <= 0) {
+      if (arrfinale.length <= 0) {
         const circuit = circuitStore.getCircuitByProvince(this.my.profile.resid_province)
         if (circuit)
-          arrout.push(circuit.name)
+          arrfinale.push(circuit.name)
         else {
           if (this.my.profile.mycircuits.length > 0) {
-            arrout.push(this.my.profile.mycircuits[0].circuitname)
+            arrfinale.push(this.my.profile.mycircuits[0].circuitname)
           }
         }
+      } else {
       }
 
-      console.log('arrout', arrout)
+      console.log('arrout', arrfinale)
 
-      return arrout
+      return arrfinale
     },
 
     getMyCircuits(): any[] {

src/store/globalStore.ts

@@ -1093,7 +1093,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
       return Api.SendReq('/settable', 'POST', mydata)
         .then((res) => {
           this.serverError = false
-          console.log('res', res)
+          // console.log('res', res)
           if (res && res.data) {
             tools.updateMyData(res.data.ris)
             if (res.data.rec) {