ver 1.0.19

2023-11-03 12:49:17 +01:00
parent cb11903707
commit a071d17410
28 changed files with 144 additions and 103 deletions
--- a/src/common/shared_vuejs.ts
+++ b/src/common/shared_vuejs.ts
@@ -192,7 +192,7 @@ export const shared_consts = {
  TABLES_WITH_FILTER_FIELD: ['caldate'],
  TABLES_WITH_SPECIAL_FILTER: ['pub_to_share'],
  COL_WITH_FILTER_GTE: ['numMaxPeopleHosp'],
-  TABLES_WITH_DATE: ['mybachecas', 'myhosps'],
+  TABLES_WITH_DATE: ['mybachecas', 'myhosps'], // 'mybachecas'
  TABLES_WITH_SORTING: ['mybachecas', 'myhosps'],
  TABLES_REC_ID: ['skills', 'goods', 'subskills', 'myskills', 'mybachecas', 'myhosps', 'mygoods'],
  TABLES_FAVORITE_BOOKMARK: ['myskills', 'mygoods', 'mybachecas', 'myhosps'],
--- a/src/components/CCheckAppRunning/CCheckAppRunning.vue
+++ b/src/components/CCheckAppRunning/CCheckAppRunning.vue
@@ -5,7 +5,7 @@
    <span> homescreen: {{ homescreen }} </span>
  </div>
  <div v-if="finishLoading" class="row justify-center">
-    <div v-if="!isAppRunning" class="q-ma-sm">
+    <div v-if="!isAppRunning">
      <!-- App not running -->

      <q-btn
--- a/src/components/CFinder/CFinder.ts
+++ b/src/components/CFinder/CFinder.ts
@@ -143,7 +143,7 @@ export default defineComponent({
      if (props.table === toolsext.TABMYBACHECAS)
        return { sortBy: 'dateTimeStart', descending: false, page: 1, rowsNumber: 0, rowsPerPage: 10 }
      else if (props.table === toolsext.TABMYGROUPS)
-      return { sortBy: 'date_created', descending: true, page: 1, rowsNumber: 0, rowsPerPage: 10 }
+        return { sortBy: 'date_created', descending: true, page: 1, rowsNumber: 0, rowsPerPage: 10 }
      else if (props.table === toolsext.TABMOVEMENTS)
        return { sortBy: 'transactionDate', descending: true, page: 1, rowsNumber: 0, rowsPerPage: 20 }
      else if (props.table === toolsext.TABCIRCUITS)
--- a/src/components/CGridTableRec/CGridTableRec.ts
+++ b/src/components/CGridTableRec/CGridTableRec.ts
@@ -312,6 +312,8 @@ export default defineComponent({

    const addRow = ref('Aggiungi')
    const actmonth = ref('')
+    const drawmonth = ref(true)
+

    const newRecordBool = ref(false)
    const newRecordBoolOld = ref(false)
@@ -331,6 +333,9 @@ export default defineComponent({
    const showSpin = ref(false)
    const showNotification = ref(false)

+    // const withdate = computed(() => shared_consts.TABLES_WITH_DATE.includes(tablesel.value))
+    const withdate = ref(false)
+
    const loading = ref(false)
    const alreadymounting = ref(false)
    const editOn = computed({
@@ -2274,6 +2279,21 @@ export default defineComponent({
      }
    }

+    function setShowMonth(row: any, index: number) {
+      if (actmonth.value !== tools.getstrMonth(row.dateTimeStart)) {
+        actmonth.value = tools.getstrMonth(row.dateTimeStart)
+        drawmonth.value = true
+      } else {
+        drawmonth.value = false
+      }
+
+      return drawmonth.value
+    }
+
+    function ifShowMonth() {
+      return drawmonth.value
+    }
+
    /*function showNotification() {
      $router.push('/notifs')
    } */
@@ -2386,6 +2406,9 @@ export default defineComponent({
      getNumRecFromQuery,
      actmonth,
      alreadymounting,
+      withdate,
+      setShowMonth,
+      ifShowMonth,
    }
  }
 })
--- a/src/components/CGridTableRec/CGridTableRec.vue
+++ b/src/components/CGridTableRec/CGridTableRec.vue
@@ -385,7 +385,7 @@
        </div>
      </div>

-      <div v-for="(row, index) in serverData" :key="index">
+      <div v-for="(row, indexrow) in serverData" :key="indexrow">
        <div
          v-if="
            showType === costanti.SHOW_MYCARD ||
@@ -395,19 +395,10 @@
              shared_consts.TABLES_VISU_CMYSRECCARD.includes(tablesel))
          "
        >
-          <div v-if="row && shared_consts.TABLES_WITH_DATE.includes(tablesel)">
-            <div
-              v-if="
-                actmonth !== tools.getstrMonth(row.dateTimeStart) ||
-                !actmonth ||
-                index === 0
-              "
-            >
-              <span style="display: none">{{
-                (actmonth = tools.getstrMonth(row.dateTimeStart))
-              }}</span>
-              <div class="">
-                <div>
+          <div v-if="row && withdate">
+            <div v-if="setShowMonth(row, indexrow)">
+              <div>
+                <div v-if="row.dateTimeStart">
                  <strong>{{ tools.getstrMonth(row.dateTimeStart) }}</strong>
                </div>
                <div>
@@ -415,25 +406,6 @@
                </div>
              </div>
            </div>
-
-            <div
-              v-if="
-                false &&
-                ((row.dateTimeStart &&
-                  tools.getstrVeryShortDate(row.dateTimeStart) !== actual) ||
-                  index === 0)
-              "
-              class="actualdate"
-            >
-              <span style="display: none">{{
-                (actual = tools.getstrVeryShortDate(row.dateTimeStart))
-              }}</span>
-              <q-chip
-                class="text-center shadow-5 glossy bg-orange"
-                icon="fas fa-calendar-day"
-                >{{ tools.getstrDateLong(row.dateTimeStart) }}</q-chip
-              >
-            </div>
          </div>

          <CMyRecGrpCard
@@ -1126,7 +1098,7 @@
      </template>
    </q-table>

-    <q-page-sticky
+    <!--<q-page-sticky
      v-if="mytable && butt_modif_new && !hidetitleIfEmpty"
      position="bottom-right"
      :offset="[18, 68]"
@@ -1139,7 +1111,7 @@
        color="primary"
        @click="createNewRecordDialog"
      />
-    </q-page-sticky>
+    </q-page-sticky>-->

    <q-dialog
      v-model="visupagedialog"
--- a/src/components/CMyCardCircuitPopup/CMyCardCircuitPopup.ts
+++ b/src/components/CMyCardCircuitPopup/CMyCardCircuitPopup.ts
@@ -14,7 +14,7 @@ import { useI18n } from '@/boot/i18n'
 import { toolsext } from '@store/Modules/toolsext'
 import { useQuasar } from 'quasar'
 import { costanti } from '@costanti'
-import { IColGridTable, IImgGallery, IUserFields } from 'model'
+import { IColGridTable, ICircuit, IImgGallery, IUserFields } from 'model'
 import { shared_consts } from '@/common/shared_vuejs'
 import { colCitys, fieldsTable } from '@store/Modules/fieldsTable'
 import { useRoute } from 'vue-router'
@@ -52,7 +52,7 @@ export default defineComponent({

    const idnotif = computed(() => $route.query.idnotif ? $route.query.idnotif.toString() : '')

-    const myrec = ref({})
+    const myrec = ref(<ICircuit | undefined>{})
    const col = ref(<IColGridTable>{})

    function profile() {
--- a/src/components/CMyCardCircuitPopup/CMyCardCircuitPopup.vue
+++ b/src/components/CMyCardCircuitPopup/CMyCardCircuitPopup.vue
@@ -22,7 +22,7 @@

        <q-img
          v-if="tools.getValue(myrec, 'photos', '')"
-          :src="tools.getFullFileName(tools.getValue(myrec, 'photos', ''), table, myrec.username, myrec.path)"
+          :src="tools.getFullFileName(tools.getValue(myrec, 'photos', ''), table, userStore.my.username, myrec.path)"
          class="img"
          alt="immagine del circuito"></q-img>
      </div>
@@ -59,7 +59,7 @@
              {{ tools.getValue(myrec, mycol.field, mycol.subfield) }}
            </div>
          </div>
-          <div v-else-if="mycol.name === 'photos' && myrec.photos.length <= 1">
+          <div v-else-if="mycol.name === 'photos' && myrec.photos && myrec.photos.length <= 1">
          </div>
          <div v-else-if="mycol.name === 'admins'">
            <CMyFieldRec
--- a/src/components/CMyProfileTutorial/CMyProfileTutorial.ts
+++ b/src/components/CMyProfileTutorial/CMyProfileTutorial.ts
@@ -20,9 +20,9 @@ import { useI18n } from '@/boot/i18n'
 import { useRoute, useRouter } from 'vue-router'
 import { useCircuitStore } from '@store/CircuitStore'

-const STEP_NAME_SURNAME = 2
-const STEP_FOTO = 5
-const STEP_CIRCUIT = 3
+const STEP_CIRCUIT = 2
+const STEP_NAME_SURNAME = 20
+const STEP_FOTO = 50

 export default defineComponent({
  name: 'CMyProfileTutorial',
@@ -55,6 +55,7 @@ export default defineComponent({

    const showAccountInfo = ref(false)
    const step = ref(1)
+    const nascondiavviso = ref(false)

    const username = ref('')
    const showsendCoinTo = ref(false)
@@ -62,7 +63,6 @@ export default defineComponent({

    const contact = ref(<IUserFields | null>null)

-
    const filtroutente = ref(<any[]>[])

    const stepTut = computed(() => userStore.my.profile.stepTutorial)
@@ -134,7 +134,7 @@ export default defineComponent({
        icon: 'house',
        required: true,
      },
-      {
+      /*{
        step: STEP_NAME_SURNAME,  // 2
        title: t('tutorial.step_nomecognome_title'),
        extratitle: function () { return ': ' + (contact.value ? tools.getNomeUtenteEUsernameByRecUser(contact.value) : '') },
@@ -143,7 +143,7 @@ export default defineComponent({
        checkOkReal: function () { return ((contact.value ? !!contact.value.name : false)) },
        icon: 'user',
        required: false,
-      },
+      },*/
      {
        step: STEP_CIRCUIT,
        title: t('tutorial.step_circuito_title'),
@@ -167,8 +167,8 @@ export default defineComponent({
        icon: 'img: images/1ris_rosso_100.png',
        required: false,
      },
-      {
-        step: 4,
+      /*{
+        step: 3,
        title: t('tutorial.step_beniservizi_title'),
        extratitle: function () { return ': (' + userStore.my.profile.calc.numGoodsAndServices + ')' },
        label: t('tutorial.step_beniservizi'),
@@ -178,21 +178,21 @@ export default defineComponent({
        checkOkReal: function () { return this.checkOk() },
        icon: 'fas fa-tshirt',
        required: false,
-      },
-      {
+      },*/
+      /*{
        step: STEP_FOTO,
-        title: t('tutorial.step_foto_title'),
+        title: t('tutorial.step_profilo_title'),
        extratitle: function () { return ': (' + (userStore.my.profile.img ? t('dialog.yes') : t('dialog.no')) + ')' },
-        label: t('tutorial.step_foto'),
+        label: t('tutorial.step_profilo'),
        checkOk: function () {
          return !!userStore.my.profile.img
        },
        checkOkReal: function () { return this.checkOk() },
        icon: 'fas fa-tshirt',
        required: false,
-      },
+      },*/
      {
-        step: 6,
+        step: 3,
        title: t('tutorial.step_fine_title'),
        extratitle: function () { return '' },
        label: t('tutorial.step_fine'),
@@ -382,7 +382,7 @@ export default defineComponent({
    }

    function getColorDone(step: number) {
-      return arrStep[step - 1].checkOkReal() ? 'positive' : 'negative'
+      return arrStep[step].checkOkReal() ? 'positive' : 'negative'
    }

    onMounted(mounted)
@@ -419,6 +419,7 @@ export default defineComponent({
      isSalta,
      askToConfirmSkip,
      getColorDone,
+      nascondiavviso,
    }
  },
 })
--- a/src/components/CMyProfileTutorial/CMyProfileTutorial.vue
+++ b/src/components/CMyProfileTutorial/CMyProfileTutorial.vue
@@ -1,14 +1,20 @@
 <template>
  <div v-if="contact">
    <div class="row items-center">
-      <div :class="step >= numstep ? 'col-10' : 'col-12'">
+      <div v-if="progressStep !== 1"
+       :class="step >= numstep ? 'col-10' : 'col-12'">
        <CTitleBanner
          class="q-pa-none"
          :title="
-            (!progressStep
-              ? $t('tutorial.title', {step, numstep}) + ` (` + progressLabel + `)`
-              : $t('tutorial.title_completed', {step, numstep}) + ` (` + progressLabel + `)`)
-
+            !progressStep
+              ? $t('tutorial.title', { step, numstep }) +
+                ` (` +
+                progressLabel +
+                `)`
+              : $t('tutorial.title_completed', { step, numstep }) +
+                ` (` +
+                progressLabel +
+                `)`
          "
          :bgcolor="getColorTutorial()"
          clcolor="text-white"
@@ -17,7 +23,7 @@
        >
          <q-slide-transition>
            <div v-show="step < numstep">
-              <div class="q-my-sm">
+              <!--<div class="q-my-sm">
                <q-linear-progress
                  stripe
                  size="25px"
@@ -35,11 +41,12 @@
                  </div>
                </q-linear-progress>
              </div>
-              <CMyUserOnlyView
+              -->
+              <!--<CMyUserOnlyView
                :mycontact="contact"
                :visu="costanti.FIND_PEOPLE"
              >
-              </CMyUserOnlyView>
+              </CMyUserOnlyView>-->

              <div class="">
                <q-stepper
@@ -57,7 +64,7 @@
                    :title="recstep.title + recstep.extratitle()"
                    :icon="recstep.icon"
                    :done="recstep.checkOk()"
-                    :done-color="getColorDone(recstep.step)"
+                    :done-color="getColorDone(index)"
                  >
                    <div v-html="recstep.label"></div>
                    <br />
@@ -76,7 +83,7 @@
                      >
                      </CMySelectCity>
                    </q-banner>
-                    <div v-else-if="step === 2">
+                    <div v-else-if="step === 101">
                      <q-banner>
                        <div class="myrow">
                          <CMyFieldDb
@@ -100,7 +107,7 @@
                        </div>
                      </q-banner>
                    </div>
-                    <div v-else-if="step === 3" class="">
+                    <div v-else-if="step === 2" class="">
                      <CMyCircuit
                        :mycircuit="mycircuit"
                        :visu="costanti.ENTER_TO_THE_CIRCUIT"
@@ -108,7 +115,8 @@
                      >
                      </CMyCircuit>
                    </div>
-                    <div v-else-if="step === 4" class="">
+                    <div v-else-if="step === 300" class="">
+                      <!--
                      <div
                        v-for="(card, ind) of mycards"
                        :key="ind"
@@ -117,6 +125,7 @@
                        <q-card class="q-my-md">
                          <div>
                            <CSkill
+                              v-if="false"
                              :table="card.table"
                              :filtercustom="filtroutente"
                              :butt_modif_new="true"
@@ -127,20 +136,21 @@
                          </div>
                        </q-card>
                      </div>
+                      -->
                    </div>
-                    <div v-else-if="step === 5" class="">
+
+                    <div v-else-if="step === 105" class="">
                      <div class="myrow">
-                        <CMyFieldDb
+                        <!--<CMyFieldDb
                          :title="$t('reg.photo')"
                          table="users"
                          mykey="profile"
                          mysubkey="img"
                          :type="costanti.FieldType.image"
                        >
-                        </CMyFieldDb>
+                        </CMyFieldDb>-->
                      </div>

-                      {{ $t('tutorial.step_altri_in_profilo') }}
                      <q-btn
                        glossy
                        label="Modifica Profilo"
@@ -150,7 +160,6 @@
                      />
                    </div>

-                    <div v-else-if="step === 6" class=""></div>
                    <div
                      v-if="recstep.checkOkReal() && recstep.label_ok"
                      class="clBorderService"
@@ -168,16 +177,20 @@
                      <q-btn
                        :flat="isSalta()"
                        :disabled="isNextDisable()"
-                        @click="(step === STEP_CIRCUIT && isSalta()) ? askToConfirmSkip() :
-                          (step === numstep
+                        @click="
+                          step === STEP_CIRCUIT && isSalta()
+                            ? askToConfirmSkip()
+                            : step === numstep
                            ? clickFinish()
-                            : $refs.stepper.next())
+                            : $refs.stepper.next()
                        "
                        :color="isSalta() ? 'negative' : 'primary'"
                        :label="
                          step === numstep
                            ? $t('dialog.finish')
-                            : (isSalta() ? $t('dialog.salta'): $t('dialog.avanti'))
+                            : isSalta()
+                            ? $t('dialog.salta')
+                            : $t('dialog.avanti')
                        "
                      />
                    </q-stepper-navigation>
@@ -189,7 +202,7 @@
        </CTitleBanner>
      </div>
      <q-btn
-        v-if="step >= numstep"
+        v-if="(step >= numstep) && progressStep !== 1"
        :class="`col-2 ` + getColorTutorial()"
        icon="fas fa-arrow-right"
        color="text-white"
@@ -199,6 +212,17 @@
        @click="step = 1"
      >
      </q-btn>
+
+      <q-banner
+      inline-actions
+        class="bg-red text-white"
+        v-if="userStore.my.profile.calc.numGoodsAndServices <= 0 && !nascondiavviso"
+      >
+        <span v-html="$t('tutorial.step_beniservizi')"></span>
+        <template v-slot:action>
+          <q-btn flat color="white" label="Chiudi" @click="nascondiavviso = true" />
+        </template>
+      </q-banner>
    </div>
  </div>
  <q-dialog v-model="showAccountInfo" full-height full-width>
--- a/src/components/CMyRecCard/CMyRecCard.ts
+++ b/src/components/CMyRecCard/CMyRecCard.ts
@@ -1,4 +1,4 @@
-import { defineComponent, onMounted, PropType, ref, watch } from 'vue'
+import { defineComponent, onMounted, PropType, ref, watch, computed } from 'vue'
 import { useUserStore } from '@store/UserStore'
 import { IImgGallery, IUserFields, IUserProfile } from 'model'
 import { costanti } from '@costanti'
@@ -49,6 +49,9 @@ export default defineComponent({
    const myrec = ref(<any>null)

    const visupage = ref(false)
+    const disabilita = computed(() => {
+      return props.table === shared_consts.TABLES_MYBACHECAS
+        })

    watch(() => props.prop_myrec, (newval, oldval) => {

@@ -125,6 +128,7 @@ export default defineComponent({
      getNameToShow,
      isPartecipero,
      calendarStore,
+      disabilita,
    }
  },
 })
--- a/src/components/CSignUp/CSignUp.ts
+++ b/src/components/CSignUp/CSignUp.ts
@@ -334,6 +334,7 @@ export default defineComponent({
      }

      console.log('signup.aportador_solidario', signup.aportador_solidario)
+      console.log('getasktoverify', tools.getAskToVerifyReg())

      if (tools.getAskToVerifyReg()) {

--- a/src/model/UserStore.ts
+++ b/src/model/UserStore.ts
@@ -212,6 +212,7 @@ export interface IUserFields {

  made_gift?: boolean
  tokens?: IToken[]
+  date_reg?: Date
  lasttimeonline?: Date
  profile: IUserProfile
  qualified?: boolean
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -1516,9 +1516,11 @@ const msg_it = {
      step_circuito: 'Entra nel Circuito del tuo territorio. Potrai così utilizzare il tuo conto personale in RIS, per scambiare Beni, Servizi, ecc.',
      step_circuito_ok: 'Ottimo! Sei entrato nel Circuito del tuo territorio. Puoi così utilizzare il tuo conto personale in RIS, per scambiare Beni, Servizi, ecc.',
      step_beniservizi_title: 'I Tuoi Annunci',
-      step_beniservizi: 'Per poter usufruire dei Beni, Servizi ed Ospitalità, è necessario che ogni partecipante si rende disponibile per offrire almeno una di queste cose, aggiungendole alla App.',
+      step_beniservizi: 'Ricordati di aggiungere cosa tu Offri: Tra <strong>Beni, Servizi e/o Ospitalità</strong>',
      step_foto_title: 'Foto Profilo',
      step_foto: 'Se vuoi puoi inserire una foto o un\'immagine che ti rappresenta.',
+      step_profilo_title: 'Profilo',
+      step_profilo: 'Aggiorna il tuo Profilo (foto)',
      step_altri_in_profilo: 'Per vedere e modificare tutte le altre informazioni di Profilo:',
      step_fine_title: 'Fine',
      step_fine: 'Hai completato l\'aggiornamento del tuo Profilo. Ricorda che potrai modificarlo, cliccando sulla prima icona in alto a destra 🙎🏻‍♂️ .',
--- a/src/store/Modules/costanti.ts
+++ b/src/store/Modules/costanti.ts
@@ -224,8 +224,8 @@ export const costanti = {
      small: true,
      table: '',
    },
-    {
-      visible: true,
+    /*{
+      visible: false,
      title: 'Sostieni il Progetto️',
      to: '/fundraising',
      icon: 'fas fa-hand-holding-heart',
@@ -237,7 +237,7 @@ export const costanti = {
      table: '',
    },
    {
-      visible: true,
+      visible: false,
      title: 'Assistenza',
      to: '/istruzioni',
      icon: 'fas fa-question',
@@ -247,7 +247,7 @@ export const costanti = {
      small: true,
      link: true,
      table: '',
-    },
+    },*/
    {
      visible: false,
      title: 'Social',
--- a/src/store/UserStore.ts
+++ b/src/store/UserStore.ts
@@ -250,7 +250,6 @@ export const useUserStore = defineStore('UserStore', {

  actions: {

-
    getMypaginationMembers(): any {
      return { sortBy: 'namecomplete', descending: false, page: 1, rowsNumber: 0, rowsPerPage: 15 }
    },
@@ -1898,5 +1897,17 @@ export const useUserStore = defineStore('UserStore', {

    },

+    isDateRegOld() {
+      try {
+        const dateold = tools.addDays(tools.getDateNow(), -(30 * 6))
+        if (this.my)
+          return this.my.date_reg! && new Date(this.my.date_reg).getTime() < dateold.getTime()
+        else 
+          return true
+      } catch (e) {
+        return false
+      }
+    },
+
  },
 })