- Tag HTML sugli annunci non vengono visualizzati correttamente... <div>...</div>

2024-09-18 13:11:56 +02:00
parent d4e0f2cf1a
commit 1142526ed8
60 changed files with 1273 additions and 90 deletions
--- a/src/components/CDashboard/CDashboard.ts
+++ b/src/components/CDashboard/CDashboard.ts
@@ -28,12 +28,12 @@ export default defineComponent({

    const visustat = computed(() => {
      // @ts-ignore
-      return costanti.MAINCARDS.filter((rec: IMainCard) => rec.visuonstat)
+      return costanti.MAINCARDS.filter((rec: IMainCard) => rec.visuonstat && !rec.forgroup)
    })

    const visulinks = computed(() => {
      // @ts-ignore
-      return costanti.MAINCARDS.filter((rec: IMainCard) => rec.link)
+      return costanti.MAINCARDS.filter((rec: IMainCard) => rec.link && !rec.forgroup)
    })

    return {
--- a/src/components/CGridTableRec/CGridTableRec.ts
+++ b/src/components/CGridTableRec/CGridTableRec.ts
@@ -1630,7 +1630,7 @@ export default defineComponent({
    }

    function mounted() {
-      console.log('mounted...')
+      // console.log('mounted...')
      try {
        searchList.value = props.prop_searchList

--- a/src/components/CMyCardService/CMyCardService.ts
+++ b/src/components/CMyCardService/CMyCardService.ts
@@ -156,7 +156,7 @@ export default defineComponent({
    const largeHeight = ref('100vh')

    const cardStyle = computed(() => ({
-      height: isSmall.value ? smallHeight.value : largeHeight.value,
+      // height: isSmall.value ? smallHeight.value : largeHeight.value,
      transition: 'height 0.3s ease-in-out'
    }))

@@ -165,13 +165,13 @@ export default defineComponent({
      let queryreact = {}

      if (usersList.value.tipofavbook === costanti.TIPOFAVBOOK.SEEN) {
-        queryreact = {seen: true}
+        queryreact = { seen: true }
      } else if (usersList.value.tipofavbook === costanti.TIPOFAVBOOK.FAVORITE) {
-        queryreact = {fav: true}
+        queryreact = { fav: true }
      } else if (usersList.value.tipofavbook === costanti.TIPOFAVBOOK.BOOKMARK) {
-        queryreact = {book: true}
+        queryreact = { book: true }
      } else if (usersList.value.tipofavbook === costanti.TIPOFAVBOOK.ATTEND) {
-        queryreact = {attend: true}
+        queryreact = { attend: true }
      }

      return [{
@@ -195,7 +195,7 @@ export default defineComponent({
          myrec.value = ris
          notifStore.setAsRead(idnotif.value)
        }).catch((err) => {
-          
+
        })

      } else {
@@ -221,7 +221,7 @@ export default defineComponent({
    async function mounted() {
      load()
      await nextTick()
-        
+
    }

    function updateCard() {
@@ -644,7 +644,7 @@ export default defineComponent({
    function toggleShowScheda() {
      // updateCard()
      isSmall.value = !isSmall.value
-    
+
    }

    function showInMap(rec: any) {
--- a/src/components/CMyCardService/CMyCardService.vue
+++ b/src/components/CMyCardService/CMyCardService.vue
@@ -655,8 +655,9 @@
                <q-item
                  clickable
                  v-if="
-                    myrec.coordinate_gps.address ||
-                    myrec.coordinate_gps.coordinates
+                    myrec.coordinate_gps &&
+                    (myrec.coordinate_gps.address ||
+                      myrec.coordinate_gps.coordinates)
                  "
                >
                  <q-item-section avatar>
--- a/src/components/CMyPopupEdit/CMyPopupEdit.ts
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.ts
@@ -273,7 +273,7 @@ export default defineComponent({
        })
     */
    function crea() {
-      console.log('crea', isFieldDb(), 'props.mycol', props.mycol)
+      // console.log('crea', isFieldDb(), 'props.mycol', props.mycol)

      if (props.mycol && props.mycol.name && props.mycol.name !== 'test') {
        col.value = { ...props.mycol }
@@ -318,7 +318,7 @@ export default defineComponent({
        }
      }

-      console.log('popupedit myvalue.value: ', myvalue.value)
+      // console.log('popupedit myvalue.value: ', myvalue.value)

      if (props.tablesel) {
        // let obj = tools.getParamsByTable(props.table)
@@ -469,7 +469,7 @@ export default defineComponent({

      try {

-        console.log('mounted', 'isFieldDb()', myrow.value)
+        // console.log('mounted', 'isFieldDb()', myrow.value)
        if (isFieldDb() && !props.isrec) {
          // console.log(' .  none...')
        } else {
@@ -488,7 +488,7 @@ export default defineComponent({
              myvalue.value = myrow.value
            }
          }
-          console.log('props.field', props.field, 'props.subfield', props.subfield, 'myvalue: ', myvalue)
+          // console.log('props.field', props.field, 'props.subfield', props.subfield, 'myvalue: ', myvalue)
        }
      } catch (e) {

--- a/src/components/CMyProfileTutorial/CMyProfileTutorial.ts
+++ b/src/components/CMyProfileTutorial/CMyProfileTutorial.ts
@@ -75,6 +75,7 @@ export default defineComponent({
    const contact = ref(<IUserFields | null>null)

    const filtroutente = ref(<any[]>[])
+    const showBanner_utenti_verif = ref(true)

    const usersList = ref({ show: false, title: '', list: [] })

@@ -199,7 +200,7 @@ export default defineComponent({
    ])

    const numindstep = computed(() => arrStep.value.length)
-    
+

    watch(() => indstep.value, (newval: number, oldval: number) => {
      if (indstep.value >= 0)
@@ -582,6 +583,7 @@ export default defineComponent({
      numStepCompleted,
      globalStore,
      prStep,
+      showBanner_utenti_verif,
    }
  },
 })
--- a/src/components/CMyProfileTutorial/CMyProfileTutorial.vue
+++ b/src/components/CMyProfileTutorial/CMyProfileTutorial.vue
@@ -87,9 +87,13 @@
                        :db_rec="contact"
                      >
                      </CMySelectCity>
-                      
+
                      <CMySelectCity
-                        v-if="globalStore.isPresenteCardsByProv(contact.profile.resid_province)"
+                        v-if="
+                          globalStore.isPresenteCardsByProv(
+                            contact.profile.resid_province
+                          )
+                        "
                        :label="$t('reg.resid_card')"
                        table="users"
                        jointable="cards"
@@ -263,10 +267,10 @@

      <q-banner
        inline-actions
-        class="bg-blue text-white"
-        v-if="userstoverify.length > 0"
+        class="bg-blue text-white row"
+        v-if="userstoverify.length > 0 && showBanner_utenti_verif"
      >
-        <span v-html="$t('tutorial.utenti_da_verificare')"></span>
+        <div v-html="$t('tutorial.utenti_da_verificare')"></div>
        <template v-slot:action>
          <q-btn
            :label="
@@ -279,8 +283,14 @@
              usersList.show = true;
              usersList.title = $t('tutorial.utenti_da_verif_btn');
            "
-          >
-          </q-btn>
+          />
+          <q-btn
+            icon="fas fa-times"
+            class="q-my-sm"
+            flat
+            @click="showBanner_utenti_verif = false"
+            aria-label="Chiudi"
+          />
        </template>
      </q-banner>

@@ -288,8 +298,9 @@
        inline-actions
        class="bg-red text-white"
        v-if="
-          userStore.my.profile.calc.numGoodsAndServices <= 0 && !nascondiavviso
-          && tools.visualizzaHomeApp()
+          userStore.my.profile.calc.numGoodsAndServices <= 0 &&
+          !nascondiavviso &&
+          tools.visualizzaHomeApp()
        "
      >
        <span v-html="$t('tutorial.step_beniservizi')"></span>
--- a/src/components/CMyToggleList/CMyToggleList.ts
+++ b/src/components/CMyToggleList/CMyToggleList.ts
@@ -56,7 +56,7 @@ export default defineComponent({
    }

    function mounted() {
-      console.log('mounted')
+      // console.log('mounted')
      myarrvalues.value = []

      // console.log('value', value)
--- a/src/components/CPhotosGallery/CPhotosGallery.ts
+++ b/src/components/CPhotosGallery/CPhotosGallery.ts
@@ -102,7 +102,6 @@ export default defineComponent({
    }

    function beforeDestroy() {
-      console.log('beforeDestroy')
      clearInterval(polling.value)
    }

--- a/src/components/CPresentazione/CPresentazione.ts
+++ b/src/components/CPresentazione/CPresentazione.ts
@@ -13,7 +13,7 @@ import { static_data } from '@src/db/static_data'

 export default defineComponent({
  name: 'CPresentazione',
-  components: {Logo, LandingFooter, CFundRaising, CShowContentPage},
+  components: { Logo, LandingFooter, CFundRaising, CShowContentPage },
  props: {},
  setup() {
    const { t } = useI18n();
@@ -49,7 +49,6 @@ export default defineComponent({
    }

    onBeforeUnmount(() => {
-      console.log('beforeDestroy')
      clearInterval(polling.value)
    })

--- a/src/db/lang/ws_it.js
+++ b/src/db/lang/ws_it.js
@@ -1,9 +1,9 @@
 const msg_website_it = {
  ws: {
-    sitename: 'AbitareGliIblei',
-    siteshortname: 'AbitareGliIblei',
-    description: 'Abitare Gli Iblei',
-    keywords: '',
+    sitename: 'Riso',
+    siteshortname: 'RISO',
+    description: 'Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.',
+    keywords: 'riso, piattaforma di scambio, rete italiana scambio orizzontale, riso app, riso piattaforma, scambio e baratto, momenta RIS',
  },
  hours: {
    descr: 'Descrizione',
@@ -84,7 +84,6 @@ const msg_website_it = {
    eventodef: 'Evento:',
    prova: 'prova',
    dbop: 'Operazioni',
-    server: 'Server',
    projall: 'Comunitari',
    groups: 'Lista Gruppi',
    projectsShared: 'Condivisi da me',
--- a/src/db/static_data.ts
+++ b/src/db/static_data.ts
@@ -68,7 +68,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      infooter: false,
    },
    {
-      active: site.confpages && site.confpages.enableGoods,
+      active: true,
      order: 12,
      path: '/goods',
      materialIcon: 'fas fa-tshirt',
@@ -79,7 +79,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      infooter: true,
    },
    {
-      active: site.confpages && site.confpages.enableServices,
+      active: true,
      order: 15,
      path: '/services',
      materialIcon: 'fas fa-house-user',
@@ -90,7 +90,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      infooter: true,
    },
    {
-      active: site.confpages && site.confpages.enableActivities,
+      active: true,
      order: 15,
      path: '/activities',
      materialIcon: 'fas fa-house-user',
@@ -112,7 +112,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      infooter: false,
    },
    {
-      active: site.confpages && site.confpages.enableHosps,
+      active: true,
      order: 15,
      path: '/hosps',
      materialIcon: 'fas fa-bed',
@@ -134,7 +134,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      infooter: true,
    },
    {
-      active: site.confpages && site.confpages.enableEvents,
+      active: true,
      order: 20,
      path: '/events',
      materialIcon: 'fas fa-bullhorn',
@@ -156,7 +156,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      infooter: false,
    },
    {
-      active: site.confpages && site.confpages.showProfile,
+      active: true,
      order: 120,
      path: '/myprofile',
      materialIcon: 'fas fa-user',
@@ -178,7 +178,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      infooter: false,
    },
    {
-      active: site.confpages && site.confpages.showiscrittiMenu,
+      active: true,
      order: 130,
      path: '/friends',
      materialIcon: 'fas fa-user-friends',
@@ -209,7 +209,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      meta: { requiresAuth: true, newpage: true },
      inmenu: false,
      infooter: false,
-    },
+    }, 
    {
      active: true,
      order: 137,
@@ -294,18 +294,6 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      inmenu: false,
      infooter: false
    },
-
-    {
-      active: true,
-      order: 1000,
-      path: '/404error',
-      materialIcon: 'fas fa-calendar-plus',
-      name: 'otherpages.error404',
-      component: () => import('@/root/My404page/My404page.vue'),
-      inmenu: false,
-      infooter: false
-    },
-
  ]

  return baseroutes
--- a/src/layouts/toolbar/notifPopover/notifPopover.ts
+++ b/src/layouts/toolbar/notifPopover/notifPopover.ts
@@ -56,7 +56,7 @@ export default defineComponent({
    const num_notifs_unread = computed(() => notifStore.getnumNotifUnread())
    // const usernotifs = computed(() => userStore.my.profile.notifs)

-    const polling = ref(<any> null)
+    const polling = ref(<any>null)
    const eseguipolling = ref(true)

    const notifsel = ref(<INotif>{
@@ -65,11 +65,11 @@ export default defineComponent({
    })

    const open = computed({
-      get () {
+      get() {
        return props.modelValue
      },

-      set (value) {
+      set(value) {
        return emit('update:modelValue', value)
      }
    })
@@ -106,7 +106,6 @@ export default defineComponent({
    }

    function beforeDestroy() {
-      console.log('beforeDestroy')
      if (polling.value)
        clearInterval(polling.value)
    }
--- a/src/rootgen/admin/newsletter/newsletter.ts
+++ b/src/rootgen/admin/newsletter/newsletter.ts
@@ -1,4 +1,4 @@
-import { defineComponent, ref, onMounted,  watch, computed } from 'vue'
+import { defineComponent, ref, onMounted, watch, computed } from 'vue'


 import { tools } from '@src/store/Modules/tools'
@@ -49,14 +49,14 @@ export default defineComponent({
    const myrisimport = ref('')
    const errimport = ref(false)
    const okimport = ref(false)
-    const newsstate = ref (<INewsState>{})
+    const newsstate = ref(<INewsState>{})
    const percsubscribed = ref(0.0)
-    const polling = ref(<any> null)
+    const polling = ref(<any>null)
    const tab = ref('')
    const emailtextheader = ref('')
    const eseguipolling = ref(false)

-    const idparam = computed( () => $route.params.idparam ? $route.params.idparam.toString() : '')
+    const idparam = computed(() => $route.params.idparam ? $route.params.idparam.toString() : '')

    async function mounted() {
      await load()
@@ -101,7 +101,6 @@ export default defineComponent({
    }

    function beforeDestroy() {
-      console.log('beforeDestroy')
      if (polling.value)
        clearInterval(polling.value)
    }
--- a/src/store/Modules/costanti.ts
+++ b/src/store/Modules/costanti.ts
@@ -275,6 +275,7 @@ export const costanti = {
      visuonstat: true,
      small: false,
      showfavorite: true,
+      forgroup: true,
    },
  ],