Notifica Telegram e Push quando mandi la stretta di mano

src/components/CFinder/CFinder.ts

@@ -142,6 +142,8 @@ export default defineComponent({
     const mypagination = computed(() => {
       if (props.table === toolsext.TABMYBACHECAS)
         return { sortBy: 'dateTimeStart', descending: false, page: 1, rowsNumber: 20, rowsPerPage: 20 }
+      else if (props.table === toolsext.TABMYGROUPS)
+      return { sortBy: 'date_created', descending: true, page: 1, rowsNumber: 20, rowsPerPage: 20 }
       else if (props.table === toolsext.TABMOVEMENTS)
         return { sortBy: 'transactionDate', descending: true, page: 1, rowsNumber: 20, rowsPerPage: 20 }
       else if (props.table === toolsext.TABCIRCUITS)
@@ -951,18 +953,6 @@ export default defineComponent({
           tablesel: 'cities',
           icon: 'fas fa-map-marker-alt',
         },
-        {
-          label: 'Visiblità',
-          table: 'visibilGroup',
-          key: 'visibility',
-          type: costanti.FieldType.multiselect,
-          value: tools.getCookie(tools.COOK_SEARCH + 'visibility', costanti.FILTER_TUTTI),
-          addall: true,
-          arrvalue: [],
-          useinput: true,
-          filter: null,
-          tablesel: 'visibility',
-        },
         {
           label: 'Categorie',
           table: 'catgrps',
@@ -975,6 +965,18 @@ export default defineComponent({
           useinput: false,
           icon: 'engineering',
         },
+        {
+          label: 'Visiblità',
+          table: 'visibilGroup',
+          key: 'visibility',
+          type: costanti.FieldType.multiselect,
+          value: tools.getCookie(tools.COOK_SEARCH + 'visibility', costanti.FILTER_TUTTI),
+          addall: true,
+          arrvalue: [],
+          useinput: true,
+          filter: null,
+          tablesel: 'visibility',
+        },
       ]
 
       filtercustom.value = []

src/components/CMyCardService/CMyCardService.vue

@@ -9,6 +9,7 @@
         >
         </CGalleryImages>
 
+
         <q-card-actions align="right">
           <div v-if="table === shared_consts.TABLES_MYBACHECAS" class="">
             <q-btn
@@ -519,7 +520,11 @@
               /></q-item-label>
             </q-item-section>
           </q-item>
-          <q-item clickable v-if="table === 'mybachecas'">
+          <q-item clickable v-if="table === 'mybachecas' && calendarStore.getNumParticipants(
+                        myrec,
+                        true,
+                        tools.peopleWhere.participants
+                      ) > 0 ">
             <q-item-section avatar>
               <q-icon color="blue" name="fas fa-user-check" />
             </q-item-section>

src/components/CMyRecCard/CMyRecCard.vue

@@ -173,7 +173,7 @@
             </div>
             <div class="q-mx-sm">
               (
-              <span v-if="table === shared_consts.TABLES_MYBACHECAS">
+              <span v-if="table === shared_consts.TABLES_MYBACHECAS && tools.getNumPartecipantes(myrec) > 0">
                 <span class="q-mx-xxs text-bold">{{
                   tools.getNumPartecipantes(myrec)
                 }}</span>

src/components/CSignUp/CSignUp.vue

@@ -80,8 +80,9 @@
           <div v-if="signup.terms">
             <q-input
               v-if="
-                showaportador &&
+                (showaportador &&
-                signup.aportador_solidario !== tools.APORTADOR_NONE
+                signup.aportador_solidario !== tools.APORTADOR_NONE)
+                && v$.aportador_solidario.$error
               "
               ref="inputAportador"
               bg-color="lightblue"
@@ -204,7 +205,7 @@
                 </template>
               </q-input>
 
-              <q-input
+              <!--<q-input
                 ref="inputSurname"
                 v-model="signup.surname"
                 rounded
@@ -222,7 +223,7 @@
                 <template v-slot:prepend>
                   <q-icon name="person" />
                 </template>
-              </q-input>
+              </q-input>-->
               <q-input
                 ref="inputPassword"
                 v-model="signup.password"

src/components/CUserNonVerif/CUserNonVerif.ts

@@ -1,4 +1,4 @@
-import { computed, defineComponent, PropType, ref } from 'vue'
+import { computed, defineComponent, onMounted, PropType, ref } from 'vue'
 
 import { ICalcStat, IOperators } from '../../model'
 import { useUserStore } from '../../store/UserStore'
@@ -27,12 +27,20 @@ export default defineComponent({
     const globalStore = useGlobalStore()
 
     const site = ref(globalStore.site)
+    const username_telegram_aportador = ref('')
+
+    function load() {
+      ///
+    }
+
+    onMounted(load)
 
     return {
       userStore,
       globalStore,
       tools,
       site,
+      username_telegram_aportador,
     }
   },
 })

src/components/CUserNonVerif/CUserNonVerif.vue

@@ -13,16 +13,15 @@
     </div>
 
     <div v-if="userStore.isUserWaitingVerifAportador()" class="centeritems">
-      <q-banner inline-actions rounded class="bg-orange text-black">
+      <q-banner inline-actions rounded class="bg-green text-black">
         <template v-slot:avatar>
           <q-icon name="info" color="primary" />
         </template>
-        <strong
+        <strong class="text-h5"
           >Appena sarai abilitato, dal tuo invitante
           {{ tools.getAportadorSolidario() }}, ti arriverà una
-          <strong>notifica su Telegram</strong>.<br /><br />
+          <strong>notifica sulla Chat Telegram 'BOT RISO'</strong>.<br /><br />
-          Se non dovesse arrivarti entro 24 ore prova a mandargli un
+          Se non dovesse arrivarti entro 24 ore, apri il suo profilo e clicca su 'Messaggia' e scrivigli.<br />
-          messaggio.<br />
         </strong>
 
         <q-btn
@@ -31,9 +30,23 @@
           color="primary"
           icon="fas fa-user"
           :to="tools.getLinkProfileAportador()"
-          :label="`Profilo di ` + tools.getAportadorSolidario()"
+          :label="`Apri il Profilo di ` + tools.getAportadorSolidario()"
         >
         </q-btn>
+        <br><br>
+        <div class="text-h5"> Oppure manda un messaggio all'assistenza:</div>
+        <q-btn
+          rounded
+          type="a"
+          class="q-ma-sm"
+          color="primary"
+          icon="fab fa-telegram"
+          href="https://t.me/surya1977"
+          :label="`Contatta l'Assistenza (Paolo)`"
+        >
+        </q-btn>
+
+
       </q-banner>
     </div>
   </div>

src/components/MyFooter/MyFooter.vue

@@ -24,12 +24,19 @@
             :label="$t('tabdown.home')"
             icon="fas fa-home"
           />
-          <q-route-tab
+          <!--<q-route-tab
             v-if="site.confpages.showViewGroups"
             class="mylabfooter"
             :label="$t('tabdown.groups')"
             to="/groups"
             icon="fas fa-users"
+          />-->
+          <q-route-tab
+            v-if="site.confpages.showViewEventi"
+            class="mylabfooter"
+            :label="$t('tabdown.eventi')"
+            to="/events"
+            icon="fas fa-calendar-week"
           />
           <q-route-tab
             v-if="site.confpages.showViewCircuits"

src/model/GlobalStore.ts

@@ -245,6 +245,7 @@ export interface IConfPages {
   enableDebugOn: boolean
   enabledRegNeedTelegram: boolean
   showViewGroups: boolean
+  showViewEventi: boolean
   showViewCircuits: boolean
   showViewUsers: boolean
   showViewBooking: boolean

src/rootgen/admin/confsite/confsite.vue

@@ -624,6 +624,16 @@
                 :type="costanti.FieldType.boolean"
               >
               </CMyFieldDb>
+              <CMyFieldDb
+                table="sites"
+                :title="$t('confpages.showViewEventi')"
+                :id="mysite._id"
+                :rec="mysite"
+                mykey="confpages"
+                mysubkey="showViewEventi"
+                :type="costanti.FieldType.boolean"
+              >
+              </CMyFieldDb>
               <CMyFieldDb
                 table="sites"
                 :title="$t('confpages.showViewUsers')"

src/statics/lang/it.js

@@ -1386,6 +1386,7 @@ const msg_it = {
     tabdown: {
       home: 'Home',
       groups: 'Gruppi',
+      eventi: 'Eventi',
       friends: 'Amici',
       bookings: 'Prenotaz.',
       profile: 'Profilo',
@@ -1458,6 +1459,7 @@ const msg_it = {
       enableDebugOn: 'Attiva Debug',
       enabledRegNeedTelegram: 'Reg con Telegram',
       showViewGroups: 'Bott. Gruppi',
+      showViewEventi: 'Bott. Eventi',
       showViewUsers: 'Bott. Users',
       showViewCircuits: 'Bott. Circuiti',
       videoPromo: 'Video Presentazione',

src/store/Modules/tools.ts

@@ -7188,6 +7188,10 @@ export const tools = {
     return '/my/' + tools.getAportadorSolidario()
   },
 
+  getLinkTelegramAportador(username_telegram_aportador: string) {
+    return this.getHttpForTelegram(username_telegram_aportador)
+  },
+
   openrighttoolbar() {
     const globalStore = useGlobalStore()
     globalStore.rightDrawerOpen = true

src/store/globalStore.ts

@@ -168,6 +168,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
         enableDebugOn: false,
         showButtHome: false,
         showViewGroups: false,
+        showViewEventi: false,
         showViewCircuits: false,
         showViewUsers: false,
         showViewBooking: false,