- 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/components/CMyProfileTutorial/CMyProfileTutorial.ts

@@ -1,5 +1,6 @@
 import { defineComponent, onMounted, PropType, ref, watch, computed } from 'vue'
 import { useUserStore } from '@store/UserStore'
+import { useGlobalStore } from '@store/globalStore'
 import { ICircuit, IImgGallery, IUserFields, IUserProfile } from 'model'
 import { costanti } from '@costanti'
 import { shared_consts } from '@/common/shared_vuejs'
@@ -53,6 +54,7 @@ export default defineComponent({
 
     const userStore = useUserStore()
     const circuitStore = useCircuitStore()
+    const globalStore = useGlobalStore()
     const $q = useQuasar()
     const { t } = useI18n()
     const $router = useRouter()
@@ -107,6 +109,11 @@ export default defineComponent({
 
     watch(() => strProv.value, (newval: string, oldval: string) => {
       mycircuit.value = circuitStore.getCircuitByProvinceAndCard(strProv.value, card.value)
+      if (!globalStore.isPresenteCardsByProv(strProv.value)) {
+        if (contact.value && contact.value.profile.resid_card) {
+          contact.value.profile.resid_card = ''
+        }  
+      }
     })
 
     watch(() => card.value, (newval: string, oldval: string) => {
@@ -432,7 +439,7 @@ export default defineComponent({
       if (circuitStore.SonoDentroAdAlmeno1CircuitoConFido())
         arrStep.value.push({ ...stepCircItalia, indstep: numindstep.value })
 
-      arrStep.value.push({ ...stepFine, indstep: numindstep.value })
+      // arrStep.value.push({ ...stepFine, indstep: numindstep.value })
 
       if (userStore.isUserOk()) {
         updatestart()
@@ -553,6 +560,7 @@ export default defineComponent({
       usersList,
       userstoverify,
       numStepCompleted,
+      globalStore,
     }
   },
 })

src/components/CMyProfileTutorial/CMyProfileTutorial.vue

@@ -9,11 +9,14 @@
           class="q-pa-none"
           :title="
             !progressStep
-              ? $t('tutorial.title', { indstep, numindstep }) +
+              ? $t('tutorial.title', { indstep: indstep + 1, numindstep }) +
                 ` (` +
                 progressLabel +
                 `)`
-              : $t('tutorial.title_completed', { indstep, numindstep }) +
+              : $t('tutorial.title_completed', {
+                  indstep: indstep + 1,
+                  numindstep,
+                }) +
                 ` (` +
                 progressLabel +
                 `)`
@@ -84,6 +87,22 @@
                         :db_rec="contact"
                       >
                       </CMySelectCity>
+                      
+                      <CMySelectCity
+                        v-if="globalStore.isPresenteCardsByProv(contact.profile.resid_province)"
+                        :label="$t('reg.resid_card')"
+                        table="users"
+                        jointable="cards"
+                        v-model="contact.profile.resid_card"
+                        myclass="selectorwide text-white"
+                        :db_type="costanti.FieldType.string"
+                        db_field="profile"
+                        db_subfield="resid_card"
+                        :db_id="contact._id"
+                        :db_rec="contact"
+                        :value2="contact.profile.resid_province"
+                      >
+                      </CMySelectCity>
                     </q-banner>
                     <div v-else-if="step === STEP_NAME_SURNAME">
                       <q-banner>
@@ -125,7 +144,7 @@
                         outlined
                         v-model="circuitsel"
                         :options="mylistcircuits"
-                        label="Circuito"
+                        label="SCegli il Circuito della tua Zona:"
                       >
                       </q-select>
 
@@ -250,7 +269,9 @@
         <span v-html="$t('tutorial.utenti_da_verificare')"></span>
         <template v-slot:action>
           <q-btn
-            :label="userstoverify.length + ' ' + $t('tutorial.utenti_da_verif_btn')"
+            :label="
+              userstoverify.length + ' ' + $t('tutorial.utenti_da_verif_btn')
+            "
             class="q-my-sm"
             rounded
             icon="fas fa-users"
@@ -293,14 +314,19 @@
 
       <q-card-section class="inset-shadow">
         <q-list>
-        <span v-for="(rec, index) in userstoverify" :key="index" class="q-my-sm rounded-borders" clickable>
-          <CMyUser
-            :mycontact="rec"
-            :visu="costanti.ASK_TRUST"
-            @setCmd="tools.setCmd"
+          <span
+            v-for="(rec, index) in userstoverify"
+            :key="index"
+            class="q-my-sm rounded-borders"
+            clickable
           >
-          </CMyUser>
-        </span>
+            <CMyUser
+              :mycontact="rec"
+              :visu="costanti.ASK_TRUST"
+              @setCmd="tools.setCmd"
+            >
+            </CMyUser>
+          </span>
         </q-list>
       </q-card-section>
     </q-card>