nuova veste grafica: myskills, mygoods, mybachecas, myhosps,

- cambiato id (da numero a stringa)

.env.development

@@ -1,4 +1,4 @@
-APP_VERSION="0.5.84"
+APP_VERSION="0.5.85"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"

.env.example.production

@@ -1,4 +1,4 @@
-APP_VERSION="0.5.84"
+APP_VERSION="0.5.85"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

.env.test.risosrv

@@ -1,4 +1,4 @@
-APP_VERSION="0.5.84"
+APP_VERSION="0.5.85"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/riso.app/.env.development

@@ -1,4 +1,4 @@
-APP_VERSION="0.5.84"
+APP_VERSION="0.5.85"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"

_ALL_SITES/riso.app/.env.production

@@ -1,4 +1,4 @@
-APP_VERSION="0.5.84"
+APP_VERSION="0.5.85"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/terradellavisione.app/.env.development

@@ -1,4 +1,4 @@
-APP_VERSION="0.5.84"
+APP_VERSION="0.5.85"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="14"
 DIRECTORY_LOCAL="newfreeplanet"

public/upload

@@ -0,0 +1 @@
+/Users/suryapaolo/backups/upload

send_pwa_to_production.sh

@@ -9,6 +9,6 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
 
 
   echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..."
-  sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
+  sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
   echo "Finito $SERVERDIR_WEBSITE "
 fi

send_spa_to_production.sh

@@ -9,6 +9,6 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
 
 
   echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..."
-  sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
+  sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
   echo "Finito $SERVERDIR_WEBSITE "
 fi

src/common/shared_vuejs.ts

