InfiniteScroll: Le liste (Beni / Servizi / Eventi) devono essere caricate in automatico, scorrendo la lista...

fix category

grp.js

@@ -145,7 +145,7 @@ db.getCollection('mygoods').aggregate(
       "from": "sectorgoods",
       "localField": "recGood.idSectorGood",
       "foreignField": "_id",
-      "as": "sectorgood"
+      "as": "sectorGood"
     }
   },
   {

quasar.conf.js

@@ -203,6 +203,7 @@ module.exports = configure((ctx) => ({
       'QBanner',
       'QInnerLoading',
       'QSpinnerGears',
+      'QSpinnerDots',
       'QDate',
       'QTime',
       'QSlideTransition',

query_gruppi.js

@@ -134,7 +134,7 @@ db.getCollection('myskills').aggregate(
       "from": "sectorgoods",
       "localField": "recGood.idSectorGood",
       "foreignField": "_id",
-      "as": "sectorgood"
+      "as": "sectorGood"
     }
   },
   {

src/components/CFinder/CFinder.ts

@@ -316,7 +316,7 @@ export default defineComponent({
           tablesel: 'cities',
         },
         {
-          label: 'Visiblità',
+          label: 'Visibilità',
           table: 'pub_to_share',
           key: 'pub_to_share',
           type: costanti.FieldType.select,
@@ -353,7 +353,7 @@ export default defineComponent({
           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, true),
+          value: tools.getCookie(tools.COOK_SEARCH + toolsext.TABSKILLS + '_' + tools.getCookie(tools.COOK_SEARCH + toolsext.TABSECTORS, costanti.FILTER_TUTTI), costanti.FILTER_TUTTI, true),
           arrvalue: [],
           type: costanti.FieldType.select,
           addall: true,
@@ -517,7 +517,7 @@ export default defineComponent({
           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, true),
+          value: tools.getCookie(tools.COOK_SEARCH + toolsext.TABSKILLS + '_' + tools.getCookie(tools.COOK_SEARCH + toolsext.TABSECTORS, costanti.FILTER_TUTTI), costanti.FILTER_TUTTI, true),
           arrvalue: [],
           type: costanti.FieldType.select,
           addall: true,
@@ -706,11 +706,11 @@ export default defineComponent({
           filter: null,
           useinput: false,
         },
-        /*{
+        {
           label: 'Settore',
           table: 'sectorgoods',
           key: 'idSectorGood',
-          value: tools.getCookie(tools.COOK_SEARCH + 'sectorgoods', 0),
+          value: tools.getCookie(tools.COOK_SEARCH + toolsext.TABSECTORGOODS, 0, true),
           arrvalue: [],
           type: costanti.FieldType.select,
           filter: null,
@@ -722,7 +722,7 @@ export default defineComponent({
           label: 'Categoria',
           table: 'goods',
           key: 'idGood',
-          value: tools.getCookie(tools.COOK_SEARCH + 'goods' + '_' + tools.getCookie(tools.COOK_SEARCH + 'sectorgoods', costanti.FILTER_TUTTI), costanti.FILTER_TUTTI),
+          value: tools.getCookie(tools.COOK_SEARCH + toolsext.TABGOODS + '_' + tools.getCookie(tools.COOK_SEARCH + toolsext.TABSECTORGOODS, costanti.FILTER_TUTTI), costanti.FILTER_TUTTI, true),
           arrvalue: [],
           type: costanti.FieldType.select,
           addall: true,
@@ -730,6 +730,7 @@ export default defineComponent({
           showcount: true,
           useinput: false,
         },
+        /*
         {
           label: 'Consegna',
           table: 'shippings',
@@ -910,6 +911,8 @@ export default defineComponent({
               visibility: 1,
               admins: 1,
               idCatGrp: 1,
+              date_created: 1,
+              date_updated: 1,
               photos: 1,
               idCity: 1,
               note: 1,
@@ -933,6 +936,8 @@ export default defineComponent({
               visibility: 1,
               admins: 1,
               idCatGrp: 1,
+              date_created: 1,
+              date_updated: 1,
               photos: 1,
               idCity: 1,
               note: 1,
@@ -955,6 +960,8 @@ export default defineComponent({
               descr: 1,
               img: 1,
               idCatGrp: 1,
+              date_created: 1,
+              date_updated: 1,
               visibility: 1,
               admins: 1,
               photos: 1,
@@ -1027,9 +1034,10 @@ export default defineComponent({
           },
           lookup3: {
             lk_tab: 'sectorgoods',
-            lk_LF: 'recGood.idSectorGood',
+            // lk_LF: 'recGood.idSectorGood',
+            lk_LF: 'idSectorGood',
             lk_FF: '_id',
-            lk_as: 'sectorgood',
+            lk_as: 'sectorGood',
             af_objId_tab: '',
           },
           lookup5: {
@@ -1094,7 +1102,8 @@ export default defineComponent({
           },
           lookup3: {
             lk_tab: toolsext.TABSECTORS,
-            lk_LF: 'recSkill.idSector',
+            // lk_LF: 'recSkill.idSector',
+            lk_LF: 'idSector',
             lk_FF: '_id',
             lk_as: 'sector',
             af_objId_tab: '',
@@ -1210,7 +1219,8 @@ export default defineComponent({
           },
           lookup3: {
             lk_tab: toolsext.TABSECTORS,
-            lk_LF: 'recSkill.idSector',
+            // lk_LF: 'recSkill.idSector',
+            lk_LF: 'idSector',
             lk_FF: '_id',
             lk_as: 'sector',
             af_objId_tab: '',

src/components/CFinder/CFinder.vue

@@ -51,6 +51,11 @@
 
       </CGridTableRec>
     </div>
+
+    <q-page-scroller position="bottom-right" :scroll-offset="850" :offset="[18, 18]" style="opacity: 0.3">
+      <q-btn fab icon="keyboard_arrow_up" color="accent"/>
+    </q-page-scroller>
+
   </div>
 
 </template>

src/components/CGridTableRec/CGridTableRec.scss

@@ -9,6 +9,7 @@
 
 .tdclass, .trclass{
   min-height: 20px !important;
+  margin-top: 5px;
 }
 
 .q-table td {

src/components/CGridTableRec/CGridTableRec.ts

@@ -251,8 +251,12 @@ export default defineComponent({
 
     const $router = useRouter()
 
+    const myinfscroll = ref(null)
+
     const serverData: any = ref([])
+    const numRecLoaded = ref(0)
     const spinner_visible = ref(false)
+    const changetable = ref(false)
     const searchList = ref(<ISearchList[]>[])
 
     let actual = ''
@@ -302,7 +306,10 @@ export default defineComponent({
 
     watch(() => searchList.value, (to: any, from: any) => {
       // console.log('watch searchlist', to)
+      if (searchList.value && !changetable.value) {
+        console.log('REFRR searchList.value', to)
         refresh()
+      }
     })
 
     watch(() => showfilteradv.value, (newval: any, from: any) => {
@@ -311,7 +318,10 @@ export default defineComponent({
 
     watch(() => props.filtercustom, (to: any, from: any) => {
       // console.log('filtercustom', to)
+      if (JSON.stringify(to) !== JSON.stringify(from)) {
+        console.log('REFRR props.filtercustom', to, from)
         refresh()
+      }
     })
 
     $router.beforeResolve((to: any) => {
@@ -325,6 +335,7 @@ export default defineComponent({
     })
 
     function setCategBySector(tablecat: string, tabsector: string, newval: any) {
+      console.log('setCategBySector', tablecat, tabsector, newval)
 
       const recSector = searchList.value.find((rec) => rec.table === tabsector)
       if (recSector)
@@ -341,10 +352,12 @@ export default defineComponent({
             if (arrvalues)
               trovato = arrvalues.find((rec: any) => rec[rec.key] === valsaved)
           }
+          console.log('   ...item', item)
           if (valsaved && trovato)
             item.value = valsaved
           else {
             if (arrvalues) {
+              console.log('   ...filter tutti')
               item.value = costanti.FILTER_TUTTI
             }
           }
@@ -400,7 +413,7 @@ export default defineComponent({
     }
 
     function searchval(newval: any, table: any) {
-      console.log('searchval', newval, table)
+      console.log('REFRR searchval', newval, table)
       tools.setCookie(tools.COOK_SEARCH + table, newval)
 
       if (table === toolsext.TABSKILLS) {
@@ -410,11 +423,18 @@ export default defineComponent({
         }
       } else if (table === toolsext.TABSECTORS) {
         setCategBySector(toolsext.TABSKILLS, table, newval)
+      } else if (table === toolsext.TABSECTORGOODS) {
+        setCategBySector(toolsext.TABGOODS, table, newval)
       } else if (table === toolsext.TABREGIONS) {
         setProvinceByRegion(toolsext.TABPROVINCE, table, newval)
-      } else if (table === 'goods') {
+      } else if (table === toolsext.TABGOODS) {
-        setCategBySector('sectorgoods', table, newval)
+        const recSector = searchList.value.find((rec) => rec.table === toolsext.TABSECTORGOODS)
+        if (recSector) {
+          tools.setCookie(tools.COOK_SEARCH + table + '_' + recSector.value, newval)
         }
+        // setCategBySector('sectorgoods', table, newval)
+      }
+
 
       refresh()
     }
@@ -440,7 +460,7 @@ export default defineComponent({
     // emulate ajax call
     // SELECT * FROM ... WHERE...LIMIT...
     async function fetchFromServer(startRow: any, endRow: any, param_myfilter: any, param_myfilterand: any, sortBy: any, descending: any) {
-
+      // console.log('fetchFromServer')
       let myobj: any = {}
       if (sortBy) {
         myobj = {}
@@ -623,7 +643,7 @@ export default defineComponent({
                 let obj2: any = {}
                 if (idSectorGood > 0) {
                   // idSectorGood
-                  obj2['sectorgood._id'] = idSectorGood
+                  obj2['sectorGood._id'] = idSectorGood
                   filtersearch2.push(obj2)
                 }
               } else if ((item.table === 'subskills') && item.value === costanti.FILTER_TUTTI) {
@@ -742,8 +762,11 @@ export default defineComponent({
 
       savefilter()
 
-      if (!mytable.value)
+      if (!mytable.value) {
+        startsearch.value = false
         return
+      }
+
 
       // console.log('myfilterandnow', myfilterandnow, 'myfilterandnow', myfilterandnow)
 
@@ -762,7 +785,7 @@ export default defineComponent({
       const startRow = (page - 1) * rowsPerPage
       const endRow = startRow + fetchCount
 
-      // console.log('startRow', startRow, 'endRow', endRow)
+      console.log('onRequest:  startRow', startRow, 'endRow', endRow)
 
       serverData.value = []
 
@@ -798,9 +821,86 @@ export default defineComponent({
         // ...and turn of loading indicator
         loading.value = false
         spinner_visible.value = false
+        changetable.value = false
+        startsearch.value = false
       })
     }
 
+    function onUpdateData(index: number, myprops: any, done: any) {
+      const { page, rowsPerPage, rowsNumber, sortBy, descending } = myprops.pagination
+      const myfilternow = myfilter.value
+      const myfilterandnow = myfilterand.value
+
+      savefilter()
+
+      if (!mytable.value) {
+        startsearch.value = false
+        if (myinfscroll.value) {
+          // @ts-ignore
+          myinfscroll.value.resume()
+        }
+        done()
+        return
+      }
+
+      // function all rows if "All" (0) is rowsel
+      const fetchCount = rowsPerPage === 0 ? rowsNumber : rowsPerPage
+
+      // calculate starting row of data
+      const startRow = numRecLoaded.value
+      const endRow = startRow + fetchCount
+      console.log('startRow', startRow, 'endRow', endRow, 'fetchCount', fetchCount)
+
+
+      if (startRow < pagination.value.rowsNumber) {
+
+        // fetch data from "server"
+        return fetchFromServer(startRow, endRow, myfilternow, myfilterandnow, sortBy, descending).then((ris: any) => {
+
+          pagination.value.rowsNumber = getRowsNumberCount(myfilter)
+          console.log('   ...rowsNumber', pagination.value.rowsNumber)
+
+          if (returnedData.value === []) {
+            // no more data
+          } else {
+            try {
+              numRecLoaded.value = numRecLoaded.value + (returnedData.value ? returnedData.value.length : 0)
+              console.log('   ...numRecLoaded.value', numRecLoaded.value)
+              serverData.value = [...serverData.value, ...returnedData.value]
+            } catch (e) {
+              serverData.value = []
+            }
+          }
+
+          // don't forfunction to update local pagination object
+          pagination.value.page = page
+          pagination.value.rowsPerPage = rowsPerPage
+          pagination.value.sortBy = sortBy
+          pagination.value.descending = descending
+
+          // console.log('pagination', pagination)
+
+          // ...and turn of loading indicator
+          changetable.value = false
+          startsearch.value = false
+
+          if (myinfscroll.value) {
+            // @ts-ignore
+            myinfscroll.value.resume()
+          }
+
+          console.log('   ...DONE ')
+          done()
+        })
+      } else {
+        startsearch.value = false
+        if (myinfscroll.value) {
+          // @ts-ignore
+          myinfscroll.value.resume()
+        }
+      }
+    }
+
 
     function refresh_arr() {
       const myarr = [...serverData.value]
@@ -809,19 +909,37 @@ export default defineComponent({
     }
 
     function refresh_table() {
+
       onRequest({
         pagination: pagination.value
       })
       rowclicksel.value = null
     }
 
+    function refresh_infscroll(done: any) {
+      rowclicksel.value = null
+
+      onUpdateData(0,
+        {
+        pagination: pagination.value
+      }, done)
+    }
+
+
 
     function refresh() {
+      console.log('refresh', 'startsearch', startsearch.value)
+
       // console.log('refresh')
-      if (!startsearch.value)
+      if (startsearch.value)
         return false
 
+      console.log('REFRESH!')
+
+      startsearch.value = true
+
       serverData.value = []
+      numRecLoaded.value = 0
 
       search.value = search.value.trim()
 
@@ -834,10 +952,21 @@ export default defineComponent({
 
       // console.log('myfilter', myfilter.value)
 
+      if (shared_consts.VERTIC_SHOW_GRID.includes(myvertical.value)) {
+        if (myinfscroll.value) {
+          // @ts-ignore
+          myinfscroll.value.stop()
+        }
+
+        refresh_infscroll(function () { return true })
+      } else {
         refresh_table()
       }
 
+    }
+
     watch(() => mycodeid.value, (newval, oldval) => {
+      console.log('REFRR - mycodeid.value', newval)
       refresh()
     })
 
@@ -846,6 +975,8 @@ export default defineComponent({
         myvertical.value === costanti.VISUTABLE_SCHEDA_GROUP ||
         myvertical.value === costanti.VISUTABLE_SCHEDA_USER ||
         (props.showType === costanti.SHOW_USERINFO))) {
+
+        console.log('REFRR - updateTables.value', newval)
         refresh()
 
         userStore.updateTables = false
@@ -865,6 +996,10 @@ export default defineComponent({
       return userStore.isFacilitatore
     }
 
+    function isAdmin() {
+      return userStore.isAdmin
+    }
+
     function disabilita() {
       if ((mytable.value === 'users') && (isFacilitatore() && !userStore.isAdmin && !userStore.isManager)) {
         return true
@@ -891,6 +1026,14 @@ export default defineComponent({
           item['idSkill'] = costanti.FILTER_NESSUNO
           newRecord.value['idSkill'] = item['idSkill']
         }
+      } else if (col.jointable === toolsext.TABSECTORGOODS) {
+        // Sbianca la select della Categoria Beni
+
+        if (item && item.hasOwnProperty('idGood')) {
+          item['idGood'] = costanti.FILTER_NESSUNO
+          newRecord.value['idGood'] = item['idGood']
+          console.log('newRecord', newRecord)
+        }
       }
       rowsel = item
       idsel = item._id
@@ -936,7 +1079,7 @@ export default defineComponent({
     }
 
     function annulla(val: any) {
-      console.log('annulla')
+      console.log('GridTable annulla')
       /*
       if (newRecord.value) {
         globalStore.DeleteRec({ table: mytable.value, id: newRecord.value._id })
@@ -1280,7 +1423,8 @@ export default defineComponent({
     }
 
     function changeTable(mysel: any) {
-      // console.log('changeTable', tablesel.value)
+      console.log('changeTable', tablesel.value)
+      changetable.value = true
       if (tablesel.value === undefined || tablesel.value === '')
         return
 
@@ -1379,12 +1523,12 @@ export default defineComponent({
         }
       }
 
-      startsearch.value = true
+      console.log('REFRR - changetable')
-
       refresh()
     }
 
     function doSearch() {
+      console.log('REFRR - doSearch')
       refresh()
     }
 
@@ -1721,6 +1865,17 @@ export default defineComponent({
       return actualDate.value
     }
 
+    function onLoadScroll (index: number, done: any) {
+      if (index > 0) {
+        console.log('onLoadScroll', index, 'RECLOAD', numRecLoaded.value, 'ROWS: ', pagination.value.rowsNumber)
+        if (numRecLoaded.value >= pagination.value.rowsNumber) {
+          done(true)
+        } else {
+          pagination.value.page = pagination.value.page + 1
+          refresh_infscroll(done)
+        }
+      }
+    }
     // onMounted(mounted)
 
     created()
@@ -1809,6 +1964,10 @@ export default defineComponent({
       getActualDate,
       actualDate,
       actual,
+      isAdmin,
+      onLoadScroll,
+      numRecLoaded,
+      myinfscroll,
     }
   }
 })

src/components/CGridTableRec/CGridTableRec.vue

@@ -33,7 +33,208 @@
     <q-inner-loading :showing="spinner_visible">
       <q-spinner-tail size="2em" color="primary"/>
     </q-inner-loading>
+
+    <div v-if="shared_consts.VERTIC_SHOW_GRID.includes(myvertical)">
+      <div v-if="searchList"
+           :class="$q.screen.lt.sm ? `` : `row`  + ` text-blue `">
+          <span v-for="(item, index) in searchList" :key="index">
+
+            <!--<div class="text-center q-my-xs" v-if="(item.type === costanti.FieldType.separator)">
+              <q-btn size="sm" dense :icon="!showfilteradv ? 'fas fa-arrow-down' : 'fas fa-arrow-up'" label="Filtri Avanzati" @click="showfilteradv = !showfilteradv"></q-btn>
+            </div>-->
+
+            <CMySelect
+              :col="fieldsTable.getColByColumns(mycolumns, item.key)"
+              v-if="(item.type === costanti.FieldType.select) || (item.type === costanti.FieldType.select_by_server)"
+              :label="labelcombo(item)"
+              v-model:value="item.value"
+              @update:value="searchval(item.value, item.table)"
+              :addall="item.addall"
+              :addnone="item.addnone"
+              :tablesel="item.type === costanti.FieldType.select_by_server ? item.tablesel : ''"
+              :pickup="item.type === costanti.FieldType.select_by_server"
+              label-color="primary"
+              class="combowidth"
+              color="primary"
+              :icon_alternative="item.icon"
+              :optval="fieldsTable.getKeyByTable(item.table)"
+              :optlab="fieldsTable.getLabelByTable(item.table)"
+              :options="valoriopt(item, false)"
+              :filter="item.filter"
+              :filter_extra="item.filter_extra"
+              :useinput="item.useinput && item.type !== costanti.FieldType.select_by_server">
+            </CMySelect>
+
+            <!--<div v-if="item.type === costanti.FieldType.multiselect_by_server">
+              item: {{ item}}
+            </div>-->
+
+            <CMySelect
+              v-if="item.type === costanti.FieldType.multiselect_by_server"
+              :col="fieldsTable.getColByColumns(mycolumns, item.key)"
+              :multiselect_by_server="true"
+              :label="labelcombo(item)"
+              v-model:arrvalue="item.arrvalue"
+              @update:arrvalue="searchval(item.arrvalue, item.table)"
+              :addall="item.addall"
+              :addnone="item.addnone"
+              :tablesel="item.tablesel"
+              :pickup="true"
+              :param1="item.param1"
+              label-color="primary"
+              class="combowidth"
+              color="primary"
+              :icon_alternative="item.icon"
+              :optval="fieldsTable.getKeyByTable(item.table)"
+              :optlab="fieldsTable.getLabelByTable(item.table)"
+              :filter="item.filter"
+              :filter_extra="item.filter_extra"
+              :options="valoriopt(item, false)"
+              :useinput="true">
+            </CMySelect>
+
+            <q-select
+              v-if="(item.type === costanti.FieldType.multiselect)"
+              v-model="item.arrvalue"
+              label-color="primary"
+              :label="labelcombo(item)"
+              @update:model-value="searchval(item.arrvalue, item.table)"
+              rounded
+              dense
+              outlined
+              multiple
+              options-dense
+              emit-value
+              map-options
+              stack-label
+              :useinput="item.useinput"
+              :options="valoriopt(item, item.addall, item.addnone)"
+              :filter="item.filter"
+              class="combowidth"
+              :option-value="fieldsTable.getKeyByTable(item.table)"
+            >
+
+              <template v-if="item.icon" v-slot:prepend>
+                <q-icon :name="item.icon"/>
+              </template>
+              <template
+                v-if="item.arrvalue.length >= 1"
+                v-slot:selected-item="scope">
+                <div
+                  v-if="scope.opt[fieldsTable.getLabelByTable(item.table)] || (scope.opt && checkIfShowRec(scope.opt)) ">
+                  <q-chip
+                    removable
+                    dense
+                    @remove="scope.removeAtIndex(scope.index)"
+                    v-if="checkIfShowRec(scope.opt)"
+                    color="white"
+                    text-color="mycol"
+                    class="q-my-none q-ml-xs q-mr-none"
+                  >
+                    <q-avatar color="primary" text-color="white" :icon="item.icon" size="12px"/>
+                    {{ scope.opt[fieldsTable.getLabelByTable(item.table)] || (scope.opt) }}
+                  </q-chip>
+                </div>
+              </template>
+              <template v-slot:option="{ itemProps, opt, selected, toggleOption }">
+                <q-item v-bind="itemProps">
+
+                  <q-item-section>
+                    <q-item-label>{{ opt[fieldsTable.getLabelByTable(item.table)] }}</q-item-label>
+                  </q-item-section>
+                  <q-item-section side>
+                    <q-toggle :model-value="selected" @update:model-value="toggleOption(opt)"/>
+                  </q-item-section>
+                </q-item>
+              </template>
+
+            </q-select>
+          </span>
+      </div>
+
+      <div v-if="(prop_search || canEdit)"
+           class="row justify-center vertical-middle">
+
+        <div v-if="prop_search" class="q-mr-sm full-width">
+          <q-input
+            v-model="search" filled dense type="search" debounce="500" :hint="hint"
+            label="Cerca"
+
+            v-on:keyup.enter="doSearch"
+          >
+            <template v-slot:after>
+              <q-btn v-if="mytable" dense label="" color="primary" @click="refresh" icon="search"></q-btn>
+            </template>
+          </q-input>
+        </div>
+
+        <q-space></q-space>
+        <q-select
+          v-if="mytable && pagination.rowsNumber > 0 && (prop_search || canEdit) && showCol && myvertical === 0"
+          v-model="colVisib"
+          rounded
+          outlined
+          multiple
+          dense
+          options-dense
+          :display-value="$t('grid.columns')"
+          emit-value
+          map-options
+          :options="mycolumns"
+          option-value="name"
+          @update:model-value="changeCol">
+
+        </q-select>
+
+      </div>
+
+      <div v-if="pagination.rowsNumber === 1 && prop_search">{{ pagination.rowsNumber }} elemento trovato</div>
+      <div v-if="pagination.rowsNumber > 1 && prop_search">{{ pagination.rowsNumber }} elementi trovati</div>
+    </div>
+    numRecLoaded: {{numRecLoaded}}
+      <q-infinite-scroll
+        ref="myinfscroll"
+        v-if="shared_consts.VERTIC_SHOW_GRID.includes(myvertical)"
+        initial-index="0"
+        @load="onLoadScroll" :offset="350"
+        debounce="300"
+
+      >
+        INFINITE: <br />
+
+        <div v-for="(row, index) in serverData" :key="index" class="caption">
+          <div v-if="row && shared_consts.TABLES_WITH_DATE.includes(tablesel)">
+
+            <div v-if="row.dateTimeStart && (tools.getstrVeryShortDate(row.dateTimeStart) !== actual)" 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
+            v-if="tablesel === toolsext.TABMYGROUPS"
+            :table="tablesel"
+            :prop_myrec="row"
+            @cmdext="cmdExt"
+          >
+          </CMyRecGrpCard>
+          <CMyRecCard
+            v-else
+            :table="tablesel"
+            :prop_myrec="row"
+            @cmdext="cmdExt"
+          >
+          </CMyRecCard>
+        </div>
+        <template v-slot:loading>
+          <div class="row justify-center q-my-md">
+            <q-spinner-dots color="primary" size="40px"/>
+          </div>
+        </template>
+
+      </q-infinite-scroll>
     <q-table
+      v-else
       :grid="shared_consts.VERTIC_SHOW_GRID.includes(myvertical)"
       :grid-header="shared_consts.VERTIC_SHOW_GRID.includes(myvertical) && shared_consts.TABLES_WITH_SORTING.includes(mytable)"
       flat
@@ -42,10 +243,14 @@
       :rows="serverData"
       :columns="mycolumns"
       :filter="myfilter"
-      v-model:pagination="pagination"
+      v-model:pagination="pagination2"
+      virtual-scroll
+      :virtual-scroll-item-size="48"
+      :virtual-scroll-sticky-size-start="48"
+      @virtual-scroll="onScroll"
+      :rows-per-page-options="[0]"
       :row-key="colkey"
       :loading="loading"
-      @request="onRequest"
       @selection="selectionclick"
       binary-state-sort
       :visible-columns="colVisib"
@@ -98,7 +303,7 @@
       </template>
 
       <template v-slot:top-right v-if="tablesList || arrfilters">
-        <span style="display: none">{{actual = null}}</span>
+        <span style="display: none">{{ actual = null }}</span>
 
         <q-select
           v-if="tablesList"
@@ -291,17 +496,15 @@
         <div v-if="pagination.rowsNumber === 1 && prop_search">{{ pagination.rowsNumber }} elemento trovato</div>
         <div v-if="pagination.rowsNumber > 1 && prop_search">{{ pagination.rowsNumber }} elementi trovati</div>
 
-        <div v-if="choose_visutype" class="">
+        <div v-if="choose_visutype && $q.screen.gt.xs && isAdmin()" class="">
-          <q-radio v-model="myvertical" :val="2" label="Lista"
+          <q-radio v-model="myvertical" :val="2" label="Lista"/>
-                   @update:model-value="tools.setCookie('myv_' + prop_mytable, myvertical) "/>
+          <!--<q-radio v-if="mytable === toolsext.TAB" v-model="myvertical" :val="costanti.VISUTABLE_SCHEDA_GROUP"
-          <q-radio v-if="mytable === toolsext.TAB" v-model="myvertical" :val="costanti.VISUTABLE_SCHEDA_GROUP"
                    label="Scheda"
                    @update:model-value="tools.setCookie('myv_' + prop_mytable, myvertical) "/>
           <q-radio v-else-if="mytable !== toolsext.TABMYGROUPS && !finder" v-model="myvertical"
-                   :val="costanti.VISUTABLE_SCHEDA_USER" label="Scheda"
+                   :val="costanti.VISUTABLE_SCHEDA_USER" slabel="Scheda"
-                   @update:model-value="tools.setCookie('myv_' + prop_mytable, myvertical) "/>
+                   @update:model-value="tools.setCookie('myv_' + prop_mytable, myvertical) "/>-->
-          <q-radio v-if="$q.screen.gt.xs" v-model="myvertical" :val="0" label="Tabella"
+          <q-radio v-if="$q.screen.gt.xs" v-model="myvertical" :val="0" label="Tabella"/>
-                   @update:model-value="tools.setCookie('myv_' + prop_mytable, myvertical) "/>
         </div>
       </template>
 
@@ -357,8 +560,8 @@
           <div v-if="props.row && shared_consts.TABLES_WITH_DATE.includes(tablesel)">
 
             <div v-if="props.row.dateTimeStart && (tools.getstrVeryShortDate(props.row.dateTimeStart) !== actual)" class="actualdate">
-              <span style="display: none">{{actual = tools.getstrVeryShortDate(props.row.dateTimeStart)}}</span>
+              <span style="display: none">{{ actual = tools.getstrVeryShortDate(props.row.dateTimeStart) }}</span>
-              <q-chip class="text-center shadow-5 glossy bg-orange" icon="fas fa-calendar-day">{{tools.getstrDateLong(props.row.dateTimeStart) }}</q-chip>
+              <q-chip class="text-center shadow-5 glossy bg-orange" icon="fas fa-calendar-day">{{ tools.getstrDateLong(props.row.dateTimeStart) }}</q-chip>
             </div>
           </div>
 
@@ -611,7 +814,7 @@
                      label="Campi Avanzati" @click="showfilteradv = !showfilteradv"></q-btn>
             </div>-->
             <div
-              v-if="showColCheck(col, tools.TIPOVIS_EDIT_RECORD, false) && col.foredit">
+              v-if="showColCheck(col, tools.TIPOVIS_EDIT_RECORD, false) && col.foredit" class="tdclass">
               <div>
                 <CMyPopupEdit
                   :table="mytable"

src/components/CMyCardPopup/CMyCardPopup.vue

@@ -35,7 +35,6 @@
       </div>
 
       <!--:title="t(mycol.label_trans)"-->
-
       <div v-for="(mycol, index) of col" :key="index">
         <div
           v-if="(mycol.visible && (tools.checkIfShowField(mycol, tools.TIPOVIS_SHOW_RECORD, false, tools.getValue(myrec, mycol.field, mycol.subfield))))">

src/components/CMyEditor/CMyEditor.ts

@@ -57,6 +57,8 @@ export default defineComponent({
       verdana: 'Verdana'
     })
 
+    const showtools = ref(false)
+
     const toolbarcomp = ref([
       ['left', 'center', 'right', 'justify'],
       ['bold', 'italic', 'underline', 'strike'],
@@ -172,6 +174,8 @@ export default defineComponent({
         myvalue.value = ''
       else
         myvalue.value = props.value
+
+      showtools.value = tools.getCookie('showtools', '0') === '1'
     }
 
     function onPaste (evt: any) {
@@ -213,6 +217,7 @@ export default defineComponent({
       tools,
       onPaste,
       editorRef,
+      showtools,
     }
   }
 })

src/components/CMyEditor/CMyEditor.vue

@@ -16,7 +16,9 @@
           spellcheck="false"
           >
 
-          <q-btn rounded size="sm" color="primary">
+          <q-toggle v-model="showtools" :label="showtools ? $t('editor.hidetool') : $t('editor.showtool')" @click="tools.setCookie('showtools', showtools ? '1' : '0')"></q-toggle>
+          <br>
+          <q-btn v-if="showtools" rounded size="sm" color="primary">
             <q-icon name="colorize" class="cursor-pointer">
               <q-popup-proxy>
                 <q-color v-model="mycolor" @change="setcolor"></q-color>
@@ -30,7 +32,7 @@
             toolbar-text-color="white"
             toolbar-toggle-color="yellow-8"
             toolbar-bg="primary"
-            :toolbar="toolbarcomp"
+            :toolbar="showtools ? toolbarcomp : []"
             :fonts="myfonts"
             @update:model-value="changeval"
             @paste="onPaste"

src/components/CMyPopupEdit/CMyPopupEdit.ts

@@ -16,7 +16,6 @@ import { CAccomodation } from '../CAccomodation'
 import { tools } from '@store/Modules/tools'
 import { costanti } from '@costanti'
 
-
 // @ts-ignore
 // import VueTelInput from 'vue3-tel-input'
 // import 'vue3-tel-input/dist/vue3-tel-input.css'
@@ -27,6 +26,7 @@ import MixinUsers from '@/mixins/mixin-users'
 import { toolsext } from '@store/Modules/toolsext'
 import { shared_consts } from '@/common/shared_vuejs'
 
+
 export default defineComponent({
   name: 'CMyPopupEdit',
   emits: ['showandsave', 'update:row', 'show', 'save', 'annulla'],

src/components/CMyPopupEdit/CMyPopupEdit.vue

@@ -54,7 +54,7 @@
           <div v-else-if="col.fieldtype === costanti.FieldType.username_chip">
             <div class="q-ma-xs">
               <q-btn v-if="col.tipovisu === costanti.TipoVisu.LINK && myvalue"
-                     type="a" rounded size="md"
+                     rounded size="md"
                      :class="{disabled: disable }"
                      color="white" text-color="blue" :icon="`img:`+userStore.getImgUserByUsername(myvalue)"
                      :to="col.link.replace(col.name, myvalue)"

src/components/CMyRecCard/CMyRecCard.vue

@@ -1,7 +1,7 @@
 <!--suppress ALL -->
 <template>
-  <div class="q-py-xs centermydiv cardrec" :style="`max-width: `+ (tools.getwidth($q) - 20) +`px; ` + ($q.screen.lt.sm ? (`min-width: `+ (tools.getwidth($q) - 20) +`px;`) : ``)">
+  <div class="q-py-xs centermydiv cardrec"
-
+       :style="`max-width: `+ (tools.getwidth($q) - 20) +`px; ` + ($q.screen.lt.sm ? (`min-width: `+ (tools.getwidth($q) - 20) +`px;`) : ``)">
     <q-item v-if="myrec" clickable v-ripple class="shadow-2 q-btn--rounded bg-teal-1">
 
 
@@ -12,11 +12,14 @@
           <q-icon :name="fieldsTable.getIconByAdType(myrec.adType)" color="white"
                   class="q-ml-xs"/>
         </q-badge>
+
         <q-avatar size="60px">
           <q-img :src="tools.getFullFileName(myrec.photos, table, myrec.username, '')" :alt="myrec.descr"
                  img-class="imgprofile" height="60px"/>
         </q-avatar>
+
       </q-item-section>
+
       <q-item-section v-else avatar @click="naviga(`/my/` + myrec.username)">
 
         <q-badge v-if="showBadge()" class="q-my-xs self-center" :color="fieldsTable.getColByAdType(myrec.adType)">
@@ -30,13 +33,16 @@
       </q-item-section>
 
       <q-item-section @click="navigaExt(myrec)">
-        <q-item-label class="full-width">
+        <q-item-label lines="1" class="full-width" >
-          <span v-for="(rec, ind) of myrec.recSkill" :key="ind"> <q-chip
+
-            dense
+          <span v-for="(rec, ind) of tools.getArrSubSector(table, myrec)" :key="ind">
-            class="text-center shadow-5 glossy bg-blue chipmodif">{{ rec.descr }}</q-chip></span>
+            <q-chip dense class="text-center shadow-5 glossy text-white bg-green">{{ rec.descr }}</q-chip>
-          <span v-for="(rec, ind) of myrec.myskill" :key="ind"> <q-chip
+          </span>
-            dense
+          <span>
-            class="text-center shadow-5 glossy bg-green chipmodif">{{ rec.descr }}</q-chip></span>
+            <span v-for="(rec, ind) of tools.getArrSector(table, myrec)" :key="ind">
+              <q-chip dense class="text-center shadow-5 glossy text-white bg-blue">{{ rec.descr }}</q-chip></span>
+          </span>
+
 
           <!--<span class="dateevent" v-if="myrec.dateTimeStart">dal <span class="datainizio">{{tools.getstrVeryShortDate(myrec.dateStart) }}</span> al <span class="datafine">{{ tools.getstrVeryShortDate(myrec.dateEnd) }}</span>
           </span>-->
@@ -45,7 +51,7 @@
         </q-item-label>
         <q-item-label lines="1" style="text-align: right" class="text_user_city">
           <span class="text-weight-bold">{{ myrec.username }}</span> -
-          <span v-for="(rec, ind) of myrec.mycities" :key="ind"><span v-if="ind > 0">, </span>{{ rec.comune }}</span>
+          <span v-for="(rec, ind) of myrec.mycities" :key="ind"><span v-if="ind > 0">, </span>{{ rec.comune }} ({{ rec.prov }})</span>
         </q-item-label>
 
       </q-item-section>

src/components/CMySelect/CMySelect.ts

@@ -323,7 +323,12 @@ export default defineComponent({
                 if (!arrtempOpt.value.includes(myidkey)){
                   let myobj: any = {}
                   myobj[props.col.remote_key] = myidkey
+                  if (props.col.remote_field === 'comune' && !!myrec['prov']) {
+                    myobj[props.col.remote_field] = myrec[props.col.remote_field] + ' (' + myrec['prov'] + ')'
+                  } else {
                     myobj[props.col.remote_field] = myrec[props.col.remote_field]
+                  }
+
                   arrtempOpt.value.push(myobj)
                 }
               }

src/components/CSignUp/CSignUp.vue

@@ -68,8 +68,18 @@
 
       </div>
 
-      <div v-else-if="!isalreadyReg" class="q-gutter-sm">
+      <div v-else-if="!isalreadyReg" class="q-gutter-sm q-mt-sm">
 
+        <div v-if="signup.username === 'undefined'">
+          <br>
+          Vai su <b>BOT RISO</b> Telegram ed imposta l'Username di Telegram.<br><br>
+          <q-btn rounded color="primary" icon="fab fa-telegram" label="Apri BOT"
+                 type="a"
+                 :href="tools.getLinkBotTelegram()" target="_blank"></q-btn>
+          <br><br>
+
+        </div>
+        <div v-else>
           <q-input
             v-if="showaportador && signup.aportador_solidario !== tools.APORTADOR_NONE"
             bg-color="lightblue"
@@ -299,6 +309,8 @@
             </q-btn>
           </div>
           <br/><br/><br/>
+
+        </div>
       </div>
 
     </div>

src/components/CSkill/CSkill.vue

@@ -9,7 +9,7 @@
         :prop_colkey="prop_colkey"
         :col_title="col_title"
         :col_footer="col_footer"
-        :vertical="-1"
+        :vertical="costanti.VISUTABLE_LISTA"
         :choose_visutype="!visuinpage"
         :butt_modif_new="!visuinpage"
         nodataLabel="Nessun dato presente"

src/db/lang/ws_it.js

@@ -217,12 +217,17 @@ const msg_website_it = {
         '<span><a href="https://paypal.me/paoloarena/10" target="_blank">10€</a></span>' +
         '<span><a href="https://paypal.me/paoloarena" target="_blank">scegli</a></span>' +
         '</div><em>clicca sull\'importo per fare una <strong>donazione</strong> </em><br>' +
-        '<br>2) Tramite <strong>Bonifico Bancario</strong>:<br>' +
+        '<br>2) Tramite <strong>Satispay</strong>: <a href="https://www.satispay.com/app/match/link/money-box/S6Y-SVN--62712D42-35B0-4BB9-8511-410C2AB8CD45" target="_blank">Clicca qui</a><br>' +
-        'Intestato a Paolo Arena<br>' +
+        '<div style="font-size: 1rem; background-color: white; color: blue; border: solid 2px #f00; margin: 5px; padding: 5px; border-radius: 10px; " ' +
-        'IBAN: IT76O0347501605CC0010311400<br>' +
+        'class="row justify-around">' +
-        'Causale: "donazione riso.app"<br><br>' +
+        'Se ancora non hai Satispay <a href="https://www.satispay.com/promo/PAOLOARENA4">Richiedila cliccando qui</a></br>' +
+        'E\' consigliata se hai un conto bancario come alternativa alla costosa carta di credito/debito</br>' +
+        '👉🏻 <strong>Registrandoti entrambi riceviamo un Bonus di 5 €</strong></br>' +
+        '</div>' +
+        '<br>3) Tramite <strong>Bonifico Bancario</strong>:<br>' +
+        '(Scrivi a Surya (<a href="mailto:surya@riso.app">surya@riso.app</a>) per ricevere le coordinate</br>' +
         '' +
-        '3) In alternativa scegli tu una forma di scambio da donare a Paolo (per scrivergli su Telegram: <a href="https://t.me/surya1977" target="_blank">Surya Paolo</a>)<br />' +
+        '4) In alternativa scegli tu una forma di scambio da donare a Paolo (per scrivergli su Telegram: <a href="https://t.me/surya1977" target="_blank">Surya Paolo</a>)<br />' +
         '<span style="color: red; font-size: 2rem;">❤</span> Sono graditi messaggi sia di suggerimenti che di apprezzamenti.<br>' +
         'Grazie Mille per l\'Aiuto ed il Supporto' +
         '<br>',

src/db/static_data.ts

@@ -500,6 +500,17 @@ const baseroutes: IListRoutes[] = [
     inmenu: true,
     infooter: true,
   },
+  {
+    active: true,
+    order: 15,
+    path: '/provapao',
+    materialIcon: 'fas fa-house-user',
+    name: 'mypages.provapao',
+    component: () => import('@/root/provapao/provapao.vue'),
+    meta: { requiresAuth: true },
+    inmenu: true,
+    infooter: true,
+  },
   {
     active: true,
     order: 15,

src/model/UserStore.ts

@@ -21,6 +21,7 @@ export interface IMyGroup {
   photos: IImgGallery[]
   visibility?: number[]
   date_created?: Date
+  date_updated?: Date
   admins?: IFriends[]
   req_users?: IFriends[]
   blocked?: boolean

src/root/eventi/eventi.vue

@@ -12,7 +12,7 @@
 
         </CFinder>
 
-        <CDashboard></CDashboard>
+        <br />
 
       </div>
       <div v-else>
@@ -21,7 +21,7 @@
 
     </div>
 
-    <LandingFooter></LandingFooter>
+
   </q-page>
 
 </template>

src/root/goods/goods.vue

@@ -11,7 +11,7 @@
           :table="toolsext.TABMYGOODS"
         />
 
-        <CDashboard></CDashboard>
+        <br />
 
       </div>
       <div v-else>
@@ -19,7 +19,7 @@
       </div>
 
     </div>
-    <LandingFooter></LandingFooter>
+
   </q-page>
 
 </template>

src/root/hosp/hosp.vue

@@ -12,7 +12,7 @@
 
         </CFinder>
 
-        <CDashboard></CDashboard>
+        <br />
 
       </div>
       <div v-else>
@@ -21,7 +21,7 @@
 
     </div>
 
-    <LandingFooter></LandingFooter>
+
   </q-page>
 
 </template>

src/root/provapao/provapao.ts

@@ -0,0 +1,181 @@
+import {
+  defineComponent, ref, computed,
+} from 'vue'
+
+import { tools } from '@src/store/Modules/tools'
+import { toolsext } from '@src/store/Modules/toolsext'
+import { CSkill } from '@/components/CSkill'
+import { CFinder } from '@/components/CFinder'
+import { CDashboard } from '@/components/CDashboard'
+import { CTitlePage } from '@/components/CTitlePage'
+import { CChartMap } from '@src/components/CChartMap'
+import { CUserNonVerif } from '@/components/CUserNonVerif'
+import { CMapsEsempio } from '@src/components/CMapsEsempio'
+import { CVerifyEmail } from '@src/components/CVerifyEmail'
+import { CVerifyTelegram } from '@src/components/CVerifyTelegram'
+import { LandingFooter } from '@/components/LandingFooter'
+import { useGlobalStore } from '@store/globalStore'
+import { useUserStore } from '@store/UserStore'
+import { static_data } from '@/db/static_data'
+import MixinBase from '@/mixins/mixin-base'
+import MixinUsers from '@/mixins/mixin-users'
+import { costanti } from '@costanti'
+
+export default defineComponent({
+  name: 'ProvaPao',
+  components: { CSkill, CChartMap, CMapsEsempio, CFinder, CVerifyEmail, CVerifyTelegram, CDashboard, CUserNonVerif, CTitlePage, LandingFooter },
+
+  setup() {
+
+    // @ts-ignore
+    const columns = [
+      {
+        name: 'index',
+        label: '#',
+        field: 'index'
+      },
+      {
+        name: 'name',
+        required: true,
+        label: 'Dessert (100g serving)',
+        align: 'left',
+        // @ts-ignore
+        field: row => row.name,
+        // @ts-ignore
+        format: val => `${val}`,
+        sortable: true
+      },
+      { name: 'calories', align: 'center', label: 'Calories', field: 'calories', sortable: true },
+      { name: 'fat', label: 'Fat (g)', field: 'fat', sortable: true },
+      { name: 'carbs', label: 'Carbs (g)', field: 'carbs' },
+      { name: 'protein', label: 'Protein (g)', field: 'protein' },
+      { name: 'sodium', label: 'Sodium (mg)', field: 'sodium' },
+      { name: 'calcium', label: 'Calcium (%)', field: 'calcium', sortable: true, sort: (a: any, b: any) => parseInt(a, 10) - parseInt(b, 10) },
+      { name: 'iron', label: 'Iron (%)', field: 'iron', sortable: true, sort: (a: any, b: any) => parseInt(a, 10) - parseInt(b, 10) }
+    ]
+
+    const seed = [
+      {
+        name: 'Frozen Yogurt',
+        calories: 159,
+        fat: 6.0,
+        carbs: 24,
+        protein: 4.0,
+        sodium: 87,
+        calcium: '14%',
+        iron: '1%'
+      },
+      {
+        name: 'Ice cream sandwich',
+        calories: 237,
+        fat: 9.0,
+        carbs: 37,
+        protein: 4.3,
+        sodium: 129,
+        calcium: '8%',
+        iron: '1%'
+      },
+      {
+        name: 'Eclair',
+        calories: 262,
+        fat: 16.0,
+        carbs: 23,
+        protein: 6.0,
+        sodium: 337,
+        calcium: '6%',
+        iron: '7%'
+      },
+      {
+        name: 'Cupcake',
+        calories: 305,
+        fat: 3.7,
+        carbs: 67,
+        protein: 4.3,
+        sodium: 413,
+        calcium: '3%',
+        iron: '8%'
+      },
+      {
+        name: 'Gingerbread',
+        calories: 356,
+        fat: 16.0,
+        carbs: 49,
+        protein: 3.9,
+        sodium: 327,
+        calcium: '7%',
+        iron: '16%'
+      },
+      {
+        name: 'Jelly bean',
+        calories: 375,
+        fat: 0.0,
+        carbs: 94,
+        protein: 0.0,
+        sodium: 50,
+        calcium: '0%',
+        iron: '0%'
+      },
+      {
+        name: 'Lollipop',
+        calories: 392,
+        fat: 0.2,
+        carbs: 98,
+        protein: 0,
+        sodium: 38,
+        calcium: '0%',
+        iron: '2%'
+      },
+      {
+        name: 'Honeycomb',
+        calories: 408,
+        fat: 3.2,
+        carbs: 87,
+        protein: 6.5,
+        sodium: 562,
+        calcium: '0%',
+        iron: '45%'
+      },
+      {
+        name: 'Donut',
+        calories: 452,
+        fat: 25.0,
+        carbs: 51,
+        protein: 4.9,
+        sodium: 326,
+        calcium: '2%',
+        iron: '22%'
+      },
+      {
+        name: 'KitKat',
+        calories: 518,
+        fat: 26.0,
+        carbs: 65,
+        protein: 7,
+        sodium: 54,
+        calcium: '12%',
+        iron: '6%'
+      }
+    ]
+
+// we generate lots of rows here
+    let rows: any = []
+    for (let i = 0; i < 1000; i++) {
+      rows = rows.concat(seed.slice(0).map((r: any) => ({ ...r })))
+    }
+    rows.forEach((row: any, index: any) => {
+      row.index = index
+    })
+
+    return {
+      tools,
+      toolsext,
+      static_data,
+      columns,
+      rows,
+
+      pagination: ref({
+        rowsPerPage: 0
+      })
+    }
+  },
+})

src/root/provapao/provapao.vue

@@ -0,0 +1,43 @@
+<template>
+  <q-page class="">
+    <CTitlePage :ind="1" />
+
+    <div v-if="tools.isLogged()">
+
+      <div v-if="tools.isUserOk()">
+
+        <CFinder
+          :ind="1"
+          :table="toolsext.TABMYSKILLS"
+        />
+
+        Prova Pao:<br>
+        <div class="q-pa-md">
+          <q-table
+            style="height: 400px"
+            title="Treats"
+            :rows="rows"
+            :columns="columns"
+            row-key="index"
+            virtual-scroll
+            v-model:pagination="pagination"
+            :rows-per-page-options="[0]"
+          />
+        </div>
+
+      </div>
+      <div v-else>
+        <CUserNonVerif></CUserNonVerif>
+      </div>
+
+    </div>
+
+    <LandingFooter></LandingFooter>
+  </q-page>
+
+</template>
+<script lang="ts" src="./provapao.ts">
+</script>
+<style lang="scss" scoped>
+@import './provapao.scss';
+</style>

src/root/services/services.vue

@@ -11,7 +11,8 @@
           :table="toolsext.TABMYSKILLS"
         />
 
-        <CDashboard></CDashboard>
+        <br />
+        <!--<CDashboard></CDashboard>-->
 
       </div>
       <div v-else>
@@ -20,7 +21,6 @@
 
     </div>
 
-    <LandingFooter></LandingFooter>
   </q-page>
 
 </template>

src/statics/lang/it.js

@@ -31,6 +31,7 @@ const msg_it = {
       chisei: 'Chi Sei? Raccontaci di te:',
       iltuoimpegno: 'Quale è stato il tuo impegno per salvare il pianeta ad oggi?',
       come_aiutare: 'Cosa vorresti fare per aiutare il pianeta?',
+      skills: 'Competenze e Talenti',
     },
     otherpages: {
       product: 'Prodotto',
@@ -243,7 +244,7 @@ const msg_it = {
           open: 'Clicca sul bottone qui sotto, si aprirà una chat Telegram speciale (chiamata BOT)',
           ifclose: 'poi premi "AVVIA" o "START" e segui le istruzioni indicate.',
           openbot: 'Entra qui',
-          regbot: 'Verifica Telegram',
+          regbot: 'Registrati cliccando qui (si aprirà Telegram)',
         },
         login: {
           facebook: 'Facebook',
@@ -990,6 +991,7 @@ const msg_it = {
       request_trust: 'Richieste Fiducia',
       trusted: 'Fiducia Accettata',
       rejected: 'Rifiutati',
+      provapao: 'Prova pao',
     },
     friends: {
       accept_trust: 'Accetta Fiducia',
@@ -1020,6 +1022,7 @@ const msg_it = {
       admin: 'amministratore',
       admins: 'Amministratori',
       createdby: 'Creato da {username} in data {date}',
+      lastmodify: 'Ultima modifica {date}',
       subscribes: 'Membri',
       ask_group: 'Chiedi di entrare nel Gruppo',
       exit_group: 'Esci dal Gruppo',
@@ -1120,6 +1123,10 @@ const msg_it = {
       expiringDate: 'Data Scadenza',
 
     },
+    editor: {
+      showtool: 'Mostra strumenti per formattare il testo',
+      hidetool: 'Nascondi strumenti per formattare il testo',
+    }
 
   },
 

src/store/Api/index.ts

@@ -126,7 +126,8 @@ export const Api = {
             return reject({ code: toolsext.ERR_AUTHENTICATION })
           }
         }
-
+        if (tools.isDebug())
+          console.log('result', res)
         return resolve(res)
       })
       .catch((error) => {

src/store/Modules/fieldsTable.ts

@@ -614,6 +614,13 @@ export const colmyUserGroup = [
     sortable: true,
     showWhen: 0
   }),
+  AddCol({
+    name: 'date_updated', label_trans: 'reg.pub_updated', fieldtype: costanti.FieldType.onlydate,
+    required: false,
+    visible: false,
+    sortable: true,
+    showWhen: 0
+  }),
   AddCol({
     name: 'photos',
     label_trans: 'skill.photos',

src/store/Modules/tools.ts

@@ -2258,6 +2258,12 @@ export const tools = {
     return ''
   },
 
+  getstrDateYY(mytimestamp: Date | number | string | undefined) {
+    // console.log('getstrDate', mytimestamp)
+    if (mytimestamp) return date.formatDate(mytimestamp, 'DD/MM/YY')
+    return ''
+  },
+
   getstrDateLong(mytimestamp: Date | number | string | undefined) {
     // console.log('getstrDate', mytimestamp)
     const dayofweek = this.getDayOfWeek(mytimestamp)
@@ -5785,6 +5791,32 @@ export const tools = {
     return config[name];
   },
 
+  getArrSector(table: string, rec: any) {
+    if (table === toolsext.TABMYGOODS)
+      return rec.sectorGood
+    else if ((table === toolsext.TABMYBACHECAS) || (table === toolsext.TABMYSKILLS))
+      return rec.sector
+    else if (table === toolsext.TABMYGROUPS)
+      return [{descr: rec.sector}]
+    else if (table === toolsext.TABMYHOSPS)
+      return []
+
+
+  },
+
+  getArrSubSector(table: string, rec: any) {
+    if (table === toolsext.TABMYGOODS)
+      return rec.recGood
+    else if ((table === toolsext.TABMYBACHECAS) || (table === toolsext.TABMYSKILLS))
+      return rec.recSkill
+    else if (table === toolsext.TABMYGROUPS)
+      return []
+    else if (table === toolsext.TABMYHOSPS)
+      return []
+
+
+  }
+
 // getLocale() {
   //   if (navigator.languages && navigator.languages.length > 0) {
   //     return navigator.languages[0]

src/store/Modules/toolsext.ts

@@ -62,6 +62,7 @@ export const toolsext = {
   TABFRIENDS: 'friends',
   TABMYGROUPS: 'mygroups',
   TABSKILLS: 'skills',
+  TABGOODS: 'goods',
   TABSECTORS: 'sectors',
   TABSECTORGOODS: 'sectorgoods',
   TABREGIONS: 'regions',

src/store/globalStore.ts

@@ -1625,7 +1625,12 @@ export const useGlobalStore = defineStore('GlobalStore', {
         let obj: any = {}
         obj[mykey] = costanti.FILTER_NESSUNO
         obj[collab] = '[Nessuno]'
+
+        if (table === toolsext.TABMYGOODS) {
+          obj['idSectorGood'] = []
+        } else if ((table === toolsext.TABMYSKILLS) ) {
           obj['idSector'] = []
+        }
 
         myarr = [obj, ...myarr]
 

src/views/user/myfriends/myfriends.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="">
+    <!--
     <q-banner
       rounded
       dense
@@ -12,6 +13,7 @@
       <span class="mybanner">Questa sezione è ancora in fase di miglioramento.</span>
 
     </q-banner>
+    -->
     <CMyFriends
       v-if="searchList.length > 0"
       v-model="filter"

src/views/user/mygroup/mygroup.scss

@@ -17,7 +17,7 @@
   padding: 5px;
 }
 
-.members, .admins, .creator{
+.members, .admins, .creator, .element{
   font-weight: bold;
   vertical-align: center;
   padding: 5px;

src/views/user/mygroup/mygroup.ts

@@ -48,6 +48,7 @@ export default defineComponent({
     const loading = ref(false)
 
     const tabgrp = ref('info')
+    const tabmembers = ref('all')
     const tab = ref('membri')
 
     const arrfilterand: any = ref([])
@@ -225,6 +226,7 @@ export default defineComponent({
       extraparams_refused,
       tab,
       tabgrp,
+      tabmembers,
       numUsers,
       numAdmins,
       listaAdmins,

src/views/user/mygroup/mygroup.vue

@@ -104,8 +104,6 @@
             <q-tab v-if="!!mygrp.note" label="Pagina" name="page" icon="fas fa-file-word"></q-tab>
             <q-tab v-if="tools.iCanShowGroupsMember(mygrp) || tools.iAmAdminGroup(groupname)"
                    :label="t('groups.subscribes')" name="membri" icon="fas fa-users"></q-tab>
-            <q-tab v-if="tools.iAmAdminGroup(groupname)" label="Richieste" name="rich" icon="fas fa-user-plus"></q-tab>
-            <q-tab v-if="tools.iAmAdminGroup(groupname)" label="Rifiutati" name="refused" icon="fas fa-user-minus"></q-tab>
           </q-tabs>
 
           <q-tab-panels v-model="tabgrp" animated>
@@ -119,12 +117,17 @@
                   <q-separator/>
 
                   <q-card-section>
-                    <div class="creator">
+                    <div class="element">
                       <q-icon name="fas fa-lightbulb"></q-icon>
                       {{ $t('groups.createdby', {
                       username: mygrp.createdBy,
-                      date: tools.getstrDateLong(mygrp.date_created),
+                      date: tools.getstrDateYY(mygrp.date_created), })
-                    })
+                      }}
+                    </div>
+                    <div class="element">
+                      <q-icon name="fas fa-pencil-alt"></q-icon>
+                      {{ $t('groups.lastmodify', {
+                      date: tools.getstrDateYY(mygrp.date_updated), })
                       }}
                     </div>
 
@@ -180,6 +183,7 @@
                   </q-card-section>
                 </q-card>
 
+                <br>
               </div>
               <q-card v-if="mygrp.title">
                 <q-card-section>
@@ -231,6 +235,16 @@
             </q-tab-panel>
 
             <q-tab-panel name="membri" style="max-width: 400px;" v-if="tools.iCanShowGroupsMember(mygrp)">
+
+              <q-tabs v-model="tabmembers" class="text-blue">
+                <q-tab label="Tutti" name="all" icon="fas fa-users"></q-tab>
+                <q-tab v-if="tools.iAmAdminGroup(groupname)" label="Richieste" name="rich" icon="fas fa-user-plus"></q-tab>
+                <q-tab v-if="tools.iAmAdminGroup(groupname)" label="Rifiutati" name="refused" icon="fas fa-user-minus"></q-tab>
+              </q-tabs>
+
+              <q-tab-panels v-model="tabmembers" animated>
+              <q-tab-panel name="all">
+
               <CGridTableRec
                 ref="tabMembri"
                 prop_mytable="users"
@@ -324,6 +338,9 @@
               </q-tab-panel>
               </q-tab-panels>
 
+            </q-tab-panel>
+          </q-tab-panels>
+
         </div>
         <div v-else class="fit column no-wrap justify-evenly items-center content-start">
           <q-skeleton type="QAvatar" size="140px" height="140px" animation="fade"/>

src/views/user/myprofile/myprofile.vue

@@ -180,7 +180,7 @@
 
         <CTitleBanner
           v-if="static_data.functionality.SHOW_COMPETENZE"
-          class="" title="Competenze e Talenti" bgcolor="bg-positive" clcolor="text-white"
+          class="" :title="$t('profile.skills')" bgcolor="bg-positive" clcolor="text-white"
           myclass="myshad" :canopen="true">
 
           <q-tabs v-model="actualcard" class="text-blue">