- fix: Invio RIS (non si vedevano i circuiti !)

- se si usava l'username telegram per registrarsi non faceva il controllo delle minuscole.
- bottone "Invia RIS" era scomparso

src/components/CContactUser/CContactUser.ts

@@ -20,6 +20,10 @@ export default defineComponent({
       type: Boolean,
       required: true,
     },
+    showBtnRis: {
+      type: Boolean,
+      required: true,
+    },
     sendRIS: {
       type: String,
       required: false,

src/components/CContactUser/CContactUser.vue

@@ -1,56 +1,77 @@
 <template>
-  <div v-if="(getLinkUserTelegram() && tools.isUserOk()) || showBtnActivities"
-  class="row justify-evenly items-center q-pa-sm q-ma-sm">
+  <div
+    v-if="(getLinkUserTelegram() && tools.isUserOk()) || showBtnActivities"
+    class=""
+  >
     <q-inner-loading id="spinner" :showing="loading">
       <q-spinner-tail color="primary" size="4em"> </q-spinner-tail>
     </q-inner-loading>
-    <div v-if="showBtnActivities">
-      <q-btn
-        v-if="site.confpages && site.confpages.showCompetenze"
-        icon="fas fa-house-user"
-        size="md"
-        color="orange"
-        :label="$t('profile.myactivities')"
-        :to="`/attivita/` + myuser.username"
-      >
-      </q-btn>
-    </div>
-    <div class="q-ma-sm">
-      <q-btn
-        v-if="getLinkUserTelegram() && tools.isUserOk()"
-        icon="fab fa-telegram"
-        color="blue"
-        :type="tools.isUserOk() ? 'a' : 'btn'"
-        size="md"
-        rounded
-        :label="$t('dialog.contact')"
-        :href="tools.isUserOk() ? getLinkUserTelegram() : null"
-        @click="!tools.isUserOk() ? (showingtooltip = !showingtooltip) : false"
-        target="__blank"
-      >
-      </q-btn>
-      <div v-else-if="myuser.email && tools.isUserOk()" class="row q-ma-sx">
-        <CLabel
-          v-bind="$attrs"
-          :copy="true"
-          :value="tools.isUserOk() ? myuser.email : ''"
-          :label="$t('reg.email')"
-        />
-
+    <div class="row justify-evenly items-center q-ma-xs">
+      <div class="q-pa-xs">
         <q-btn
-          outline
-          icon="fas fa-envelope"
-          :color="$q.dark.isActive ? `white` : `black`"
+          v-if="
+            showBtnActivities && site.confpages && site.confpages.showCompetenze
+          "
+          icon="fas fa-house-user"
+          size="md"
+          color="orange"
+          rounded
+          :label="$t('profile.myactivities')"
+          :to="`/attivita/` + myuser.username"
+        >
+        </q-btn>
+      </div>
+      <div class="q-pa-xs">
+        <q-btn
+          v-if="showBtnRis"
+          icon-right="img: images/1ris_rosso_100.png"
+          color="green"
+          size="md"
+          :label="$t('circuit.sendcoins')"
+          rounded
+          @click="showsendCoinTo = true"
+        >
+        </q-btn>
+      </div>
+      <div class="q-pa-xs">
+        <q-btn
+          v-if="getLinkUserTelegram() && tools.isUserOk()"
+          icon="fab fa-telegram"
+          color="blue"
           :type="tools.isUserOk() ? 'a' : 'btn'"
           size="md"
-          :label="$t('msgs.send_email')"
-          :href="tools.isUserOk() ? tools.getemailto(myuser.email) : null"
+          rounded
+          :label="$t('dialog.contact')"
+          :href="tools.isUserOk() ? getLinkUserTelegram() : null"
           @click="
             !tools.isUserOk() ? (showingtooltip = !showingtooltip) : false
           "
           target="__blank"
         >
         </q-btn>
+        <div v-else-if="myuser.email && tools.isUserOk()" class="row q-ma-sx">
+          <CLabel
+            v-bind="$attrs"
+            :copy="true"
+            :value="tools.isUserOk() ? myuser.email : ''"
+            :label="$t('reg.email')"
+          />
+
+          <q-btn
+            outline
+            icon="fas fa-envelope"
+            :color="$q.dark.isActive ? `white` : `black`"
+            :type="tools.isUserOk() ? 'a' : 'btn'"
+            size="md"
+            :label="$t('msgs.send_email')"
+            :href="tools.isUserOk() ? tools.getemailto(myuser.email) : null"
+            @click="
+              !tools.isUserOk() ? (showingtooltip = !showingtooltip) : false
+            "
+            target="__blank"
+          >
+          </q-btn>
+        </div>
       </div>
     </div>
   </div>
@@ -60,7 +81,10 @@
       :to_user="myuser"
       :sendRIS="sendRIS"
       :causalDest="causalDest"
-      @close="showsendCoinTo = false; loading = false"
+      @close="
+        showsendCoinTo = false;
+        loading = false;
+      "
       @showed="loading = false"
     >
     </CSendCoins>

src/components/CGridTableRec/CGridTableRec.ts

@@ -368,7 +368,8 @@ export default defineComponent({
     const showMapAtLeast1 = ref(false)
     const mapInitialized = ref(false)
     const slideGridOriz = ref(0)
-    const autoplay = ref(true)
+    const autoplay = ref(false)
+    const autoplayInterval = ref(<any>null)
 
     const scrollTargetId = 'carousel-scroll-target'
 
@@ -2549,6 +2550,7 @@ export default defineComponent({
 
       carouselTabRef.value?.removeEventListener('scroll', checkScrollPosition)
 
+      stopAutoplay()
 
       // window.removeEventListener('popstate', onBackButton);
     });
@@ -2676,6 +2678,35 @@ export default defineComponent({
       }
     }
 
+    const startAutoplay = () => {
+      if (autoplay.value && !autoplayInterval.value) {
+        autoplayInterval.value = setInterval(() => {
+          autoplay.value = true
+        }, 3000) // Intervallo di 3 secondi
+      } else {
+        autoplay.value = true
+      }
+    }
+    
+    const stopAutoplay = () => {
+      if (autoplayInterval.value) {
+        clearInterval(autoplayInterval.value)
+        autoplayInterval.value = null
+      }
+      autoplay.value = false
+    }
+    
+    const onIntersection = (entry: any) => {
+      if (entry.isIntersecting) {
+        // console.log('PARTITO INTERSECTION!')
+        startAutoplay()
+      } else {
+        // console.log(' USCITO DALL\'INTERSEZIONE! !!!')
+        stopAutoplay()
+      }
+    }
+    
+
     created()
 
     return {
@@ -2809,6 +2840,7 @@ export default defineComponent({
       scrollTargetId,
       handleTransition,
       loadMore,
+      onIntersection,
     }
   }
 })

src/components/CGridTableRec/CGridTableRec.vue

@@ -384,11 +384,13 @@
         id="carousel-scroll-target"
         class="carousel-scroll-container"
         :style="heightcarousel ? `height: ${heightcarousel}` : ''"
+        v-intersection="onIntersection"
       >
         <q-carousel
           swipeable
           animated
           :autoplay="autoplay"
+          infinite
           v-model="slideGridOriz"
           navigation
           control-text-color="white"
@@ -491,7 +493,7 @@
         <div
           :style="heightcarousel ? `height: ${heightcarousel}` : ''"
           :class="{ 'carousel-scroll-container': !!heightcarousel }"
-        >          
+        >
           <div v-for="(row, indexrow) in serverData" :key="indexrow">
             <div
               v-if="

src/components/CMyElem/CMyElem.ts

@@ -109,6 +109,7 @@ export default defineComponent({
     const { t } = useI18n()
 
     const animare = ref(0)
+    const animarecard = ref(0)
     const slide = ref(0)
     const slide2 = ref(0)
     const disableSave = ref(true)
@@ -127,8 +128,6 @@ export default defineComponent({
     const isAppRunning = computed(() => globalStore.isAppRunning)
 
     const currentCardsPerSlide = computed(() => {
-      if ($q.screen.lt.sm) return 1
-      if ($q.screen.lt.md) return 2
       return myel.value.num2 ? myel.value.num2 : 2! // cardsPerSlide
     })
 
@@ -281,7 +280,7 @@ export default defineComponent({
     // Classe per le colonne delle card
     function cardColumnClass() {
       const width = 12 / currentCardsPerSlide.value
-      return `col-xs-12 col-sm-6 col-md-${width}`
+      return `col-${width}`
     }
 
     onMounted(mounted)
@@ -324,6 +323,7 @@ export default defineComponent({
       cardColumnClass,
       cardGroups,
       currentCardsPerSlide,
+      animarecard,
     }
   },
 

src/components/CMyElem/CMyElem.vue

@@ -38,6 +38,7 @@
           <q-carousel
             swipeable
             animated
+            :autoplay="animarecard"
             v-model="slide"
             navigation
             control-text-color="white"
@@ -49,8 +50,8 @@
             control-type="flat"
             class="shadow-2 rounded-borders"
             :style="`background-color: ${myel.color} !important`"
-            @mouseenter="animare = false"
-            @mouseleave="animare = true"
+            @mouseenter="animarecard = false"
+            @mouseleave="animarecard = true"
             @transition="handleTransition"
           >
             <template v-slot:control>
@@ -92,7 +93,7 @@
               :name="groupIndex"
             >
               <div
-                class="row no-wrap justify-start items-center q-px-md full-width"
+                class="row no-wrap justify-start items-center q-px-sm"
               >
                 <template v-for="(rec, cardIndex) in group" :key="cardIndex">
                   <div :class="cardColumnClass">

src/components/CMyRecCard/CMyRecCard.vue

@@ -30,7 +30,7 @@
                 tools.getstrDay(myrec.dateTimeStart) !==
                 tools.getstrDay(myrec.dateTimeEnd)
               "
-              class="q-mx-sm"
+              class="q-mx-sm self-center"
             >
               -----
             </div>
@@ -66,7 +66,7 @@
               class="ev_hour_end"
               >{{ tools.getstrTime(myrec.dateTimeEnd) }}</span
             >
-            <q-avatar size="50px" class="q-my-sm">
+            <q-avatar size="50px" class="q-my-sm self-center">
               <q-img
                 :src="getImgUser(myrec)"
                 :alt="myrec.username"
@@ -173,7 +173,7 @@
             class="q-ml-xs"
           />
         </q-badge>
-        <q-avatar size="60px">
+        <q-avatar size="60px" class="self-center">
           <q-img
             :src="getImgUser(myrec)"
             :alt="myrec.username"

src/components/CSendCoins/CSendCoins.ts

@@ -463,7 +463,6 @@ export default defineComponent({
     function clickIndietro(actualstep: number) {
       if (actualstep === 1) {
         step.value = 0
-        hide()
       } else if (actualstep === 2) {
         step.value = 1
       } else if (actualstep === 0) {

src/components/CSendCoins/CSendCoins.vue

@@ -33,9 +33,9 @@
             <CCheckCircuitsEnabled :to_user="to_user" :to_group="to_group">
             </CCheckCircuitsEnabled>
 
-            <div v-if="circuitloaded.length > 0">
+            <div v-if="circuitloaded.symbol">
               <q-select
-                v-if="!circuitname"
+                v-if="circuitname === ''"
                 :behavior="$q.platform.is.ios === true ? 'dialog' : 'menu'"
                 rounded
                 dense

src/components/MyHeader/MyHeader.vue

@@ -70,6 +70,12 @@
         >
           <q-toggle :icon="'fas fa-moon'" v-model="dark"> </q-toggle>
         </div>
+        <div
+          v-if="tools.isLogged() && isAdmin()"
+          class="text-h7"
+        >
+          <q-toggle :icon="'fas fa-pencil-alt'" v-model="globalStore.editOn"> </q-toggle>
+        </div>
         <q-btn
           v-if="!isonline() && site.confpages && site.confpages.showConnected"
           flat

src/index.template.html

@@ -10,7 +10,7 @@
   <meta name="description" content="<%= productDescription %>">
   <meta name="format-detection" content="telephone=no">
   <meta name="msapplication-tap-highlight" content="no">
-  <meta name="version" content="1.1.9">
+  <meta name="version" content="1.1.11">
   <meta name="viewport"
     content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>">
 

src/store/Api/index.ts

@@ -247,8 +247,9 @@ export const Api = {
     try {
       const response = await this.SendReqBase(url, method, mydata, setAuthToken, evitaloop);
       return response;
-    } catch (error) {
+    } catch (error: any) {
       if (retryCount > 0) {
+        // (!error.hasOwnProperty('data') || (error.hasOwnProperty('data') && !error.data.error.hasOwnProperty('code')) && (!error.hasOwnProperty('msgerr')))
         console.log(`❌❌❌ Retrying request. Attempts remaining: ${retryCount}`);
         await this.delay(retryDelay);
         return this.SendReq(

src/views/user/myprofile/myprofile.vue

@@ -641,6 +641,7 @@
           <CContactUser
             :myuser="userStore.userprofile"
             :showBtnActivities="true"
+            :showBtnRis="true"
             :sendRIS="tools.isUserOk() ? sendRIS : false"
             :causalDest="causalDest"
           />