@@ -99,6 +99,7 @@ export const shared_consts = {
   OPTIONS_SEARCH_ONLY_FULL_WORDS: 1,
   OPTIONS_SEARCH_USER_ONLY_FULL_WORDS: 2,
   OPTIONS_SEARCH_USER_ALL_WORDS: 4,
+  OPTIONS_ADD_COUNT_FAVORITE: 8,
 
   FRIENDSCMD: {
     SETTRUST: 121,
@@ -189,6 +190,7 @@ export const shared_consts = {
   TABLES_WITH_DATE: ['mybachecas', 'myhosps'],
   TABLES_WITH_SORTING: ['mybachecas', 'myhosps'],
   TABLES_REC_ID: ['skills', 'goods', 'subskills', 'myskills', 'mybachecas', 'myhosps', 'mygoods'],
+  TABLES_FAVORITE_BOOKMARK: ['myskills', 'mygoods', 'mybachecas', 'myhosps'],
 
   // costanti.VISUTABLE_SCHEDA_USER, VISUTABLE_SCHEDA_GROUP, VISUTABLE_USER_TABGROUP, VISUTABLE_USER_TABCIRCUIT, VISUTABLE_GROUP_CIRCUIT
   VERTIC_SHOW_GRID: [-1, 2, -3, -4, -5, -6],
@@ -1546,4 +1548,41 @@ export const shared_consts = {
     return ['_id', 'username', 'group', 'email', 'name', 'surname', 'perm', 'date_reg', 'verified_email', 'notask_verif', 'verified_by_aportador', 'trust_modified', 'img', 'ipaddr', 'lasttimeonline', 'profile', 'news_on']
   },
 
+  getProjectForAll(proj_add: string) {
+    let proj = {
+      idContribType: 1,
+      idCity: 1,
+      pub_to_share: 1,
+      adType: 1,
+      photos: 1,
+      note: 1,
+      descr: 1,
+      date_created: 1,
+      date_updated: 1,
+      userId: 1,
+      username: 1,
+      name: 1,
+      surname: 1,
+      lasttimeonline: 1,
+      comune: 1,
+      mycities: 1,
+      'profile.img': 1,
+      'profile.mygroups': 1,
+      'profile.mycircuits': 1,
+      'profile.qualifica': 1,
+      'profile.resid_province': 1,
+      'profile.username_telegram': 1,
+      'profile.favorite': 1,
+      'profile.bookmark': 1,
+      reported: 1,
+      date_report: 1,
+      username_who_report: 1,
+    };
+
+    if (proj_add)
+      proj = Object.assign({}, proj, proj_add);
+
+    return proj;
+  },
+
 }

src/components/CAccomodation/CAccomodation.ts

@@ -68,7 +68,7 @@ export default defineComponent({
     })
 
     function created() {
-      console.log('created CAccomodation', props.mylist)
+      // console.log('created CAccomodation', props.mylist)
       if (isValid(props.mylist)) {
         // @ts-ignore
         let myarr: any = props.mylist

src/components/CAccomodation/CAccomodation.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="bordo_stondato_blu">
+  <div class="">
-    <CTitleBanner class="column" title="Tipi di ospitalità"></CTitleBanner>
+
 
     <div class="">
       <q-btn

src/components/CFinder/CFinder.ts

@@ -81,6 +81,7 @@ export default defineComponent({
     const myoptions = ref(<any>[])
 
 
+
     const col = ref(<IColGridTable>{})
 
     /*
@@ -149,7 +150,7 @@ export default defineComponent({
       else if (props.table === toolsext.TABUSER)
         return userStore.getMypaginationMembers()
       else if (shared_consts.TABLES_ORDER_DATE_UPDATED.includes(props.table))
-        return { sortBy: 'date_created', descending: true, page: 1, rowsNumber: 0, rowsPerPage: 10 } // date_updated
+        return { sortBy: 'date_updated', descending: true, page: 1, rowsNumber: 0, rowsPerPage: 10 } // date_updated
       else if (shared_consts.TABLES_ORDER_DESCR.includes(props.table))
         return { sortBy: 'desc', descending: false, page: 1, rowsNumber: 0, rowsPerPage: 10 }
 
@@ -1159,6 +1160,8 @@ export default defineComponent({
               idStatusSkill: 1,
               idContribType: 1,
               'profile.username_telegram': 1,
+              'profile.favorite': 1,
+              'profile.bookmark': 1,
               idCity: 1,
               pub_to_share: 1,
               numLevel: 1,
@@ -1184,7 +1187,7 @@ export default defineComponent({
               reported: 1,
               date_report: 1,
               username_who_report: 1,
-            }
+              }
           },
           lookup3: {
             lk_tab: 'sectorgoods',
@@ -1228,6 +1231,8 @@ export default defineComponent({
               idStatusSkill: 1,
               idContribType: 1,
               'profile.username_telegram': 1,
+              'profile.favorite': 1,
+              'profile.bookmark': 1,
               idCity: 1,
               pub_to_share: 1,
               dateTimeStart: 1,
@@ -1255,7 +1260,7 @@ export default defineComponent({
               reported: 1,
               date_report: 1,
               username_who_report: 1,
-            }
+              }
           },
           lookup3: {
             lk_tab: toolsext.TABSECTORS,
@@ -1305,6 +1310,8 @@ export default defineComponent({
               preferences: 1,
               idContribType: 1,
               'profile.username_telegram': 1,
+              'profile.favorite': 1,
+              'profile.bookmark': 1,
               photos: 1,
               idCity: 1,
               pub_to_share: 1,
@@ -1322,7 +1329,7 @@ export default defineComponent({
               comune: 1,
               mycities: 1,
               'profile.img': 1,
-            }
+              }
           },
         }
 
@@ -1352,6 +1359,8 @@ export default defineComponent({
               idStatusSkill: 1,
               idContribType: 1,
               'profile.username_telegram': 1,
+              'profile.favorite': 1,
+              'profile.bookmark': 1,
               idCity: 1,
               pub_to_share: 1,
               numLevel: 1,
@@ -1377,7 +1386,7 @@ export default defineComponent({
               reported: 1,
               date_report: 1,
               username_who_report: 1,
-            }
+              }
           },
           lookup3: {
             lk_tab: toolsext.TABSECTORS,

src/components/CFinder/CFinder.vue

@@ -34,6 +34,7 @@
         <CGridTableRec
           v-if="searchList.length > 0"
           :prop_mytable="table"
+          :options="tools.optionsTable(table)"
           prop_mytitle=""
           :prop_mycolumns="col"
           :prop_colkey="prop_colkey"

src/components/CGalleryImages/CGalleryImages.scss

@@ -0,0 +1,65 @@
+$heightBtn: 100%;
+$grayshadow: #555;
+
+.text-subtitle-gallery {
+  font-size: 1rem;
+  font-weight: 400;
+  line-height: 1.75rem;
+  letter-spacing: .00937em;
+  text-shadow: .1rem .1rem .1rem $grayshadow;
+}
+
+@media (max-width: 718px) {
+  // PER VERSIONE MOBILE
+  .text-subtitle-gallery {
+    font-size: 1rem;
+  }
+}
+
+.myimg {
+  border-radius: 10px !important;
+  height: 200px;
+  cursor: pointer;
+}
+
+.myimg-modify {
+  cursor: grab;
+}
+
+
+.barwidth{
+  width: 250px !important;
+}
+
+
+.q-img {
+  &__image {
+    border-radius: 10px !important;
+  }
+}
+
+.my-card-gallery {
+  width: 100%;
+  max-width: 300px;
+  min-width: 200px;
+  padding: 0.5rem 0.5rem;
+  height: 350px;
+  margin: auto;
+}
+
+.my-card-gallery-noModif {
+  width: 100%;
+  max-width: 300px;
+  min-width: 200px;
+  padding: 1rem 1rem;
+  height: 220px;
+}
+
+
+
+.my-card-gallery-view {
+  width: 100px;
+  height: 100px;
+  padding: 0.25rem 0.25rem;
+  margin: auto;
+}

src/components/CGalleryImages/CGalleryImages.ts

@@ -0,0 +1,40 @@
+import { defineComponent, ref, PropType, watch, onMounted, computed } from 'vue'
+import { useI18n } from '@src/boot/i18n'
+import { useUserStore } from '@store/UserStore'
+import { useQuasar } from 'quasar'
+import { IGallery, IImgGallery } from 'model'
+import { CMyPage } from '@/components/CMyPage'
+import { tools } from '@store/Modules/tools'
+import { useGlobalStore } from '@store/globalStore'
+import { costanti } from '@costanti'
+
+export default defineComponent({
+  name: 'CGalleryImages',
+  props: {
+    imgGallery: {
+      type: Object as PropType<IImgGallery[] | string | undefined | null>,
+      required: true,
+    },
+    directory: {
+      type: String,
+      required: true,
+    }
+  },
+  components: { CMyPage },
+  setup(props, { emit }) {
+    const $q = useQuasar()
+    const { t } = useI18n()
+    const userStore = useUserStore()
+    const globalStore = useGlobalStore()
+
+    const slide = ref(0)
+    const autoplay = ref(5000)
+
+    return {
+      tools,
+      costanti,
+      slide,
+      autoplay,
+    }
+  }
+})

src/components/CGalleryImages/CGalleryImages.vue

@@ -0,0 +1,30 @@
+<template>
+  <q-carousel
+    swipeable
+    animated
+    :autoplay="autoplay"
+    transition-prev="slide-right"
+    transition-next="slide-left"
+    @mouseenter="autoplay = false"
+    @mouseleave="autoplay = 5000"
+    :arrows="imgGallery.length > 1"
+    v-model="slide"
+    :thumbnails="imgGallery.length > 1"
+    infinite
+  >
+    <q-carousel-slide
+      v-for="(myimg, index) in imgGallery"
+      :name="index"
+      :key="index"
+      :img-src="directory + '/' + myimg.imagefile"
+    >
+    </q-carousel-slide>
+  </q-carousel>
+</template>
+
+<script lang="ts" src="./CGalleryImages.ts">
+</script>
+
+<style lang="scss" scoped>
+@import './CGalleryImages.scss';
+</style>

src/components/CGalleryImages/index.ts

@@ -0,0 +1 @@
+export {default as CGalleryImages} from './CGalleryImages.vue'

src/components/CGridTableRec/CGridTableRec.ts

@@ -36,6 +36,7 @@ import { costanti } from '@costanti'
 import translate from '@/globalroutines/util'
 import { toolsext } from '@store/Modules/toolsext'
 import { CMyCardPopup } from '@/components/CMyCardPopup'
+import { CMyCardGood } from '@/components/CMyCardGood'
 import { CMyCardService } from '@/components/CMyCardService'
 import { CMyCardGrpPopup } from '@/components/CMyCardGrpPopup'
 import { CMyCardCircuitPopup } from '@/components/CMyCardCircuitPopup'
@@ -288,7 +289,7 @@ export default defineComponent({
   components: {
     CMyPopupEdit, CTitleBanner, CMyFieldDb, CMySelect, CMyFriends, CMyGroups,
     CMyUser, CMyRecCard, CMyCardPopup, CMyRecGrpCard, CMyCardGrpPopup, CMyCardCircuitPopup,
-    CMyRecCircuitCard, CMyCardService
+    CMyRecCircuitCard, CMyCardService, CMyCardGood
   },
   setup(props, { emit }) {
     const $q = useQuasar()

src/components/CGridTableRec/CGridTableRec.vue

@@ -1088,6 +1088,7 @@
     <q-dialog
       v-model="visupagedialog"
       @hide="hidewindow"
+      class="q-ma-sm"
       :maximized="$q.screen.lt.sm"
     >
 
@@ -1106,6 +1107,12 @@
       <CMyCardService v-else-if="mytable === 'myskills'"
         :table="mytable" :prop_myrec="myrecdialog">
       </CMyCardService>
+      <CMyCardService v-else-if="mytable === 'mygoods'"
+        :table="mytable" :prop_myrec="myrecdialog">
+      </CMyCardService>
+      <CMyCardService v-else-if="mytable === 'myhosps'"
+        :table="mytable" :prop_myrec="myrecdialog">
+      </CMyCardService>
       <CMyCardPopup v-else :table="mytable" :prop_myrec="myrecdialog">
       </CMyCardPopup>
     </q-dialog>

src/components/CMyActivities/CMyActivities.ts

@@ -24,7 +24,7 @@ import { useI18n } from '@/boot/i18n'
 import { toolsext } from '@store/Modules/toolsext'
 import { useQuasar } from 'quasar'
 import { costanti } from '@costanti'
-import { ICircuit, IMyCircuit, IMyGroup, IUserFields } from 'model'
+import { IBookmark, ICircuit, IFavorite, IMyCircuit, IMyGroup, IUserFields } from 'model'
 import { shared_consts } from '@/common/shared_vuejs'
 import { static_data } from '@/db/static_data'
 import { fieldsTable } from '@store/Modules/fieldsTable'
@@ -53,6 +53,7 @@ export default defineComponent({
     const { getRefLink } = MixinUsers()
 
     const animation = ref('fade')
+    const mytab = ref('my')
 
     const username = computed(() => $route.params.username ? $route.params.username.toString() : userStore.my.username)
     const idnotif = computed(() => $route.query.idnotif ? $route.query.idnotif.toString() : '')
@@ -180,6 +181,25 @@ export default defineComponent({
         return ''
     }
 
+    function filtrofavorite(table: string) {
+      const tab = tools.getNumTabByTable(table)
+      if (myuser.value && myuser.value.profile.favorite) {
+        let arrfav = myuser.value.profile.favorite.filter((rec: IBookmark) => rec.tab === tab)
+        if (arrfav)
+          return myuser.value.profile.favorite ? [{ _id: { $in: arrfav.map((rec: any) => rec.id) } }] : []
+      }
+      return []
+    }
+    function filtrobookmark(table: string) {
+      const tab = tools.getNumTabByTable(table)
+      if (myuser.value && myuser.value.profile.bookmark) {
+        let arrfav = myuser.value.profile.bookmark.filter((rec: IBookmark) => rec.tab === tab)
+        if (arrfav)
+          return myuser.value.profile.bookmark ? [{ _id: { $in: arrfav.map((rec: any) => rec.id) } }] : []
+      }
+      return []
+    }
+
     onMounted(mounted)
 
     return {
@@ -194,6 +214,8 @@ export default defineComponent({
       getLinkUserTelegram,
       getLinkWebSite,
       filtroutente,
+      filtrofavorite,
+      filtrobookmark,
       showPic,
       myusername,
       userStore,
@@ -212,6 +234,7 @@ export default defineComponent({
       listcircuitsfiltered,
       optionsMainCards,
       getlinkpage,
+      mytab,
     }
   }
 })

src/components/CMyActivities/CMyActivities.vue

@@ -91,55 +91,122 @@
             myclass="myshad"
             :canopen="true"
           >
-            <div v-for="(card, ind) of mycards" :key="ind" :name="card.table">
+            <q-tabs
-              <q-card class="q-my-md">
+              v-model="mytab"
-                <div v-if="card.table === 'mygroups'">
+              inline-label
-                  <q-list>
+              dense
-                    <span
+              class="text-black shadow-2"
-                      v-for="(grp, index) in listgroupsfiltered"
+            >
-                      :key="index"
+              <q-tab name="my" icon="far fa-user" />
-                      class="q-my-sm q-mx-none"
+              <q-tab name="favorite" icon="far fa-heart" />
-                      clickable
+              <q-tab name="bookmark" icon="far fa-bookmark" />
-                    >
+            </q-tabs>
-                      <CMyGroup
+
-                        :mygrp="grp"
+            <q-tab-panels
-                        :visu="costanti.USER_GROUPS"
+              v-model="mytab"
+              animated
+              swipeable
+              vertical
+              transition-prev="jump-up"
+              transition-next="jump-up"
+            >
+              <q-tab-panel name="my">
+                <div
+                  v-for="(card, ind) of mycards"
+                  :key="ind"
+                  :name="card.table"
+                >
+                  <q-card class="q-my-md">
+                    <div v-if="card.table === 'mygroups'">
+                      <q-list>
+                        <span
+                          v-for="(grp, index) in listgroupsfiltered"
+                          :key="index"
+                          class="q-my-sm q-mx-none"
+                          clickable
+                        >
+                          <CMyGroup
+                            :mygrp="grp"
+                            :visu="costanti.USER_GROUPS"
+                            :noaut="true"
+                          >
+                          </CMyGroup>
+                        </span>
+                      </q-list>
+                    </div>
+                    <div v-else-if="card.table === 'circuits'">
+                      <div class="text-h6">{{ card.title }}</div>
+                      <q-list>
+                        <span
+                          v-for="(circuit, index) in listcircuitsfiltered"
+                          :key="index"
+                          class="q-my-sm q-mx-none"
+                          clickable
+                        >
+                          <CMyCircuit
+                            :mycircuit="circuit"
+                            :visu="costanti.USER_CIRCUITS"
+                            :noaut="true"
+                          >
+                          </CMyCircuit>
+                        </span>
+                      </q-list>
+                    </div>
+                    <div v-else>
+                      <CSkill
+                        :table="card.table"
+                        :filtercustom="filtroutente"
+                        :butt_modif_new="isMyRecord(myuser.username)"
+                        :visuinpage="true"
                         :noaut="true"
-                      >
+                        :title="card.title"
-                      </CMyGroup>
+                      />
-                    </span>
+                    </div>
-                  </q-list>
+                  </q-card>
                 </div>
-                <div v-else-if="card.table === 'circuits'">
+              </q-tab-panel>
-                  <div class="text-h6">{{ card.title }}</div>
+              <q-tab-panel name="favorite">
-                  <q-list>
+                <div
-                    <span
+                  v-for="(card, ind) of mycards"
-                      v-for="(circuit, index) in listcircuitsfiltered"
+                  :key="ind"
-                      :key="index"
+                  :name="card.table"
-                      class="q-my-sm q-mx-none"
+                >
-                      clickable
+                  <q-card class="q-my-md">
-                    >
+
-                      <CMyCircuit
+                    <div v-if="card.showfavorite && filtrofavorite(card.table)">
-                        :mycircuit="circuit"
+                      <CSkill
-                        :visu="costanti.USER_CIRCUITS"
+                        :table="card.table"
+                        :filtercustom="filtrofavorite(card.table)"
+                        :butt_modif_new="false"
+                        :visuinpage="true"
+                        :noaut="false"
+                        :title="card.title"
+                      />
+                    </div>
+                  </q-card>
+                </div>
+              </q-tab-panel>
+              <q-tab-panel name="bookmark">
+                <div
+                  v-for="(card, ind) of mycards"
+                  :key="ind"
+                  :name="card.table"
+                >
+                  <q-card class="q-my-md">
+                    <div v-if="card.showfavorite && filtrobookmark(card.table)">
+                      <CSkill
+                        :table="card.table"
+                        :filtercustom="filtrobookmark(card.table)"
+                        :butt_modif_new="isMyRecord(myuser.username)"
+                        :visuinpage="true"
                         :noaut="true"
-                      >
+                        :title="card.title"
-                      </CMyCircuit>
+                      />
-                    </span>
+                    </div>
-                  </q-list>
+                  </q-card>
                 </div>
-                <div v-else>
+              </q-tab-panel>
-                  <CSkill
+            </q-tab-panels>
-                    :table="card.table"
-                    :filtercustom="filtroutente"
-                    :butt_modif_new="isMyRecord(myuser.username)"
-                    :visuinpage="true"
-                    :noaut="true"
-                    :title="card.title"
-                  />
-                </div>
-              </q-card>
-            </div>
           </CTitleBanner>
         </div>
       </div>

src/components/CMyCardCircuitPopup/CMyCardCircuitPopup.ts

@@ -61,7 +61,7 @@ export default defineComponent({
 
     function load() {
       // Carica il profilo di quest'utente
-      if (props.idRec && props.idRec > 0) {
+      if (props.idRec) {
         userStore.loadGeneric(props.table, props.idRec, idnotif.value).then((ris) => {
           myrec.value = ris
           notifStore.setAsRead(idnotif.value)

src/components/CMyCardGood/CMyCardGood.scss

@@ -0,0 +1,127 @@
+.profile {
+  width: 100%;
+  margin: 0 auto;
+  max-width: 450px;
+}
+
+.myrow{
+  display: flex;
+  @media (max-width: 600px) {
+    flex-flow: column;
+  }
+}
+
+.qualifica{
+  border: solid 2px #4198ef;
+  border-radius: 1rem;
+  padding: 5px;
+}
+
+
+.text-bacheca{
+  margin: 10px;
+  border: solid 2px #4198ef;
+  border-radius: 1rem;
+  padding: 10px;
+
+}
+
+.note-bacheca{
+  border: solid 2px #C10015;
+  border-radius: 1rem;
+  padding: 10px;
+
+}
+
+.img {
+  margin-left: auto;
+  margin-right: auto;
+
+  max-height: 500px;
+  max-width: 350px;
+  @media (max-width: 500px) {
+    max-height: 500px;
+    max-width: 400px;
+  }
+}
+
+$graytext: #555;
+.cal {
+  color: black;
+  font-size: 1rem;
+  font-weight: 400;
+  line-height: 1.25rem;
+  letter-spacing: 0.03333em;
+
+  &__title {
+    color: white;
+    font-weight: 700;
+    font-size: 1rem;
+    padding-bottom: 10px;
+  }
+
+  &__details {
+    color: black;
+  }
+
+  &__hours {
+    color: blue;
+    &-title {
+      color: $graytext;
+    }
+    &-content {
+      font-weight: 400;
+    }
+  }
+
+  &__where {
+    margin-top: 5px;
+    color: blue;
+
+    &-title {
+      color: $graytext;
+    }
+    &-content {
+      color: darkblue !important;
+    }
+  }
+
+  &__when {
+    margin-top: 5px;
+    color: blue;
+
+    &-title {
+      color: $graytext;
+    }
+    &-content {
+      color: darkblue !important;;
+    }
+  }
+
+  &__teacher {
+    margin-top: 5px;
+    &-title {
+      color: $graytext;
+    }
+    &-content {
+      color: darkblue !important;;
+    }
+  }
+
+  &__quota {
+    margin-top: 5px;
+    &-title {
+      color: $graytext;
+    }
+    &-content {
+
+    }
+  }
+
+  &__img {
+    width: 100px;
+    height: 100px;
+    padding: 10px;
+  }
+
+}

src/components/CMyCardGood/CMyCardGood.ts

@@ -0,0 +1,136 @@
+import { computed, defineComponent, onMounted, PropType, ref, watch } from 'vue'
+
+import { CMyFieldDb } from '@/components/CMyFieldDb'
+import { CTitleBanner } from '@/components/CTitleBanner'
+import { CProfile } from '@/components/CProfile'
+import { CDateTime } from '@/components/CDateTime'
+import { CMyPage } from '@/components/CMyPage'
+import { CMyFieldRec } from '@/components/CMyFieldRec'
+import { CMyUser } from '@/components/CMyUser'
+import { CGalleryImages } from '@/components/CGalleryImages'
+import { CAccomodation } from '@/components/CAccomodation'
+import { tools } from '@store/Modules/tools'
+import { useUserStore } from '@store/UserStore'
+import { useCalendarStore } from '@store/CalendarStore'
+import { useGlobalStore } from '@store/globalStore'
+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 { shared_consts } from '@/common/shared_vuejs'
+import { colCitys, fieldsTable } from '@store/Modules/fieldsTable'
+import { useRoute } from 'vue-router'
+import { useNotifStore } from '@store/NotifStore'
+
+export default defineComponent({
+  name: 'CMyCardGood',
+  components: { CProfile, CTitleBanner,
+    CMyFieldDb, CDateTime, CMyPage, CMyFieldRec, CAccomodation,
+    CMyUser, CGalleryImages },
+  props: {
+    table: {
+      type: String,
+      required: true,
+    },
+    prop_myrec: {
+      type: Object as PropType<any>,
+      required: false,
+      default: null,
+    },
+    idRec: {
+      type: Number,
+      required: false,
+      default: 0
+    },
+    nopopup: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+  },
+  setup(props) {
+
+    const userStore = useUserStore()
+    const calendarStore = useCalendarStore()
+    const notifStore = useNotifStore()
+    const globalStore = useGlobalStore()
+    const $q = useQuasar()
+    const $route = useRoute()
+    const { t } = useI18n()
+
+    const showPic = ref(false)
+
+    const myrec = ref(<any>{})
+    const col = ref(<IColGridTable>{})
+
+    const idnotif = computed(() => $route.query.idnotif ? $route.query.idnotif.toString() : '')
+
+    function profile() {
+      return userStore.my.profile
+    }
+
+    function load() {
+      // Carica il profilo di quest'utente
+      if (props.idRec) {
+        userStore.loadGeneric(props.table, props.idRec, idnotif.value).then((ris) => {
+          myrec.value = ris
+          notifStore.setAsRead(idnotif.value)
+        })
+
+      } else {
+        myrec.value = props.prop_myrec
+      }
+
+      col.value = fieldsTable.getArrColsByTable(props.table)
+    }
+
+    watch(() => props.idRec, (to: any, from: any) => {
+      load()
+    })
+
+    function mounted() {
+      load()
+    }
+
+    function getlinkpage() {
+      return self.location.host + tools.getPathByTable(props.table, myrec.value._id)
+    }
+    function condividipag() {
+      const mystr = getlinkpage()
+      tools.copyStringToClipboard($q, mystr, true)
+      tools.sendMsgTelegramCmd($q, t, shared_consts.MsgTeleg.SHARE_TEXT, false, mystr)
+      return true
+    }
+
+    function showBadge() {
+      if (shared_consts.TABLES_SHOW_ADTYPE.includes(props.table)) {
+        return true
+      }
+
+      return false
+    }
+
+    onMounted(mounted)
+
+    return {
+      profile,
+      tools,
+      costanti,
+      myrec,
+      shared_consts,
+      globalStore,
+      showPic,
+      userStore,
+      t,
+      fieldsTable,
+      colCitys,
+      toolsext,
+      col,
+      condividipag,
+      showBadge,
+      getlinkpage,
+      calendarStore,
+    }
+  }
+})

src/components/CMyCardGood/CMyCardGood.vue

@@ -0,0 +1,252 @@
+<template>
+  <div v-if="myrec._id" class="fulldiv">
+    <div class="q-pa-sm row items-start q-gutter-sm full-height fulldiv">
+      <q-card class="my-card fulldiv" bordered>
+        <CGalleryImages
+          v-if="myrec.photos.length > 0"
+          :imgGallery="myrec.photos"
+          :directory="'upload/' + tools.getDirectoryGall(myrec, table, '')"
+        >
+        </CGalleryImages>
+
+        <q-card-actions align="right">
+          <q-btn
+            flat
+            round
+            :color="userStore.isFavorite(myrec._id, table) ? 'red' : ''"
+            icon="favorite"
+            @click="
+              userStore.setFavorite($q, t, myrec._id, toolsext.TABMYGOODS)
+            "
+          />
+          <q-btn
+            flat
+            round
+            :color="userStore.isBookmarked(myrec._id, table) ? 'teal' : ''"
+            icon="bookmark"
+            @click="
+              userStore.setBookmark($q, t, myrec._id, toolsext.TABMYGOODS)
+            "
+          />
+          <q-btn
+            flat
+            round
+            color="primary"
+            icon="share"
+            @click="tools.copyToClip($q, getlinkpage(), true)"
+          />
+        </q-card-actions>
+        <q-separator />
+
+        <q-list>
+          <q-item clickable>
+            <q-item-section avatar>
+              <div v-if="showBadge()" class="text-center">
+                <q-chip
+                  dense
+                  :color="fieldsTable.getColByAdType(myrec.adType)"
+                  text-color="white"
+                  >{{
+                    fieldsTable.getValByTabAndId(table, 'adType', myrec.adType)
+                  }}
+                </q-chip>
+              </div>
+            </q-item-section>
+
+            <q-item-section>
+              <q-item-label class="text-bold text-h7">{{
+                myrec.descr
+              }}</q-item-label>
+            </q-item-section>
+          </q-item>
+          <q-item>
+            <q-item-section avatar>
+              <q-icon color="blue" name="category" />
+            </q-item-section>
+
+            <q-item-section>
+              <q-item-label>
+                <q-chip
+                  v-if="myrec.sectorGood && myrec.sectorGood[0].descr"
+                  class="glossy"
+                  color="blue"
+                  text-color="white"
+                  dense
+                >
+                  <span class="cal__quota-content">{{
+                    myrec.sectorGood[0].descr
+                  }}</span>
+                </q-chip>
+                <q-chip
+                  v-if="myrec.recGood.length > 0 && myrec.recGood[0].descr"
+                  class="glossy"
+                  dense
+                  color="blue"
+                  text-color="white"
+                >
+                  <span class="cal__quota-content">{{
+                    myrec.recGood[0].descr
+                  }}</span>
+                </q-chip>
+              </q-item-label>
+            </q-item-section>
+          </q-item>
+          <q-item-label v-if="myrec.note"
+            ><div v-html="myrec.note" class="clBorderService"></div
+          ></q-item-label>
+
+          <q-card class="my-card clBorderUser" bordered>
+            <CMyUser
+              :mycontact="myrec"
+              :visu="costanti.FIND_PEOPLE"
+              @setCmd="tools.setCmd"
+            >
+            </CMyUser>
+          </q-card>
+          <q-item v-if="myrec.mycities[0].comune">
+            <q-item-section avatar>
+              <q-icon color="amber" name="fas fa-map-marker-alt" />
+            </q-item-section>
+            <q-item-section>
+              <q-item-label>
+                <span v-for="(city, index) in myrec.mycities" :key="index">
+                  <span v-if="city.comune">
+                    {{ city.comune }} ({{ city.prov }})</span
+                  ><span v-if="myrec.mycities.length > 1"> - </span>
+                </span>
+              </q-item-label>
+              <q-item-label v-if="myrec.profile.qualifica" caption>{{
+                myrec.biografia
+              }}</q-item-label>
+            </q-item-section>
+          </q-item>
+          <q-item clickable v-if="myrec.website">
+            <q-item-section avatar>
+              <q-icon color="blue" name="fas fa-globe" />
+            </q-item-section>
+
+            <q-item-section>
+              <q-item-label lines="1">
+                <span v-html="tools.getlinkhref(myrec.website, 'Visita il Sito Web')"
+              /></q-item-label>
+            </q-item-section>
+          </q-item>
+          <q-item v-if="myrec.idContribType && myrec.idContribType.length > 0">
+            <q-item-section avatar>
+              <q-icon color="green" name="fas fa-hand-holding" />
+            </q-item-section>
+
+            <q-item-section>
+              <q-item-label>
+                <span
+                  v-for="(reccontr, index) in myrec.idContribType"
+                  :key="index"
+                >
+                  <q-chip
+                    dense
+                    :color="calendarStore.getColByContribType(reccontr)"
+                    text-color="white"
+                  >
+                    {{ calendarStore.getContribtypeById(reccontr) }}
+                  </q-chip>
+                </span>
+              </q-item-label>
+            </q-item-section>
+          </q-item>
+          <q-item>
+            <q-item-section avatar>
+              <q-icon color="blue" name="far fa-edit" />
+            </q-item-section>
+
+            <q-item-section>
+              <q-item-label
+                ><span v-if="myrec.date_updated">{{
+                  tools.getstrDateMonthLong(myrec.date_updated)
+                }}</span
+                ><span v-else>{{
+                  tools.getstrDateMonthLong(myrec.date_created)
+                }}</span></q-item-label
+              >
+            </q-item-section>
+          </q-item>
+          <q-item clickable v-if="false">
+            <q-item-section avatar>
+              <q-icon color="red" name="local_gas_station" />
+            </q-item-section>
+
+            <q-item-section>
+              <q-item-label></q-item-label>
+              <q-item-label caption>Fill your gas tank.</q-item-label>
+            </q-item-section>
+          </q-item>
+        </q-list>
+        <q-separator />
+        <div class="q-mb-xl"></div>
+        <q-card-actions
+          v-if="$q.screen.gt.sm"
+          class="text-center justify-center"
+        >
+          <q-btn
+            v-if="myrec.profile.username_telegram"
+            :label="$t('dialog.contact')"
+            color="primary"
+            icon="far fa-comment"
+            target="_blank"
+            :type="tools.isUserOk() ? 'a' : 'btn'"
+            size="md"
+            rounded
+            :href="
+              tools.isUserOk()
+                ? tools.getHttpForTelegram(myrec.profile.username_telegram)
+                : null
+            "
+          />
+          <q-btn
+            rounded
+            outline
+            :label="$t('dialog.close')"
+            color="primary"
+            icon="close"
+            v-close-popup
+          />
+        </q-card-actions>
+      </q-card>
+      <div
+        v-if="!$q.screen.gt.sm"
+        class="row absolute-bottom text-shadow custom-caption q-px-md buttons_bottom"
+      >
+        <q-btn
+          v-if="myrec.profile.username_telegram"
+          :label="$t('dialog.contact')"
+          color="primary"
+          icon="far fa-comment"
+          target="_blank"
+          :type="tools.isUserOk() ? 'a' : 'btn'"
+          size="md"
+          rounded
+          :href="
+            tools.isUserOk()
+              ? tools.getHttpForTelegram(myrec.profile.username_telegram)
+              : null
+          "
+        />
+        <q-btn
+          rounded
+          outline
+          :label="$t('dialog.close')"
+          color="primary"
+          icon="close"
+          v-close-popup
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" src="./CMyCardGood.ts">
+</script>
+
+<style lang="scss" scoped>
+@import './CMyCardGood.scss';
+</style>
+

src/components/CMyCardGood/index.ts

@@ -0,0 +1 @@
+export { default as CMyCardGood } from './CMyCardGood.vue'

src/components/CMyCardGrpPopup/CMyCardGrpPopup.ts

@@ -61,7 +61,7 @@ export default defineComponent({
 
     function load() {
       // Carica il profilo di quest'utente
-      if (props.idRec && props.idRec > 0) {
+      if (props.idRec) {
         userStore.loadGeneric(props.table, props.idRec, idnotif.value).then((ris) => {
           myrec.value = ris
           notifStore.setAsRead(idnotif.value)

src/components/CMyCardService/CMyCardService.ts

@@ -5,8 +5,10 @@ import { CTitleBanner } from '@/components/CTitleBanner'
 import { CProfile } from '@/components/CProfile'
 import { CDateTime } from '@/components/CDateTime'
 import { CMyPage } from '@/components/CMyPage'
+import { CMyChipList } from '@/components/CMyChipList'
 import { CMyFieldRec } from '@/components/CMyFieldRec'
 import { CMyUser } from '@/components/CMyUser'
+import { CGalleryImages } from '@/components/CGalleryImages'
 import { CAccomodation } from '@/components/CAccomodation'
 import { tools } from '@store/Modules/tools'
 import { useUserStore } from '@store/UserStore'
@@ -19,14 +21,16 @@ import { costanti } from '@costanti'
 import { IColGridTable, IImgGallery, IUserFields } from 'model'
 import { shared_consts } from '@/common/shared_vuejs'
 import { colCitys, fieldsTable } from '@store/Modules/fieldsTable'
-import { useRoute } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import { useNotifStore } from '@store/NotifStore'
 
 export default defineComponent({
   name: 'CMyCardService',
-  components: { CProfile, CTitleBanner,
+  components: {
+    CProfile, CTitleBanner,
     CMyFieldDb, CDateTime, CMyPage, CMyFieldRec, CAccomodation,
-    CMyUser },
+    CMyUser, CGalleryImages, CMyChipList
+  },
   props: {
     table: {
       type: String,
@@ -60,6 +64,10 @@ export default defineComponent({
 
     const showPic = ref(false)
 
+    const $router = useRouter()
+
+    const usersList = ref({ show: false, title: '', list: [] })
+
     const myrec = ref(<any>{})
     const col = ref(<IColGridTable>{})
 
@@ -71,7 +79,7 @@ export default defineComponent({
 
     function load() {
       // Carica il profilo di quest'utente
-      if (props.idRec > 0) {
+      if (props.idRec) {
         userStore.loadGeneric(props.table, props.idRec, idnotif.value).then((ris) => {
           myrec.value = ris
           notifStore.setAsRead(idnotif.value)
@@ -110,6 +118,54 @@ export default defineComponent({
       return false
     }
 
+    function getRecGoodSkillByRec(rec: any) {
+      if (props.table === 'myskills')
+        return rec.recSkill
+      else if (props.table === 'mygoods')
+        return rec.recGood
+
+      return null
+    }
+
+    function getSectorByRec(rec: any) {
+      if (props.table === 'myskills')
+        return rec.sector
+      else if (props.table === 'mygoods')
+        return rec.sectorGood
+
+      return null
+    }
+
+    function clicca(tipo: any, set: any, title: string) {
+      if (set && myrec.value.username !== userStore.my.username && tipo === costanti.TIPOFAVBOOK.FAVORITE) {
+        userStore.setFavorite($q, t, myrec.value._id, props.table, myrec.value);
+      }
+      if (set && myrec.value.username !== userStore.my.username && tipo === costanti.TIPOFAVBOOK.BOOKMARK) {
+        userStore.setBookmark($q, t, myrec.value._id, props.table, myrec.value);
+      }
+
+      if (!set) {
+        usersList.value.show = true;
+        usersList.value.title = title;
+        usersList.value.list = myrec.value.myfav;
+      }
+    }
+
+    function naviga(path: string) {
+      $router.push(path)
+    }
+
+    function getTypeHosps() {
+      let obj = null
+      if (myrec.value.typeHosp) {
+        obj = globalStore.getRecordByTableSingle(toolsext.TABTYPEHOSP, myrec.value.typeHosp)
+        if (obj)
+          return obj.label
+      }
+
+      return obj
+    }
+
     onMounted(mounted)
 
     return {
@@ -130,6 +186,12 @@ export default defineComponent({
       showBadge,
       getlinkpage,
       calendarStore,
+      getSectorByRec,
+      getRecGoodSkillByRec,
+      usersList,
+      clicca,
+      naviga,
+      getTypeHosps,
     }
   }
 })

src/components/CMyCardService/CMyCardService.vue

@@ -1,23 +1,116 @@
 <template>
-  <div v-if="myrec._id">
+  <div v-if="myrec && myrec._id" class="fulldiv">
-    <div class="q-pa-sm row items-start q-gutter-sm">
+    <div class="q-pa-sm row items-start q-gutter-sm full-height fulldiv">
-      <q-card class="my-card" bordered>
+      <q-card class="my-card fulldiv" bordered>
-        <q-img
+        <CGalleryImages
           v-if="myrec.photos.length > 0"
-          :src="myrec.photos[0].imagefile"
+          :imgGallery="myrec.photos"
-          class="imgautosize"
+          :directory="'upload/' + tools.getDirectoryGall(myrec, table, '')"
-          :alt="myrec.descr">
+        >
-        </q-img>
+        </CGalleryImages>
+
         <q-card-actions align="right">
-          <q-btn flat round :color="userStore.isFavorite(myrec._id, table) ? 'red' : ''" icon="favorite" @click="userStore.setFavorite($q, t, myrec._id, shared_consts.TABMYSKILLS)" />
+          <div class="">
-          <q-btn flat round :color="userStore.isBookmarked(myrec._id, table) ? 'teal' : ''" icon="bookmark" @click="userStore.setBookmark($q, t, myrec._id, shared_consts.TABMYSKILLS)"/>
+            <q-btn
-          <q-btn
+              flat
-            flat
+              round
-            round
+              :color="userStore.isFavorite(myrec._id, table) ? 'red' : ''"
-            color="primary"
+              icon="favorite"
-            icon="share"
+              @click="clicca(costanti.TIPOFAVBOOK.FAVORITE, true)"
-            @click="tools.copyToClip($q, getlinkpage(), true)"
+            >
-          />
+              <q-badge
+                v-if="myrec.myfav"
+                color="primary"
+                :label="myrec.myfav.length"
+                floating
+                transparent
+              />
+            </q-btn>
+          </div>
+          <div class="">
+            <q-btn
+              flat
+              round
+              :color="userStore.isBookmarked(myrec._id, table) ? 'teal' : ''"
+              icon="bookmark"
+              @click="clicca(costanti.TIPOFAVBOOK.BOOKMARK, true)"
+            >
+              <q-badge
+                v-if="myrec.mybook"
+                color="primary"
+                :label="myrec.mybook.length"
+                floating
+                transparent
+              />
+            </q-btn>
+          </div>
+          <div>
+            <q-btn
+              flat
+              round
+              color="primary"
+              icon="share"
+              @click="tools.copyToClip($q, getlinkpage(), true)"
+            />
+          </div>
+          <div>
+            <q-btn flat round icon="fas fa-ellipsis-h">
+              <q-menu>
+                <q-list v-if="true" style="min-width: 150px">
+                  <q-item
+                    v-if="!nopopup"
+                    clickable
+                    v-close-popup
+                    @click="naviga(tools.getPathByTableAndRec(table, myrec))"
+                  >
+                    <q-item-section avatar>
+                      <q-icon color="blue" name="fas fa-globe" />
+                    </q-item-section>
+                    <q-item-section>
+                      {{ $t('event.openpage') }}
+                    </q-item-section>
+                  </q-item>
+                  <q-separator />
+                  <q-item
+                    clickable
+                    v-close-popup
+                    @click="
+                      clicca(
+                        costanti.TIPOFAVBOOK.FAVORITE,
+                        false,
+                        $t('cmd.favorite')
+                      )
+                    "
+                  >
+                    <q-item-section avatar>
+                      <q-icon color="red" name="favorite" />
+                    </q-item-section>
+                    <q-item-section>
+                      {{ $t('cmd.favorite') }}
+                    </q-item-section>
+                  </q-item>
+                  <q-item
+                    clickable
+                    v-close-popup
+                    @click="
+                      clicca(
+                        costanti.TIPOFAVBOOK.BOOKMARK,
+                        false,
+                        $t('cmd.bookmark')
+                      )
+                    "
+                  >
+                    <q-item-section avatar>
+                      <q-icon color="teal" name="bookmark" />
+                    </q-item-section>
+                    <q-item-section>
+                      {{ $t('cmd.bookmark') }}
+                    </q-item-section>
+                  </q-item>
+                </q-list>
+              </q-menu>
+            </q-btn>
+          </div>
         </q-card-actions>
         <q-separator />
 
@@ -37,12 +130,19 @@
             </q-item-section>
 
             <q-item-section>
+              <q-item-label v-if="myrec.typeHosp" class="text-bold text-h7">
+                <q-chip dense color="green" text-color="white"
+                  >{{ getTypeHosps() }}
+                </q-chip>
+              </q-item-label>
+
               <q-item-label class="text-bold text-h7">{{
                 myrec.descr
               }}</q-item-label>
             </q-item-section>
           </q-item>
-          <q-item>
+
+          <q-item v-if="getSectorByRec(myrec)">
             <q-item-section avatar>
               <q-icon color="blue" name="category" />
             </q-item-section>
@@ -50,30 +150,88 @@
             <q-item-section>
               <q-item-label>
                 <q-chip
-                  v-if="myrec.sector && myrec.sector[0].descr"
+                  v-if="getSectorByRec(myrec) && getSectorByRec(myrec)[0].descr"
                   class="glossy"
                   color="blue"
                   text-color="white"
                   dense
                 >
                   <span class="cal__quota-content">{{
-                    myrec.sector[0].descr
+                    getSectorByRec(myrec)[0].descr
                   }}</span>
                 </q-chip>
                 <q-chip
-                  v-if="myrec.recSkill.length > 0 && myrec.recSkill[0].descr"
+                  v-if="
+                    getRecGoodSkillByRec(myrec) &&
+                    getRecGoodSkillByRec(myrec).length > 0 &&
+                    getRecGoodSkillByRec(myrec)[0].descr
+                  "
                   class="glossy"
                   dense
                   color="blue"
                   text-color="white"
                 >
                   <span class="cal__quota-content">{{
-                    myrec.recSkill[0].descr
+                    getRecGoodSkillByRec(myrec)[0].descr
                   }}</span>
                 </q-chip>
               </q-item-label>
             </q-item-section>
           </q-item>
+          <q-item v-if="myrec.numMaxPeopleHosp" class="q-mt-sm">
+            <q-item-section avatar>
+              <q-icon color="blue" name="fas fa-users" />
+            </q-item-section>
+            <q-item-section>
+              <q-item-label class="q-px-xs q-ma-xs">
+                <span class="accom_maxosp">{{ myrec.numMaxPeopleHosp }}</span
+                >{{ t('hosps.numMaxPeopleHosp') }}
+              </q-item-label>
+            </q-item-section>
+          </q-item>
+          <q-item v-if="!!myrec.accomodation && myrec.accomodation.length > 0">
+            <q-item-section avatar>
+              <q-icon color="orange" name="fas fa-bed" />
+            </q-item-section>
+            <q-item-section>
+              <q-item-label>
+                <CAccomodation
+                  v-if="!!myrec.accomodation"
+                  :mylist="myrec.accomodation"
+                  :isInModif="false"
+                  :edit="false"
+                  :canModify="false"
+                >
+                </CAccomodation>
+              </q-item-label>
+            </q-item-section>
+          </q-item>
+          <q-item v-if="!!myrec.preferences && myrec.preferences.length > 0">
+            <q-item-section avatar>
+              <q-icon color="red" name="fas fa-asterisk" />
+            </q-item-section>
+            <q-item-section>
+              <q-item-label>
+                <CMyChipList
+                  :rec="myrec"
+                  :type="costanti.FieldType.multiselect"
+                  :value="myrec.preferences"
+                  :options="
+                    globalStore.getTableJoinByName(
+                      toolsext.TABPREF,
+                      false,
+                      false,
+                      null
+                    )
+                  "
+                  :optval="fieldsTable.getKeyByTable(toolsext.TABPREF)"
+                  :optlab="fieldsTable.getLabelByTable(toolsext.TABPREF)"
+                  :opticon="fieldsTable.getIconByTable(toolsext.TABPREF)"
+                ></CMyChipList>
+              </q-item-label>
+            </q-item-section>
+          </q-item>
+          <q-separator />
           <q-item-label v-if="myrec.note"
             ><div v-html="myrec.note" class="clBorderService"></div
           ></q-item-label>
@@ -109,7 +267,26 @@
             </q-item-section>
 
             <q-item-section>
-              <q-item-label>{{ myrec.website }}</q-item-label>
+              <q-item-label lines="1">
+                <span
+                  v-html="
+                    tools.getlinkhref(myrec.website, 'Visita il Sito Web')
+                  "
+              /></q-item-label>
+            </q-item-section>
+          </q-item>
+          <q-item clickable v-if="myrec.link_maplocation">
+            <q-item-section avatar>
+              <q-icon color="blue" name="fas fa-map-marker-alt" />
+            </q-item-section>
+
+            <q-item-section>
+              <q-item-label lines="1">
+                <span
+                  v-html="
+                    tools.getlinkhref(myrec.link_maplocation, 'Apri Mappa')
+                  "
+              /></q-item-label>
             </q-item-section>
           </q-item>
           <q-item v-if="myrec.idContribType && myrec.idContribType.length > 0">
@@ -162,7 +339,11 @@
           </q-item>
         </q-list>
         <q-separator />
-        <q-card-actions align="center">
+        <div class="q-mb-xl"></div>
+        <q-card-actions
+          v-if="$q.screen.gt.sm || nopopup"
+          class="text-center justify-center"
+        >
           <q-btn
             v-if="myrec.profile.username_telegram"
             :label="$t('dialog.contact')"
@@ -172,9 +353,14 @@
             :type="tools.isUserOk() ? 'a' : 'btn'"
             size="md"
             rounded
-            :href="tools.isUserOk() ? tools.getHttpForTelegram(myrec.profile.username_telegram) : null"
+            :href="
+              tools.isUserOk()
+                ? tools.getHttpForTelegram(myrec.profile.username_telegram)
+                : null
+            "
           />
           <q-btn
+            v-if="!nopopup"
             rounded
             outline
             :label="$t('dialog.close')"
@@ -184,169 +370,58 @@
           />
         </q-card-actions>
       </q-card>
+      <div
+        v-if="!$q.screen.gt.sm || !nopopup"
+        class="row absolute-bottom text-shadow custom-caption q-px-md buttons_bottom"
+      >
+        <q-btn
+          v-if="myrec.profile.username_telegram"
+          :label="$t('dialog.contact')"
+          color="primary"
+          icon="far fa-comment"
+          target="_blank"
+          :type="tools.isUserOk() ? 'a' : 'btn'"
+          size="md"
+          rounded
+          :href="
+            tools.isUserOk()
+              ? tools.getHttpForTelegram(myrec.profile.username_telegram)
+              : null
+          "
+        />
+        <q-btn
+          v-if="!nopopup"
+          rounded
+          outline
+          :label="$t('dialog.close')"
+          color="primary"
+          icon="close"
+          v-close-popup
+        />
+      </div>
     </div>
   </div>
+  <q-dialog v-model="usersList.show">
+    <q-card class="dialog_card">
+      <q-toolbar class="bg-primary text-white">
+        <q-toolbar-title>
+          {{ usersList.title }}
+        </q-toolbar-title>
+        <q-btn flat round color="white" icon="close" v-close-popup></q-btn>
+      </q-toolbar>
 
-  <q-card class="dialog_card q-mb-lg" v-if="myrec._id && false">
+      <q-card-section class="inset-shadow">
-    <q-footer
+        <div v-for="(rec, i) in usersList.list" :key="i">
-      v-if="!nopopup"
+          <CMyUser
-      :class="
+            :mycontact="rec"
-        ($q.dark.isActive ? `bg-black` : `bg-white`) +
+            :visu="costanti.FIND_PEOPLE"
-        ` small-screen-only text-center`
+            @setCmd="tools.setCmd"
-      "
-      bordered
-    >
-      <q-btn
-        push
-        rounded
-        color="primary"
-        icon="close"
-        label="Chiudi"
-        v-close-popup
-      ></q-btn>
-    </q-footer>
-    <q-bar v-if="!nopopup" dense class="bg-primary text-white">
-      {{ myrec.username }}
-      <q-space />
-      <q-btn flat round color="white" icon="close" v-close-popup></q-btn>
-    </q-bar>
-    <q-card-section class="inset-shadow">
-      <!-- Per ora visualizzo solo la Prima Immagine -->
-      <div class="text-center">
-        <q-img
-          v-if="tools.getValue(myrec, 'photos', '')"
-          :src="
-            tools.getFullFileName(
-              tools.getValue(myrec, 'photos', ''),
-              table,
-              myrec.username,
-              myrec.groupname
-            )
-          "
-          class="img"
-          alt="immagine bene"
-        ></q-img>
-      </div>
-
-      <div v-if="showBadge()" class="text-center">
-        <q-chip
-          :icon="fieldsTable.getIconByAdType(myrec.adType)"
-          :color="fieldsTable.getColByAdType(myrec.adType)"
-          text-color="white"
-          >{{ fieldsTable.getValByTabAndId(table, 'adType', myrec.adType) }}
-        </q-chip>
-      </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)
-            )
-          "
-        >
-          <div v-if="mycol.fieldtype === costanti.FieldType.html">
-            <div
-              class="note-bacheca"
-              v-html="tools.getValue(myrec, mycol.field, mycol.subfield)"
-            ></div>
-          </div>
-          <div v-else-if="mycol.name === 'descr'">
-            <div class="text-bacheca">
-              {{ tools.getValue(myrec, mycol.field, mycol.subfield) }}
-            </div>
-          </div>
-          <div v-else-if="mycol.name === 'numMaxPeopleHosp'">
-            <div class="text-bacheca">
-              <span class="accom_maxosp">{{
-                tools.getValue(myrec, mycol.field, mycol.subfield)
-              }}</span
-              >{{ t('hosps.numMaxPeopleHosp') }}
-            </div>
-          </div>
-          <div
-            v-else-if="mycol.name === 'dateTimeStart'"
-            class="text-center cal"
           >
-            <div v-if="myrec.dateTimeStart" class="cal__when">
+          </CMyUser>
-              <span class="cal__where-title">{{ $t('cal.when') }}:</span>
-              <span v-html="tools.getstrDateTimeEvent(t, myrec, true)"></span>
-            </div>
-            <!--
-            <span class="dateevent" v-if="myrec.dateTimeStart">dal <span class="datainizio">{{
-                tools.getstrVeryShortDate(myrec.dateTimeStart)
-              }}</span> al <span class="datafine">{{ tools.getstrVeryShortDate(myrec.dateTimeEnd) }}</span>
-            </span>--->
-          </div>
-          <div v-else-if="mycol.name === 'accomodation'">
-            <CAccomodation
-              v-if="!!myrec.accomodation"
-              :mylist="myrec.accomodation"
-              :isInModif="false"
-              :edit="false"
-              :canModify="false"
-            >
-            </CAccomodation>
-          </div>
-          <div v-else-if="mycol.name === 'dateTimeEnd'"></div>
-          <CMyFieldRec
-            v-else
-            :table="table"
-            :id="myrec._id"
-            :rec="myrec"
-            :field="mycol.field"
-            :canEdit="false"
-            :canModify="false"
-          >
-          </CMyFieldRec>
         </div>
-      </div>
+      </q-card-section>
-
+    </q-card>
-      <br />
+  </q-dialog>
-      <div v-if="myrec.date_created" class="row justify-center">
-        <span class="cal__where-title"> {{ $t('reg.pub_created') }}:</span>
-        <span v-html="tools.getstrDate(myrec.date_created)"></span>
-      </div>
-      <div
-        v-if="
-          tools.getstrDate(myrec.date_updated) !==
-          tools.getstrDate(myrec.date_created)
-        "
-        class="row justify-center"
-      >
-        <span class="cal__where-title"> {{ $t('reg.pub_updated') }}:</span>
-        <span v-html="tools.getstrDate(myrec.date_updated)"></span>
-      </div>
-
-      <div v-if="!nopopup" class="row q-ma-sm q-pa-sm justify-center">
-        <div class="q-ma-sm">
-          <q-btn
-            icon="far fa-file-alt"
-            label="Apri"
-            color="primary"
-            text-color="white"
-            :to="tools.getToByCol(col, table, myrec)"
-          />
-        </div>
-        <div class="q-ma-sm">
-          <q-btn
-            v-if="myrec._id"
-            :text-color="$q.dark.isActive ? `white` : `black`"
-            icon="fas fa-link"
-            label="Condividi"
-            @click="condividipag"
-          ></q-btn>
-        </div>
-      </div>
-      <br /><br />
-      myrec: {{ myrec }}
-    </q-card-section>
-  </q-card>
 </template>
 
 <script lang="ts" src="./CMyCardService.ts">

src/components/CMyUser/CMyUser.vue

@@ -43,7 +43,7 @@
         <q-item-label v-if="labelFooter" lines="1"
           ><em>{{ labelFooter }}</em></q-item-label
         >
-        <span v-if="contact.profile.resid_province" class="show_province_title">Prov: <span class="show_province">{{ contact.profile.resid_province }}</span></span>
+        <span v-if="contact.profile && contact.profile.resid_province" class="show_province_title">Prov: <span class="show_province">{{ contact.profile.resid_province }}</span></span>
         <q-item-label v-if="contact.account" caption lines="2">
           <CSaldo
             :small="true"

src/components/CSkill/CSkill.ts

@@ -115,6 +115,8 @@ export default defineComponent({
             idStatusSkill: 1,
             idContribType: 1,
             'profile.username_telegram': 1,
+            'profile.favorite': 1,
+            'profile.bookmark': 1,
             idCity: 1,
             pub_to_share: 1,
             numLevel: 1,
@@ -155,6 +157,8 @@ export default defineComponent({
             idStatusSkill: 1,
             idContribType: 1,
             'profile.username_telegram': 1,
+            'profile.favorite': 1,
+            'profile.bookmark': 1,
             idCity: 1,
             pub_to_share: 1,
             numLevel: 1,
@@ -195,6 +199,8 @@ export default defineComponent({
             idStatusSkill: 1,
             idContribType: 1,
             'profile.username_telegram': 1,
+            'profile.favorite': 1,
+            'profile.bookmark': 1,
             idCity: 1,
             pub_to_share: 1,
             numLevel: 1,
@@ -259,6 +265,8 @@ export default defineComponent({
             idStatusSkill: 1,
             idContribType: 1,
             'profile.username_telegram': 1,
+            'profile.favorite': 1,
+            'profile.bookmark': 1,
             idCity: 1,
             pub_to_share: 1,
             numLevel: 1,
@@ -300,6 +308,8 @@ export default defineComponent({
             idStatusSkill: 1,
             idContribType: 1,
             'profile.username_telegram': 1,
+            'profile.favorite': 1,
+            'profile.bookmark': 1,
             idCity: 1,
             pub_to_share: 1,
             numLevel: 1,
@@ -341,6 +351,8 @@ export default defineComponent({
             idStatusSkill: 1,
             idContribType: 1,
             'profile.username_telegram': 1,
+            'profile.favorite': 1,
+            'profile.bookmark': 1,
             idCity: 1,
             pub_to_share: 1,
             numLevel: 1,

src/components/CSkill/CSkill.vue

@@ -7,6 +7,7 @@
         :prop_mytitle="title"
         :prop_mycolumns="col"
         :prop_colkey="prop_colkey"
+        :options="tools.optionsTable(table)"
         :col_title="col_title"
         :col_footer="col_footer"
         :vertical="costanti.VISUTABLE_LISTA"

src/css/app.scss

@@ -2,11 +2,18 @@ body {
   font-family: 'Source Sans Pro', 'Helvetica Neue', Arial, sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  color: #333333;
   line-height: 1.5;
   //font-size: 1rem;
 }
 
+body.body--light {
+  color: #333333;
+}
+
+body.body--dark {
+  color: #AAAAAA;
+}
+
 .text-mycol {
   color: #333333 !important;
 }
@@ -323,8 +330,8 @@ h3 {
   min-width: 250px;
   padding: 1rem 1rem;
 
-  @media (max-width: 500px) {
+  @media (max-width: 800px) {
-    max-width: 400px;
+    max-width: 600px;
     min-width: 250px;
   }
 
@@ -684,6 +691,7 @@ h3 {
   font-size: 1rem;
   padding: 6px;
 }
+
 .clBorderUser {
   border-radius: 16px;
   font-size: 1rem;
@@ -820,7 +828,8 @@ h3 {
   border: solid 2px #49b502;
 }
 
-.bordo_stondato_pending, .bordo_quadrato_pending {
+.bordo_stondato_pending,
+.bordo_quadrato_pending {
   margin: 4px;
   padding-left: 14px;
   padding-right: 14px;
@@ -1017,7 +1026,8 @@ h3 {
   place-content: center;
 }
 
-.combowidth, .comboselector {
+.combowidth,
+.comboselector {
   min-width: 190px;
 
   @media (max-width: 450px) {
@@ -1389,6 +1399,7 @@ h3 {
 .anim_toBottom {
   animation: moveToBottom 2s ease-in-out;
 }
+
 .anim_toRight {
   animation: moveToRight 2s ease-in-out;
 }
@@ -1414,100 +1425,222 @@ h3 {
 }
 
 
-.film, .effect {
+.film,
-	width: 100%;
+.effect {
-	height: 100%;
+  width: 100%;
-	filter: blur(0.45px) drop-shadow(0px 0px 0px #fff1);
+  height: 100%;
+  filter: blur(0.45px) drop-shadow(0px 0px 0px #fff1);
 }
 
-.film:after, .effect:after {
+.film:after,
-	content: '';
+.effect:after {
-	width: 120%;
+  content: '';
-	height: 100%;
+  width: 120%;
-	top: 0;
+  height: 100%;
-	left: 0;
+  top: 0;
-	padding-left: 100px;
+  left: 0;
-	opacity: 0.5;
+  padding-left: 100px;
-	animation: film-scratch 0.45s steps(1) infinite;
+  opacity: 0.5;
-	background: repeating-linear-gradient(90deg, #0002 0 2px, transparent 4px 37vmin);
+  animation: film-scratch 0.45s steps(1) infinite;
+  background: repeating-linear-gradient(90deg, #0002 0 2px, transparent 4px 37vmin);
 }
 
 .effect:after {
-	left: 30%;
+  left: 30%;
-	animation: effect-scratch 2s infinite;
+  animation: effect-scratch 2s infinite;
 }
 
 .grain {
-	width: 100%;
+  width: 100%;
-	height: 100%;
+  height: 100%;
 }
 
 .grain:after {
-	content: '';
+  content: '';
-	width: 110%;
+  width: 110%;
-	height: 110%;
+  height: 110%;
-	top: -5%;
+  top: -5%;
-	left: -5%;
+  left: -5%;
-	opacity: .25;
+  opacity: .25;
-	background-image:
+  background-image:
-		repeating-conic-gradient(var(--black) 0%, transparent .00003%, transparent .0005%, transparent .00095%),
+    repeating-conic-gradient(var(--black) 0%, transparent .00003%, transparent .0005%, transparent .00095%),
-		repeating-conic-gradient(var(--black) 0%, transparent .00005%, transparent 0.00015%, transparent 0.0009%);
+    repeating-conic-gradient(var(--black) 0%, transparent .00005%, transparent 0.00015%, transparent 0.0009%);
-	animation: grain 0.5s steps(1) infinite;
+  animation: grain 0.5s steps(1) infinite;
-	filter: drop-shadow(0px 0px 1px black);
+  filter: drop-shadow(0px 0px 1px black);
 }
 
 @keyframes grain {
-	0%, 100% { transform: translate(0, 0); }
+
-	10% { transform: translate(-1%, -1%); }
+  0%,
-	20% { transform: translate(1%, 1%); }
+  100% {
-	30% { transform: translate(-2%, -2%); }
+    transform: translate(0, 0);
-	40% { transform: translate(3%, 3%); }
+  }
-	50% { transform: translate(-3%, -3%); }
+
-	60% { transform: translate(4%, 4%); }
+  10% {
-	70% { transform: translate(-4%, -4%); }
+    transform: translate(-1%, -1%);
-	80% { transform: translate(2%, 2%); }
+  }
-	90% { transform: translate(-3%, -3%); }
+
+  20% {
+    transform: translate(1%, 1%);
+  }
+
+  30% {
+    transform: translate(-2%, -2%);
+  }
+
+  40% {
+    transform: translate(3%, 3%);
+  }
+
+  50% {
+    transform: translate(-3%, -3%);
+  }
+
+  60% {
+    transform: translate(4%, 4%);
+  }
+
+  70% {
+    transform: translate(-4%, -4%);
+  }
+
+  80% {
+    transform: translate(2%, 2%);
+  }
+
+  90% {
+    transform: translate(-3%, -3%);
+  }
 }
 
 @keyframes film-scratch {
-	0%, 100% { transform: translateX(0); opacity: 0.5; }
+
-	10% { transform: translateX(-1%); }
+  0%,
-	20% { transform: translateX(1%); }
+  100% {
-	30% { transform: translateX(-2%); opacity: 0.75; }
+    transform: translateX(0);
-	40% { transform: translateX(3%); }
+    opacity: 0.5;
-	50% { transform: translateX(-3%); opacity: 0.5; }
+  }
-	60% { transform: translateX(8%); }
+
-	70% { transform: translateX(-3%); }
+  10% {
-	80% { transform: translateX(10%); opacity: 0.25; }
+    transform: translateX(-1%);
-	90% { transform: translateX(-2%); }
+  }
+
+  20% {
+    transform: translateX(1%);
+  }
+
+  30% {
+    transform: translateX(-2%);
+    opacity: 0.75;
+  }
+
+  40% {
+    transform: translateX(3%);
+  }
+
+  50% {
+    transform: translateX(-3%);
+    opacity: 0.5;
+  }
+
+  60% {
+    transform: translateX(8%);
+  }
+
+  70% {
+    transform: translateX(-3%);
+  }
+
+  80% {
+    transform: translateX(10%);
+    opacity: 0.25;
+  }
+
+  90% {
+    transform: translateX(-2%);
+  }
 }
 
 @keyframes effect-scratch {
-	0% { transform: translateX(0); opacity: 0.75; }
+  0% {
-	10% { transform: translateX(-1%); }
+    transform: translateX(0);
-	20% { transform: translateX(1%); }
+    opacity: 0.75;
-	30% { transform: translateX(-2%); }
+  }
-	40% { transform: translateX(3%); }
+
-	50% { transform: translateX(-3%); opacity: 0.5; }
+  10% {
-	60% { transform: translateX(8%); }
+    transform: translateX(-1%);
-	70% { transform: translateX(-3%); }
+  }
-	80% { transform: translateX(10%); opacity: 0.25; }
+
-	90% { transform: translateX(20%); }
+  20% {
-	100% { transform: translateX(30%); }
+    transform: translateX(1%);
+  }
+
+  30% {
+    transform: translateX(-2%);
+  }
+
+  40% {
+    transform: translateX(3%);
+  }
+
+  50% {
+    transform: translateX(-3%);
+    opacity: 0.5;
+  }
+
+  60% {
+    transform: translateX(8%);
+  }
+
+  70% {
+    transform: translateX(-3%);
+  }
+
+  80% {
+    transform: translateX(10%);
+    opacity: 0.25;
+  }
+
+  90% {
+    transform: translateX(20%);
+  }
+
+  100% {
+    transform: translateX(30%);
+  }
 }
 
 /**** OLD FILM EFFECT END ****/
 
 @keyframes zoomImg {
-	0% { transform: translate(-75%, 10%) scale(1.5); opacity: 0.6; }
+  0% {
-	20% { transform: translate(-15%, 10%) scale(1.5); opacity: 1; }
+    transform: translate(-75%, 10%) scale(1.5);
-	50% { transform: translate(-15%, 25%) scale(1.4); opacity: 1; }
+    opacity: 0.6;
-	80% { transform: translate(-65%, 25%) scale(1.4); opacity: 1; }
+  }
-	100% { transform: translate(-75%, 10%) scale(1.5); opacity: 0.6; }
+
+  20% {
+    transform: translate(-15%, 10%) scale(1.5);
+    opacity: 1;
+  }
+
+  50% {
+    transform: translate(-15%, 25%) scale(1.4);
+    opacity: 1;
+  }
+
+  80% {
+    transform: translate(-65%, 25%) scale(1.4);
+    opacity: 1;
+  }
+
+  100% {
+    transform: translate(-75%, 10%) scale(1.5);
+    opacity: 0.6;
+  }
 }
 
 .zoomImg {
-	animation: zoomImg 20s linear infinite;
+  animation: zoomImg 20s linear infinite;
 }
 
 .animate__animated.animate__slow3 {
@@ -1516,24 +1649,28 @@ h3 {
   -webkit-animation-duration: calc(var(--animate-duration) * 3);
   animation-duration: calc(var(--animate-duration) * 3);
 }
+
 .animate__animated.animate__slow4 {
   -webkit-animation-duration: calc(1s * 4);
   animation-duration: calc(1s * 4);
   -webkit-animation-duration: calc(var(--animate-duration) * 4);
   animation-duration: calc(var(--animate-duration) * 4);
 }
+
 .animate__animated.animate__slow5 {
   -webkit-animation-duration: calc(1s * 5);
   animation-duration: calc(1s * 5);
   -webkit-animation-duration: calc(var(--animate-duration) * 5);
   animation-duration: calc(var(--animate-duration) * 5);
 }
+
 .animate__animated.animate__slow10 {
   -webkit-animation-duration: calc(1s * 10);
   animation-duration: calc(1s * 10);
   -webkit-animation-duration: calc(var(--animate-duration) * 10);
   animation-duration: calc(var(--animate-duration) * 10);
 }
+
 .animate__animated.animate__slow20 {
   -webkit-animation-duration: calc(1s * 20);
   animation-duration: calc(1s * 20);
@@ -1544,15 +1681,19 @@ h3 {
 .animate__animated.animate__ease-in-out {
   transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
 }
+
 .animate__animated.animate__linear {
   transition-timing-function: linear;
 }
+
 .animate__animated.animate__ease-in {
   transition-timing-function: cubic-bezier(0.4, 0, 1, 1);
 }
+
 .animate__animated.animate__ease-out {
   transition-timing-function: cubic-bezier(0, 0, 0.2, 1);
 }
+
 .animate__animated.animate__ease {
   transition-timing-function: ease;
 }
@@ -1583,15 +1724,49 @@ h3 {
   height: auto;
 }
 
-.show_province_title{
+.show_province_title {
   font-size: 0.85rem;
   font-style: italic;
   text-align: right;
-  color:#A0A0A0;
+  color: #A0A0A0;
 }
-.show_province{
+
+.show_province {
   font-size: 0.85rem;
   font-style: italic;
   text-align: right;
   color: grey;
 }
+
+.buttons_bottom {
+  max-width: 400px;
+  margin-left: auto;
+  justify-content: space-around;
+  margin-right: auto;
+  text-align: center;
+  padding-top: 8px;
+  padding-bottom: 8px;
+}
+
+.body--light {
+  .buttons_bottom {
+    background: -webkit-gradient(linear, left top, left bottom, from(transparent), color-stop(15%, rgba(255, 255, 255, .7)));
+    background: linear-gradient(180deg, transparent, rgba(255, 255, 255, .7) 15%)
+  }
+}
+.body--dark {
+  .buttons_bottom {
+    background: -webkit-gradient(linear, left top, left bottom, from(transparent), color-stop(15%, rgba(0, 0, 0, .6)));
+    background: linear-gradient(180deg, transparent, rgba(0, 0, 0, .6) 15%)
+  }
+}
+
+.fulldiv {
+  min-height: 100% !important;
+}
+
+.numfav_text{
+  text-align: center;
+  color: grey;
+  font-size: 0.8rem;
+}

src/model/UserStore.ts

@@ -67,6 +67,9 @@ export interface IFavorite {
   tab: number
 }
 
+export interface IFavBook {
+  username: string
+}
 
 export interface IUserProfile {
   img?: string
@@ -129,6 +132,8 @@ export interface IUserProfile {
   noFoto: boolean
   bookmark: IBookmark[]
   favorite: IFavorite[]
+  myfav: IFavBook[]
+  mybook: IFavBook[]
 
   // in memory
   asked_friends: any[]

src/statics/lang/it.js

@@ -1489,6 +1489,8 @@ const msg_it = {
       favorite_unset: 'Rimosso dai Preferiti',
       bookmark_set: 'Aggiunto ai Segnalibri',
       bookmark_unset: 'Rimosso dai Segnalibri',
+      favorite: 'Utenti Favoriti',
+      bookmark: 'Utenti Segnalibri',
     },
   },
 

src/store/Modules/costanti.ts

@@ -17,6 +17,11 @@ export const costanti = {
     CERCO: 2,
   },
 
+  TIPOFAVBOOK: {
+    FAVORITE: 1,
+    BOOKMARK: 2,
+  },
+
   ENABLE_FRIENDS: false,
   ENABLE_CONTI_COLLETTIVI: true,
 
@@ -105,6 +110,7 @@ export const costanti = {
       table: 'mygoods',
       visuonstat: true,
       small: false,
+      showfavorite: true,
     },
     {
       visible: true,
@@ -118,6 +124,7 @@ export const costanti = {
       table: 'myskills',
       visuonstat: true,
       small: false,
+      showfavorite: true,
     },
     {
       visible: true,
@@ -133,6 +140,7 @@ export const costanti = {
       small: false,
       table: 'myhosps',
       visuonstat: true,
+      showfavorite: true,
     },
     {
       visible: false,
@@ -186,6 +194,7 @@ export const costanti = {
       table: 'mybachecas',
       visuonstat: true,
       small: false,
+      showfavorite: true,
     },
     {
       visible: false,

src/store/Modules/tools.ts

@@ -12,7 +12,7 @@ import {
   ITodo,
   IUserFields,
   Privacy,
-  TipoVisu, IGroup, IMySkill, IMyBacheca, IImgGallery, IMsgGlobParam, IUserExport, ISpecialField, IAccount, IMyCircuit, ISendCoin, IMovement, IMovVisu, INotif, IMyElem, IMyCard, ILabelValue, ILabelValueStr, IAnim, ILang, IGroupShort, IPagination,
+  TipoVisu, IGroup, IMySkill, IMyBacheca, IImgGallery, IMsgGlobParam, IUserExport, ISpecialField, IAccount, IMyCircuit, ISendCoin, IMovement, IMovVisu, INotif, IMyElem, IMyCard, ILabelValue, ILabelValueStr, IAnim, ILang, IGroupShort, IPagination, IFavorite, IBookmark,
 } from '@model'
 
 import { fieldsTable } from '@store/Modules/fieldsTable'
@@ -116,7 +116,19 @@ export const tools = {
     'teal',
     'lime',
     'orange',
-    'deeporange',
+    'deep-orange',
+    'yellow',
+    'blue',
+    'green',
+    'purple',
+    'deep-purple',
+    'indigo',
+    'light-blue',
+    'cyan',
+    'teal',
+    'lime',
+    'orange',
+    'deep-orange',
     'yellow',
   ],
 
@@ -4192,7 +4204,7 @@ export const tools = {
   },
 
   scrollToTopAll() {
-    window.scrollTo(0,0);
+    window.scrollTo(0, 0);
   },
   scrollToTop() {
     const element = document.getElementById('mypage')
@@ -4512,7 +4524,16 @@ export const tools = {
   },
 
   getlinkhref(mylink: string, text: string) {
-    return '<a href="' + mylink + '" target="_blank">' + text + '</a>'
+    if (mylink) {
+      if (!mylink.startsWith('http')) {
+        mylink = 'https://' + mylink
+      }
+
+      return '<a href="' + mylink + '" target="_blank">' + text + '</a>'
+    } else {
+      return ''
+    }
+
   },
 
   getNationsByNationality(nat: string) {
@@ -5015,7 +5036,7 @@ export const tools = {
     }
     let add = ''
     if (aportador_solidario) {
-      add = '?start=inv_' + aportador_solidario + '_ex_' + regexpire
+      add = '?start=inv#' + aportador_solidario + '#ex#' + regexpire
     }
 
     return mylink + add
@@ -6344,7 +6365,7 @@ export const tools = {
       title: t('db.domanda')
     }).onOk(() => {
 
-      userStore.setCircuitCmd($q, t, username, circuitname, shared_consts.CIRCUITCMD.REMOVE_FROM_MYLIST, null, {groupname}).then((res) => {
+      userStore.setCircuitCmd($q, t, username, circuitname, shared_consts.CIRCUITCMD.REMOVE_FROM_MYLIST, null, { groupname }).then((res) => {
         if (res && res.result) {
           if (userStore.my.profile.mycircuits && username === userStore.my.username) {
             userStore.my.profile.mycircuits = userStore.my.profile.mycircuits.filter((rec: IMyCircuit) => rec.circuitname !== circuitname)
@@ -7036,6 +7057,7 @@ export const tools = {
   },
 
   getPathByTableAndRec(table: string, rec: any) {
+
     if (shared_consts.TABLES_REC_ID.includes(table)) {
       return '/' + tools.getDirectoryByTable(table) + '/' + rec['_id']
     } else if (table === toolsext.TABMYGROUPS) {
@@ -7729,7 +7751,7 @@ export const tools = {
 
     await userStore.setUserReceiveRIS(username, '').then((data) => {
       if (data.code === serv_constants.RIS_CODE_OK) {
-        this.showPositiveNotif($q, t('circuit.coins_requestedris', {username}), 6000)
+        this.showPositiveNotif($q, t('circuit.coins_requestedris', { username }), 6000)
       } else {
         this.showNegativeNotif($q, t('db.recfailed'))
       }
@@ -7743,7 +7765,7 @@ export const tools = {
 
     await userStore.setUserReceiveRIS('', groupname).then((data) => {
       if (data.code === serv_constants.RIS_CODE_OK) {
-        this.showPositiveNotif($q, t('circuit.coins_requestedrisgroup', {groupname}), 6000)
+        this.showPositiveNotif($q, t('circuit.coins_requestedrisgroup', { groupname }), 6000)
       } else {
         this.showNegativeNotif($q, t('db.recfailed'))
       }
@@ -7757,7 +7779,8 @@ export const tools = {
   },
 
   getNumTabByTable(table: string) {
-    return shared_consts.MYTABS.findIndex((rec: any) => rec.table === table)
+    const myrec = shared_consts.MYTABS.find((rec: any) => rec.table === table)
+    return myrec ? myrec.id : -1
   },
 
   removeItemOnce(arr: any, value: any) {
@@ -7766,7 +7789,39 @@ export const tools = {
       arr.splice(index, 1)
     }
     return arr;
-  }
+  },
+
+  indexOfObject(arr: any, obj: any) {
+    let l = arr.length, i, k, ok;
+    for (let i = 0; i < l; i++) {
+      ok = true;
+      for (k in obj) if (obj.hasOwnProperty(k)) {
+        if (arr[i][k] !== obj[k]) {
+          ok = false;
+          break;
+        }
+      }
+      if (ok) return i;
+    }
+    return -1; // no match
+  },
+
+  removeIObjectOnce(arr: any, obj: IBookmark | IFavorite) {
+    const index = this.indexOfObject(arr, obj)
+    if (index > -1) {
+      arr.splice(index, 1)
+    }
+    return arr;
+  },
+
+  optionsTable(table: string) {
+    if (shared_consts.TABLES_FAVORITE_BOOKMARK.includes(table))
+      return shared_consts.OPTIONS_ADD_COUNT_FAVORITE
+
+    return 0
+  },
+
+
 
   // FINE !
 

src/store/UserStore.ts

@@ -35,7 +35,7 @@ import { Router } from 'vue-router'
 import { useProjectStore } from '@store/Projects'
 import { shared_consts } from '@/common/shared_vuejs'
 import { costanti } from '@costanti'
-import { IBookmark, IGroupShort, IMyGroup, IUserAdmins } from '@model/UserStore'
+import { IBookmark, IFavBook, IFavorite, IGroupShort, IMyGroup, IUserAdmins } from '@model/UserStore'
 
 import globalroutines from '../globalroutines/index'
 import { useNotifStore } from '@store/NotifStore'
@@ -83,6 +83,8 @@ export const DefaultUser: IUserFields = {
     notifs: [],
     bookmark: [],
     favorite: [],
+    myfav: [],
+    mybook: [],
     notif_idCities: [],
     notif_provinces: [],
     notif_regions: [],
@@ -150,6 +152,8 @@ export const DefaultProfile: IUserProfile = {
   notifs: [],
   bookmark: [],
   favorite: [],
+  myfav: [],
+  mybook: [],
   notif_idCities: [],
   notif_provinces: [],
   notif_regions: [],
@@ -1474,6 +1478,7 @@ export const useUserStore = defineStore('UserStore', {
 
       return Api.SendReq('/myskills/page', 'POST', data)
         .then((res) => {
+          console.log('res.data', res)
           return res.data
         }).catch((error) => {
           return {}
@@ -1492,6 +1497,7 @@ export const useUserStore = defineStore('UserStore', {
         .then((res) => {
           return res.data
         }).catch((error) => {
+          console.error('err', error)
           return {}
         })
 
@@ -1640,19 +1646,28 @@ export const useUserStore = defineStore('UserStore', {
 
     },
 
-    async setFavorite($q: any, t: any, id: any, table: string) {
+    async setFavorite($q: any, t: any, id: any, table: string, myrec: any) {
-      let value = {}
+      let value = false
 
+      console.log('table', table)
       const tab = tools.getNumTabByTable(table)
 
+      value = this.isFavorite(id, table) ? false : true
+
       return await Api.SendReq('/users/cmd', 'POST', { cmd: CMD_USER.SET_FAVORITE, id, tab, value })
         .then((res) => {
           if (res && res.data.state === 1) {
+            if (!myrec.myfav)
+              myrec.myfav = []
             this.my.profile.favorite.push({ id, tab })
+            if (myrec)
+              myrec.myfav.push({ username: this.my.username })
             tools.showPositiveNotif($q, t('cmd.favorite_set'))
           } else if (res && res.data.state === -1) {
-            this.my.profile.favorite = tools.removeItemOnce(this.my.profile.favorite, { id, tab })
+            this.my.profile.favorite = tools.removeIObjectOnce(this.my.profile.favorite, { id, tab })
-            tools.showPositiveNotif($q, t('db.favorite_unset'))
+            if (myrec && myrec.myfav)
+              myrec.myfav = myrec.myfav.filter((rec: IFavBook) => rec.username !== this.my.username)
+            tools.showPositiveNotif($q, t('cmd.favorite_unset'))
           }
         }).catch((error) => {
           tools.showNegativeNotif($q, t('db.recfailed'))
@@ -1669,23 +1684,34 @@ export const useUserStore = defineStore('UserStore', {
 
     isFavorite(id: string, table: string) {
       const tab = tools.getNumTabByTable(table)
-      const myfavorite = this.my.profile.favorite.find((rec: IBookmark) => ((rec.id === id) && (rec.tab === tab)))
+      const myfavorite = this.my.profile.favorite.find((rec: IFavorite) => ((rec.id === id) && (rec.tab === tab)))
       return myfavorite
     },
 
-    async setBookmark($q: any, t: any, id: any, table: string) {
+    async setBookmark($q: any, t: any, id: any, table: string, myrec: any) {
-      let value = {}
+      let value = false
 
       const tab = tools.getNumTabByTable(table)
 
+      value = this.isBookmarked(id, table) ? false : true
+
       return await Api.SendReq('/users/cmd', 'POST', { cmd: CMD_USER.SET_BOOKMARK, id, tab, value })
         .then((res) => {
           if (res && res.data.state === 1) {
+            if (!myrec.mybook)
+              myrec.mybook = []
+            this.my.profile.bookmark.push({ id, tab })
+            if (myrec)
+              myrec.mybook.push({ username: this.my.username })
             tools.showPositiveNotif($q, t('cmd.bookmark_set'))
           } else if (res && res.data.state === -1) {
-            tools.showPositiveNotif($q, t('db.bookmark_unset'))
+            this.my.profile.bookmark = tools.removeIObjectOnce(this.my.profile.bookmark, { id, tab })
+            if (myrec && myrec.mybook)
+              myrec.mybook = myrec.mybook.filter((rec: IFavBook) => rec.username !== this.my.username)
+            tools.showPositiveNotif($q, t('cmd.bookmark_unset'))
           }
         }).catch((error) => {
+          console.error('error', error)
           tools.showNegativeNotif($q, t('db.recfailed'))
           return {}
         })

src/views/admin/dbop/dbop.vue

@@ -414,6 +414,22 @@
       ></q-btn>
       <br />
     </div>
+    <div class="row">
+      <q-btn
+        label="Converti Tabelle: myskills, mygoods da INT a STRING"
+        color="primary"
+        @click="EseguiFunz('ConvTablesFromIntToString', '', '')"
+      ></q-btn>
+      <br />
+    </div>
+    <div class="row">
+      <q-btn
+        label="Removeinteger"
+        color="primary"
+        @click="EseguiFunz('Removeinteger', '', '')"
+      ></q-btn>
+      <br />
+    </div>
 
     <q-field stack-label dense>
       <template v-slot:control>

src/views/user/mypagegood/mypagegood.ts

@@ -3,7 +3,7 @@ import { useUserStore } from '@store/UserStore'
 import { useRoute, useRouter } from 'vue-router'
 import { useI18n } from '@/boot/i18n'
 import { useQuasar } from 'quasar'
-import { CMyCardPopup } from '@/components/CMyCardPopup'
+import { CMyCardService } from '@/components/CMyCardService'
 import { CMyPage } from '@/components/CMyPage'
 import { CCheckIfIsLogged } from '@/components/CCheckIfIsLogged'
 import { toolsext } from '@store/Modules/toolsext'
@@ -11,7 +11,7 @@ import { tools } from '@store/Modules/tools'
 
 export default defineComponent({
   name: 'mypagegood',
-  components: { CMyCardPopup, CMyPage, CCheckIfIsLogged },
+  components: { CMyCardService, CMyPage, CCheckIfIsLogged },
   props: {},
   setup() {
     const userStore = useUserStore()

src/views/user/mypagegood/mypagegood.vue

@@ -1,23 +1,24 @@
 <template>
-  <CMyPage title="Bene"
+  <CMyPage
-           imgbackground="images/calendario_eventi.jpg"
+    title="Bene"
-           sizes="max-height: 120px" styleadd="bottom: -20px !important;">
+    imgbackground="images/calendario_eventi.jpg"
-
+    sizes="max-height: 120px"
+    styleadd="bottom: -20px !important;"
+  >
     <div v-if="!tools.isLogged()">
       <CCheckIfIsLogged></CCheckIfIsLogged>
     </div>
 
-    <CMyCardPopup
+    <CMyCardService
-      v-if="!!idGood"
+      v-if="idGood"
       :table="toolsext.TABMYGOODS"
       :nopopup="true"
-      :idRec="idGood">
+      :idRec="idGood"
-
+    >
-    </CMyCardPopup>
+    </CMyCardService>
-
-    <br>
-    <br>
 
+    <br />
+    <br />
   </CMyPage>
 </template>
 

src/views/user/mypagehosp/mypagehosp.ts

@@ -3,7 +3,7 @@ import { useUserStore } from '@store/UserStore'
 import { useRoute, useRouter } from 'vue-router'
 import { useI18n } from '@/boot/i18n'
 import { useQuasar } from 'quasar'
-import { CMyCardPopup } from '@/components/CMyCardPopup'
+import { CMyCardService } from '@/components/CMyCardService'
 import { CMyPage } from '@/components/CMyPage'
 import { CCheckIfIsLogged } from '@/components/CCheckIfIsLogged'
 import { toolsext } from '@store/Modules/toolsext'
@@ -11,7 +11,7 @@ import { tools } from '@store/Modules/tools'
 
 export default defineComponent({
   name: 'mypagehosp',
-  components: { CMyCardPopup, CMyPage, CCheckIfIsLogged },
+  components: { CMyCardService, CMyPage, CCheckIfIsLogged },
   props: {},
   setup() {
     const userStore = useUserStore()

src/views/user/mypagehosp/mypagehosp.vue

@@ -7,13 +7,13 @@
       <CCheckIfIsLogged></CCheckIfIsLogged>
     </div>
 
-    <CMyCardPopup
+    <CMyCardService
       v-if="!!idHosp"
       :table="toolsext.TABMYHOSPS"
       :nopopup="true"
       :idRec="idHosp">
 
-    </CMyCardPopup>
+    </CMyCardService>
 
     <br>
     <br>

src/views/user/myservice/myservice.ts

@@ -5,7 +5,7 @@ import { CDateTime } from '@/components/CDateTime'
 import { CMyPage } from '@/components/CMyPage'
 import { CMyCardPopup } from '@/components/CMyCardPopup'
 import { CCheckIfIsLogged } from '@/components/CCheckIfIsLogged'
-import { CSkill } from '@/components/CSkill'
+import { CMyCardService } from '@/components/CMyCardService'
 import { tools } from '@store/Modules/tools'
 import { computed, defineComponent, onMounted, ref, watch } from 'vue'
 import { useUserStore } from '@store/UserStore'
@@ -24,7 +24,7 @@ import { colCitys } from '@store/Modules/fieldsTable'
 
 export default defineComponent({
   name: 'myservice',
-  components: { CProfile, CTitleBanner, CMyFieldDb, CSkill, CDateTime, CMyPage, CCheckIfIsLogged, CMyCardPopup },
+  components: { CProfile, CTitleBanner, CMyFieldDb, CMyCardService, CDateTime, CMyPage, CCheckIfIsLogged, CMyCardPopup },
   props: {},
   setup() {
     const userStore = useUserStore()
@@ -54,37 +54,12 @@ export default defineComponent({
       return userStore.my.username
     }
 
-    function loadSkill() {
-      // Carica il profilo di quest'utente
-      if (idSkill.value) {
-
-        userStore.loadSkill(idSkill.value).then((ris) => {
-          myskill.value = ris
-          if (ris.userId) {
-            filtroutente.value = [{ userId: ris.userId , _id: ris._id }]
-
-          }
-        })
-
-      }
-    }
-
-    watch(() => idSkill.value, (to: any, from: any) => {
-      loadSkill()
-    })
-
-    function mounted() {
-      loadSkill()
-    }
-
     function checkifShow(col: string) {
       //++Todo: checkifShow Permessi !
       return true
     }
 
 
-    onMounted(mounted)
-
     return {
       profile,
       tools,

src/views/user/myservice/myservice.vue

@@ -7,13 +7,11 @@
       <CCheckIfIsLogged></CCheckIfIsLogged>
     </div>
     <div v-else>
-      <CMyCardPopup
+      <CMyCardService v-if="idSkill"
-        v-if="!!idSkill"
         :table="toolsext.TABMYSKILLS"
         :nopopup="true"
         :idRec="idSkill">
-
+      </CMyCardService>
-      </CMyCardPopup>
     </div>
 
     <!--