Nuovo Sistema di registrazione:

tramite il BOT, viene memorizzato l'username telegram e si usa quello come username per la APP, e l'ID telegram viene passato direttamente, senza chiedere la verifica. - ospitalità (inizio).
2022-05-04 00:26:30 +02:00
parent b5ea2f2293
commit dafee01e20
21 changed files with 607 additions and 44 deletions
--- a/src/components/CFinder/CFinder.ts
+++ b/src/components/CFinder/CFinder.ts
@@ -50,6 +50,7 @@ export default defineComponent({
    const searchList_Beni = ref(<ISearchList[]>[])
    const searchList_MyGroups = ref(<ISearchList[]>[])
    const searchList_Events = ref(<ISearchList[]>[])
+    const searchList_Hosp = ref(<ISearchList[]>[])

    const search = ref('')
    const myrecfiltertoggle = ref(tools.FILTER_ALL)
@@ -118,6 +119,8 @@ export default defineComponent({
        return searchList_MyGroups.value
      else if (props.table === toolsext.TABMYBACHECAS)
        return searchList_Events.value
+      else if (props.table === toolsext.TABMYHOSPS)
+        return searchList_Hosp.value

      return searchList_Servizi.value
    })
@@ -142,6 +145,8 @@ export default defineComponent({
        return 'nome del Gruppo da cercare'
      else if (props.table === toolsext.TABMYBACHECAS)
        return 'nome dell\'Evento da cercare'
+      else if (props.table === toolsext.TABMYHOSPS)
+        return 'nome dell\'Ospitalità da cercare'

      return 'nome da cercare'
    })
@@ -168,6 +173,8 @@ export default defineComponent({
        return 'Nessun Gruppo trovato con i filtri selezionati'
      else if (props.table === toolsext.TABMYBACHECAS)
        return 'Nessun Evento trovato con i filtri selezionati'
+      else if (props.table === toolsext.TABMYHOSPS)
+        return 'Nessuna Ospitalità trovata con i filtri selezionati'

      return 'Nessun dato trovato con i filtri selezionati'
    })
@@ -496,6 +503,108 @@ export default defineComponent({

      ]

+      searchList_Hosp.value = [
+        {
+          label: 'Stato',
+          table: 'statusSkills',
+          key: 'idStatusSkill',
+          value: 0,
+          arrvalue: tools.getCookie(tools.COOK_SEARCH + 'statusSkills', []),
+          type: costanti.FieldType.multiselect,
+          filter: null,
+          useinput: false,
+          icon: 'mood',
+          filteradv: false,
+        },
+        {
+          label: 'Regione',
+          table: 'regions',
+          key: 'idReg',
+          type: costanti.FieldType.select,
+          value: tools.getCookie(tools.COOK_SEARCH + 'regions', costanti.FILTER_TUTTI),
+          addall: true,
+          arrvalue: [],
+          filter: null,
+          useinput: false,
+          icon: 'fas fa-globe-europe'
+        },
+        {
+          label: 'Provincia',
+          table: 'provinces',
+          key: 'idProvince',
+          type: costanti.FieldType.select,
+          value: tools.getCookie(tools.COOK_SEARCH + 'provinces', costanti.FILTER_TUTTI),
+          addall: true,
+          arrvalue: [],
+          filter: getFilterProvinceByRegion,
+          useinput: true,
+          icon: 'flag',
+        },
+        {
+          label: 'Comune',
+          table: 'cities',
+          key: 'idCity',
+          type: costanti.FieldType.select_by_server,
+          value: tools.getCookie(tools.COOK_SEARCH + 'cities', costanti.FILTER_TUTTI),
+          addall: true,
+          arrvalue: [],
+          useinput: true,
+          filter: null,
+          // filter: getFilterCitiesByProvince,
+          // param1: shared_consts.PARAM_SHOW_PROVINCE,
+          tablesel: 'cities',
+        },
+        {
+          label: 'Data Inizio',
+          table: 'caldate',
+          key: 'dateTimeStart',
+          value: 2,
+          arrvalue: [],
+          type: costanti.FieldType.select,
+          addall: true,
+          filter: null,
+          useinput: false,
+        },
+        {
+          label: 'Settore',
+          table: toolsext.TABSECTORS,
+          key: 'idSector',
+          value: tools.getCookie(tools.COOK_SEARCH + toolsext.TABSECTORS, 0),
+          arrvalue: [],
+          type: costanti.FieldType.select,
+          filter: null,
+          addall: true,
+          notinsearch: true,
+          useinput: false,
+        },
+        {
+          label: 'Categoria',
+          table: 'skills',
+          key: 'idSkill',
+          value: tools.getCookie(tools.COOK_SEARCH + 'skills' + '_' + tools.getCookie(tools.COOK_SEARCH + toolsext.TABSECTORS, costanti.FILTER_TUTTI), costanti.FILTER_TUTTI),
+          arrvalue: [],
+          type: costanti.FieldType.select,
+          addall: true,
+          filter: getFilterSkills,
+          showcount: true,
+          useinput: false,
+        },
+        {
+          label: 'In cambio di',
+          table: 'contribtypes',
+          key: 'idContribType',
+          value: 0,
+          arrvalue: tools.getCookie(tools.COOK_SEARCH + 'contribtypes', []),
+          type: costanti.FieldType.multiselect,
+          filter: null,
+          useinput: false,
+          icon: 'fas fa-hand-holding',
+          filteradv: false,
+          //icon: 'swap_horizontal_circle',
+        },
+
+      ]
+
      searchList_Beni.value = [
        {
          label: 'Regione',
@@ -926,6 +1035,69 @@ export default defineComponent({
          },
        }

+      } else if (props.table === toolsext.TABMYHOSPS) {
+        return {
+          // Servizi
+          lookup1: {
+            lk_tab: 'users',
+            lk_LF: 'userId',
+            lk_FF: '_id',
+            lk_as: 'user',
+            af_objId_tab: 'myId',
+          },
+          lookup2: {
+            lk_tab: 'skills',
+            lk_LF: 'idSkill',
+            lk_FF: '_id',
+            lk_as: 'recSkill',
+            af_objId_tab: '',
+            lk_proj: {
+              recSkill: 1,
+              sector: 1,
+              idSector: 1,
+              idSkill: 1,
+              // idSubSkill: 1,
+              myskill: 1,
+              idStatusSkill: 1,
+              idContribType: 1,
+              idCity: 1,
+              dateTimeStart: 1,
+              dateTimeEnd: 1,
+              numLevel: 1,
+              adType: 1,
+              photos: 1,
+              note: 1,
+              website: 1,
+              //**ADDFIELD_MYSKILL
+              descr: 1,
+              date_created: 1,
+              date_updated: 1,
+              userId: 1,
+              username: 1,
+              name: 1,
+              surname: 1,
+              comune: 1,
+              mycities: 1,
+              'profile.img': 1,
+              'profile.qualifica': 1,
+            }
+          },
+          lookup3: {
+            lk_tab: toolsext.TABSECTORS,
+            lk_LF: 'recSkill.idSector',
+            lk_FF: '_id',
+            lk_as: 'sector',
+            af_objId_tab: '',
+          },
+          lookup5: {
+            lk_tab: 'cities',
+            lk_LF: 'idCity',
+            lk_FF: '_id',
+            lk_as: 'mycities',
+            af_objId_tab: '',
+          },
+        }
+
      } else {
        return {
          // Servizi
@@ -994,6 +1166,8 @@ export default defineComponent({
        return tools.getdefaultnewrec_MySkill()
      } else if (props.table === toolsext.TABMYBACHECAS) {
        return tools.getdefaultnewrec_MyBacheca()
+      } else if (props.table === toolsext.TABMYHOSPS) {
+        return tools.getdefaultnewrec_MyHosp()
      } else if (props.table === toolsext.TABMYGOODS) {
        return tools.getdefaultnewrec_MyGoods()
      } else if (props.table === toolsext.TABMYGROUPS) {
--- a/src/components/CSignUp/CSignUp.ts
+++ b/src/components/CSignUp/CSignUp.ts
@@ -2,7 +2,7 @@ import { tools } from '@store/Modules/tools'

 import { ISignupOptions } from 'model'

-import { Logo } from '../../components/logo'
+import { Logo } from '@/components/logo'

 // import 'vue-country-code/dist/vue-country-code.css'

@@ -133,6 +133,8 @@ export default defineComponent({
    const v$ = useVuelidate(validations, signup)

    const invited = ref($route.params.invited)
+    const usernameteleg = ref($route.params.usernameteleg)
+    const idteleg = ref($route.params.idteleg)

    watch(() => invited, (to: any, from: any) => {
      if (props.showaportador) {
@@ -240,8 +242,12 @@ export default defineComponent({

      console.log('$route.params', $route.params)

-      // @ts-ignore
-      signup.aportador_solidario = $route.params.invited
+      signup.aportador_solidario = !!$route.params.invited ? $route.params.invited.toString() : ''
+      signup.username = !!$route.params.usernameteleg ? $route.params.usernameteleg.toString() : ''
+      signup.profile.username_telegram = signup.username
+      if (!!$route.params.idteleg) {
+        signup.profile.teleg_id = $route.params.idteleg ? parseInt($route.params.idteleg.toString()) : 0
+      }

      console.log('1) aportador_solidario', signup.aportador_solidario)

@@ -253,6 +259,10 @@ export default defineComponent({
      }

      console.log('signup.aportador_solidario', signup.aportador_solidario)
+
+      if (!signup.username || !signup.profile.teleg_id) {
+        window.location.href = tools.getLinkBotTelegram()
+      }
    }

    function myRuleEmail(val: string) {
--- a/src/components/CSignUp/CSignUp.vue
+++ b/src/components/CSignUp/CSignUp.vue
@@ -79,6 +79,25 @@

        </q-input> -->

+        <q-input
+          v-model="signup.username"
+          :readonly="true"
+          rounded outlined
+          @blur="v$.username.$touch"
+          @update:model-value="changeusername"
+          :error="v$.username.$error"
+          @keydown.space="(event) => event.preventDefault()"
+          maxlength="20"
+          debounce="1000"
+          :error-message="tools.errorMsg( 'username', v$.username)"
+          :label="$t('reg.username_reg')">
+
+          <template v-slot:prepend>
+            <q-icon name="person"/>
+          </template>
+
+        </q-input>
+
        <q-input
          v-model="signup.email"
          rounded outlined
@@ -95,25 +114,6 @@

        </q-input>

-        <q-input
-          v-model="signup.username"
-          rounded outlined
-          @blur="v$.username.$touch"
-          @update:model-value="changeusername"
-          :error="v$.username.$error"
-          @keydown.space="(event) => event.preventDefault()"
-          maxlength="20"
-          :hint="$t('reg.username_hint')"
-          debounce="1000"
-          :error-message="tools.errorMsg( 'username', v$.username)"
-          :label="$t('reg.username_reg')">
-
-          <template v-slot:prepend>
-            <q-icon name="person"/>
-          </template>
-
-        </q-input>
-
        <div v-if="show_namesurname">
          <q-input
            v-model="signup.name"
--- a/src/components/CSkill/CSkill.ts
+++ b/src/components/CSkill/CSkill.ts
@@ -339,6 +339,8 @@ export default defineComponent({
        return tools.getdefaultnewrec_MySkill()
      } else if (props.table === toolsext.TABMYBACHECAS) {
        return tools.getdefaultnewrec_MyBacheca()
+      } else if (props.table === toolsext.TABMYHOSPS) {
+        return tools.getdefaultnewrec_MyHosp()
      } else if (props.table === toolsext.TABMYGOODS) {
        return tools.getdefaultnewrec_MyGoods()
      }