- Entri in Circuito Italia solo se hai il fido nel circuito provinciale

- Aggiunta Zona, oltre alla provincia, per visualizzare i vari circuiti della prov

src/views/user/editprofile/editprofile.ts

@@ -110,6 +110,7 @@ export default defineComponent({
       t,
       userStore,
       site: globalStore.site,
+      globalStore,
     }
   }
 })

src/views/user/editprofile/editprofile.vue

@@ -178,6 +178,21 @@
           :db_rec="userStore.my"
         >
         </CMySelectCity>
+        <CMySelectCity
+          v-if="globalStore.isPresenteCardsByProv(userStore.my.profile.resid_province)"
+          :label="$t('reg.resid_card')"
+          table="users"
+          jointable="cards"
+          v-model="userStore.my.profile.resid_card"
+          myclass="selectorwide text-white"
+          :db_type="costanti.FieldType.string"
+          db_field="profile"
+          db_subfield="resid_card"
+          :db_id="userStore.my._id"
+          :db_rec="userStore.my"
+          :value2="userStore.my.profile.resid_province"
+        >
+        </CMySelectCity>
       </div>
 
       <div class="myrow">

src/views/user/mycircuit/mycircuit.vue

@@ -144,13 +144,16 @@
                   v-close-popup
                 ></q-btn>
               </q-bar>
-              <q-card-section class="q-px-xs  inset-shadow">
+              <q-card-section class="q-px-xs inset-shadow">
                 <q-option-group
                   v-model="showwhommov"
                   :options="optionsmov"
                   color="primary"
                 />
-                <q-toggle v-model="tabellare" label="Formato Tabella"></q-toggle>
+                <q-toggle
+                  v-model="tabellare"
+                  label="Formato Tabella"
+                ></q-toggle>
 
                 <CGridTableRec
                   v-if="tabellare && !loading"
@@ -274,6 +277,41 @@
         <br />
 
         <div class="row text-center">
+          <q-banner
+            v-if="
+              circuitStore.isCircuitNational(circuit.name) &&
+              !circuitStore.SonoDentroAdAlmeno1CircuitoConFido()
+            "
+            inline-actions
+            class="bg-blue text-white"
+          >
+            <template v-slot:avatar>
+              <q-icon name="fas fa-info" color="red" size="sm" />
+            </template>
+            <span
+              v-html="$t('circuit.entra_italia_solo_dopo_aver_fido')"
+            ></span>
+          </q-banner>
+          <q-banner
+            v-if="circuitStore.IsNationalAndNotEnterInLocal(circuit.name)"
+            rounded
+            class="bg-red text-white"
+            style="text-align: center"
+          >
+            <template v-slot:avatar>
+              <q-icon
+                class="vertical-align center"
+                name="fas fa-info"
+                color="white"
+                size="sm"
+              />
+            </template>
+
+            <em style="font-weight: bold">{{
+              $t('circuit.beforeentertolocalcircuit')
+            }}</em
+            ><br />
+          </q-banner>
           <q-banner
             v-if="
               userStore.my.profile &&
@@ -285,7 +323,7 @@
             style="text-align: center"
           >
             <template v-slot:avatar>
-              <q-icon name="fas fa-info" color="red" size="sm" />
+              <q-icon name="fas fa-info" color="white" size="sm" />
             </template>
 
             <em style="font-weight: bold">{{
@@ -314,33 +352,15 @@
             ><br />
           </q-banner>
 
-          <q-banner
-            v-if="circuitStore.IsNationalAndNotEnterInLocal(circuit.name)"
-            rounded
-            class="bg-red text-white"
-            style="text-align: center"
-          >
-            <template v-slot:avatar>
-              <q-icon
-                class="vertical-align center"
-                name="fas fa-info"
-                color="red"
-                size="sm"
-              />
-            </template>
-
-            <em style="font-weight: bold">{{
-              $t('circuit.beforeentertolocalcircuit')
-            }}</em
-            ><br />
-          </q-banner>
-
           <div class="centermydiv q-mt-md">
             <q-btn
               v-if="
                 !userStore.IsMyCircuitByName(circuit.name) &&
                 !userStore.IsAskedCircuitByName(circuit.name) &&
-                !userStore.IsRefusedCircuitByName(circuit.name)
+                !userStore.IsRefusedCircuitByName(circuit.name) &&
+                (!circuitStore.isCircuitNational(circuit.name) ||
+                  (circuitStore.isCircuitNational(circuit.name) &&
+                    circuitStore.SonoDentroAdAlmeno1CircuitoConFido()))
               "
               :disable="circuitStore.IsNationalAndNotEnterInLocal(circuit.name)"
               icon="fas fa-user-plus"

src/views/user/myprofile/myprofile.vue

@@ -689,6 +689,15 @@
                   "
                   label="Provincia"
                 />
+                <CLabel
+                  v-if="!!userStore.userprofile.profile.resid_card"
+                  v-bind="$attrs"
+                  :copy="false"
+                  :value="
+                    userStore.userprofile.profile.resid_card
+                  "
+                  label="Zona"
+                />
                 <CDateTime
                   v-if="
                     checkifShow('profile.dateofbirth') &&