versione 0.6.3

ver 0.6.3
aktre modifiche sistemando...
2023-04-07 22:37:28 +02:00 · 2023-04-07 22:20:17 +02:00 · 2023-04-07 21:48:33 +02:00 · 2023-04-07 21:22:04 +02:00 · 2023-04-07 21:10:16 +02:00 · 2023-04-07 20:07:56 +02:00
56 changed files with 1737 additions and 247 deletions
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="0.5.83"
+APP_VERSION="0.6.3"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"
--- a/.env.example.production
+++ b/.env.example.production
@@ -1,4 +1,4 @@
-APP_VERSION="0.5.83"
+APP_VERSION="0.6.3"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet
--- a/.env.test.risosrv
+++ b/.env.test.risosrv
@@ -1,4 +1,4 @@
-APP_VERSION="0.5.83"
+APP_VERSION="0.6.3"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet
--- a/_ALL_SITES/riso.app/.env.development
+++ b/_ALL_SITES/riso.app/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="0.5.83"
+APP_VERSION="0.6.3"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"
--- a/_ALL_SITES/riso.app/.env.production
+++ b/_ALL_SITES/riso.app/.env.production
@@ -1,4 +1,4 @@
-APP_VERSION="0.5.83"
+APP_VERSION="0.6.3"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet
--- a/_ALL_SITES/terradellavisione.app/.env.development
+++ b/_ALL_SITES/terradellavisione.app/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="0.5.83"
+APP_VERSION="0.6.3"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="14"
 DIRECTORY_LOCAL="newfreeplanet"
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "riso",
-  "version": "0.5.3",
+  "version": "0.6.1",
  "description": "Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.",
  "productName": "Riso",
  "author": "Paolo Arena",
@@ -22,48 +22,48 @@
    "generate-sw": "workbox generateSW workbox-config.js"
  },
  "dependencies": {
-    "@quasar/extras": "^1.15.8",
-    "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.13",
-    "@vue-leaflet/vue-leaflet": "^0.7.0",
-    "@vue/compat": "^3.2.45",
-    "@vue/compiler-sfc": "^3.2.45",
+    "@quasar/extras": "^1.16.2",
+    "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.16",
+    "@vue-leaflet/vue-leaflet": "^0.9.0",
+    "@vue/compat": "^3.2.47",
+    "@vue/compiler-sfc": "^3.2.47",
    "@vue/eslint-config-standard": "7.0.0",
-    "@vuelidate/core": "^2.0.0",
-    "@vuelidate/validators": "^2.0.0",
-    "acorn": "^8.8.1",
+    "@vuelidate/core": "^2.0.2",
+    "@vuelidate/validators": "^2.0.2",
+    "acorn": "^8.8.2",
    "animate.css": "^4.1.1",
-    "autoprefixer": "^10.4.13",
-    "axios": "^1.2.1",
+    "autoprefixer": "^10.4.14",
+    "axios": "^1.3.5",
    "bcryptjs": "^2.4.3",
    "chart.js": "3.9.1",
-    "core-js": "^3.26.1",
+    "core-js": "^3.30.0",
    "crypto": "^1.0.1",
    "date-fns": "^2.29.3",
    "dotenv": "^16.0.3",
-    "echarts": "5.3.3",
+    "echarts": "5.4.2",
    "eslint-plugin-quasar": "^1.1.0",
    "eslint-plugin-standard": "^5.0.0",
    "graphql": "^16.6.0",
    "graphql-tag": "^2.12.6",
-    "gsap": "^3.11.3",
-    "jquery": "^3.6.2",
+    "gsap": "^3.11.5",
+    "jquery": "^3.6.4",
    "js-cookie": "^3.0.1",
    "localforage": "^1.10.0",
    "lodash": "^4.17.21",
    "normalize.css": "^8.0.1",
-    "npm": "^9.2.0",
+    "npm": "^9.6.4",
    "nprogress": "^0.2.0",
-    "pinia": "^2.0.28",
+    "pinia": "^2.0.33",
    "prerender-spa-plugin": "^3.4.0",
-    "quasar": "^2.11.0",
+    "quasar": "^2.11.10",
    "quasar-extras": "^2.0.9",
    "register-service-worker": "^1.7.2",
-    "vee-validate": "^4.7.3",
-    "vue": "^3.2.45",
+    "vee-validate": "^4.8.4",
+    "vue": "^3.2.47",
    "vue-chart-3": "^3.1.8",
    "vue-class-component": "^8.0.0-rc.1",
    "vue-country-code": "^1.1.3",
-    "vue-echarts": "^6.3.1",
+    "vue-echarts": "^6.5.4",
    "vue-i18n": "^9.2.2",
    "vue-idb": "^0.2.0",
    "vue-loader": "^17.0.1",
@@ -82,57 +82,48 @@
    "@types/bcryptjs": "^2.4.2",
    "@types/dotenv": "^8.2.0",
    "@types/googlemaps": "^3.43.3",
-    "@types/jest": "^29.2.4",
-    "@types/js-cookie": "^3.0.2",
-    "@types/node": "18.11.16",
+    "@types/jest": "^29.5.0",
+    "@types/js-cookie": "^3.0.3",
+    "@types/node": "18.15.11",
    "@types/nprogress": "^0.2.0",
    "@types/vue-tel-input": "^2.1.2",
-    "@types/vuelidate": "^0.7.15",
-    "@typescript-eslint/eslint-plugin": "^5.46.1",
-    "@typescript-eslint/parser": "^5.46.1",
-    "eslint": "^8.30.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-import": "^2.26.0",
+    "@types/vuelidate": "^0.7.16",
+    "@typescript-eslint/eslint-plugin": "^5.57.1",
+    "@typescript-eslint/parser": "^5.57.1",
+    "eslint": "^8.37.0",
+    "eslint-config-prettier": "^8.8.0",
+    "eslint-plugin-import": "^2.27.5",
    "eslint-plugin-node": "^11.1.0",
    "eslint-plugin-promise": "^6.1.1",
-    "eslint-plugin-vue": "^9.8.0",
+    "eslint-plugin-vue": "^9.10.0",
    "file-loader": "^6.2.0",
    "html-webpack-plugin": "^5.5.0",
    "http-proxy-middleware": "^2.0.6",
-    "jest": "^29.3.1",
+    "jest": "^29.5.0",
    "json-loader": "^0.5.7",
-    "node-sass": "7.0.1",
-    "npm-check-updates": "^16.6.0",
+    "node-sass": "7.0.0",
+    "npm-check-updates": "^16.10.7",
    "optimize-css-assets-webpack-plugin": "^6.0.1",
-    "postcss": "^8.4.20",
-    "postcss-loader": "^7.0.2",
-    "sass-loader": "^13.2.0",
+    "postcss": "^8.4.21",
+    "postcss-loader": "^7.2.4",
+    "sass-loader": "^13.2.2",
    "strip-ansi": "=7.0.1",
-    "ts-jest": "^29.0.3",
+    "ts-jest": "^29.1.0",
    "ts-loader": "^9.4.2",
    "tslint": "^6.1.3",
    "tslint-config-standard": "^9.0.0",
    "tslint-loader": "^3.5.4",
-    "typescript": "^4.9.4",
+    "typescript": "^5.0.3",
    "vue-cli-plugin-element-ui": "^1.1.4",
    "vueify": "^9.4.1",
-    "webpack": "^5.75.0",
+    "webpack": "^5.78.0",
    "workbox-webpack-plugin": "^6.5.4"
  },
  "browser": {
    "crypto": false
  },
  "browserslist": [
-    "last 20 Chrome versions",
-    "last 20 Firefox versions",
-    "last 10 Edge versions",
-    "last 15 Safari versions",
-    "last 60 Android versions",
-    "last 180 ChromeAndroid versions",
-    "last 40 FirefoxAndroid versions",
-    "last 20 iOS versions",
-    "last 10 Opera versions",
-    "> 0.1%",
+    "> 0.05%",
    "not dead"
  ],
  "engines": {
--- a/public/upload
+++ b/public/upload
@@ -0,0 +1 @@
+../../IMGS/upload
--- a/src/common/shared_vuejs.ts
+++ b/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,
@@ -170,6 +171,14 @@ export const shared_consts = {
  TABLES_MYGOODS: 'mygoods',
  TABLES_MYEVENTS: 'myevents',

+  MYTABS: [{id: 0, table: 'none' },
+  {id: 1, table: 'myskills'},
+  {id: 2, table: 'mybachecas' },
+  {id: 3, table: 'myhosps'} ,
+  {id: 4, table: 'mygoods'},
+  {id: 5, table: 'myevents'}
+],
+
  TABLES_ENABLE_GETREC_BYID: ['mybachecas', 'myhosps'],

  TABLES_USER_INCLUDE_MY: ['mygroups'],
@@ -181,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],
@@ -531,6 +541,14 @@ export const shared_consts = {
      value: 23,
      label: 'Asciugacapelli',
    },
+    {
+      value: 24,
+      label: 'Riscaldamento a legna',
+    },
+    {
+      value: 25,
+      label: 'Riscaldamento a gas',
+    },
  ],

  Regions: [
@@ -1538,4 +1556,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: any) {
+    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;
+  },
+
 }
--- a/src/components/CAccomodation/CAccomodation.ts
+++ b/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
--- a/src/components/CAccomodation/CAccomodation.vue
+++ b/src/components/CAccomodation/CAccomodation.vue
@@ -1,12 +1,8 @@
 <template>
-  <div class="bordo_stondato_blu">
-    <CTitleBanner class="column" title="Tipi di ospitalità"></CTitleBanner>
+  <div class="">
+

    <div class="">
-      <q-btn
-        v-if="isInModif"
-        rounded label="Aggiungi Letti" color="positive" @click="add_newbed()">
-      </q-btn>

      <div v-for="(myaccom, index) in getlist()" :key="index">
        <div v-if="isInModif" class="row justify-center bordo_stondato_small">
@@ -17,6 +13,8 @@
              v-model:value="myaccom.num"
              optval="value"
              optlab="label"
+              style="min-width:80px;"
+
              :sola_lettura="!isInModif"
              :options="shared_consts.People" :useinput="false"
            >
@@ -58,6 +56,10 @@
          </div>
        </div>
      </div>
+      <q-btn
+        v-if="isInModif"
+        rounded label="Aggiungi Letti" color="positive" @click="add_newbed()">
+      </q-btn>
    </div>
  </div>
 </template>
--- a/src/components/CFinder/CFinder.ts
+++ b/src/components/CFinder/CFinder.ts
@@ -149,7 +149,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 }

@@ -1158,6 +1158,9 @@ export default defineComponent({
              mygood: 1,
              idStatusSkill: 1,
              idContribType: 1,
+              'profile.username_telegram': 1,
+              'profile.favorite': 1,
+              'profile.bookmark': 1,
              idCity: 1,
              pub_to_share: 1,
              numLevel: 1,
@@ -1179,6 +1182,7 @@ export default defineComponent({
              'profile.img': 1,
              'profile.mygroups': 1,
              'profile.qualifica': 1,
+              'profile.resid_province': 1,
              reported: 1,
              date_report: 1,
              username_who_report: 1,
@@ -1225,6 +1229,9 @@ export default defineComponent({
              myskill: 1,
              idStatusSkill: 1,
              idContribType: 1,
+              'profile.username_telegram': 1,
+              'profile.favorite': 1,
+              'profile.bookmark': 1,
              idCity: 1,
              pub_to_share: 1,
              dateTimeStart: 1,
@@ -1248,6 +1255,7 @@ export default defineComponent({
              'profile.img': 1,
              'profile.mygroups': 1,
              'profile.qualifica': 1,
+              'profile.resid_province': 1,
              reported: 1,
              date_report: 1,
              username_who_report: 1,
@@ -1300,6 +1308,9 @@ export default defineComponent({
              accomodation: 1,
              preferences: 1,
              idContribType: 1,
+              'profile.username_telegram': 1,
+              'profile.favorite': 1,
+              'profile.bookmark': 1,
              photos: 1,
              idCity: 1,
              pub_to_share: 1,
@@ -1346,6 +1357,9 @@ export default defineComponent({
              myskill: 1,
              idStatusSkill: 1,
              idContribType: 1,
+              'profile.username_telegram': 1,
+              'profile.favorite': 1,
+              'profile.bookmark': 1,
              idCity: 1,
              pub_to_share: 1,
              numLevel: 1,
@@ -1367,6 +1381,7 @@ export default defineComponent({
              'profile.img': 1,
              'profile.mygroups': 1,
              'profile.qualifica': 1,
+              'profile.resid_province': 1,
              reported: 1,
              date_report: 1,
              username_who_report: 1,
--- a/src/components/CFinder/CFinder.vue
+++ b/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"
--- a/src/components/CGalleryImages/CGalleryImages.scss
+++ b/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;
+}
--- a/src/components/CGalleryImages/CGalleryImages.ts
+++ b/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,
+    }
+  }
+})
--- a/src/components/CGalleryImages/CGalleryImages.vue
+++ b/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>
--- a/src/components/CGalleryImages/index.ts
+++ b/src/components/CGalleryImages/index.ts
@@ -0,0 +1 @@
+export {default as CGalleryImages} from './CGalleryImages.vue'
--- a/src/components/CGridTableRec/CGridTableRec.ts
+++ b/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 { CMyCardService } from '@/components/CMyCardService'
 import { CMyCardGrpPopup } from '@/components/CMyCardGrpPopup'
 import { CMyCardCircuitPopup } from '@/components/CMyCardCircuitPopup'
 import { useRouter } from 'vue-router'
@@ -287,7 +288,7 @@ export default defineComponent({
  components: {
    CMyPopupEdit, CTitleBanner, CMyFieldDb, CMySelect, CMyFriends, CMyGroups,
    CMyUser, CMyRecCard, CMyCardPopup, CMyRecGrpCard, CMyCardGrpPopup, CMyCardCircuitPopup,
-    CMyRecCircuitCard
+    CMyRecCircuitCard, CMyCardService
  },
  setup(props, { emit }) {
    const $q = useQuasar()
@@ -661,7 +662,7 @@ export default defineComponent({
      for (const item of searchList.value) {
        if (!item.notinsearch) {
          if (item.value && item.value !== -100) {
-            console.log(item.label, item.value)
+            // console.log(item.label, item.value)
            numfilter++
          }
        }
--- a/src/components/CGridTableRec/CGridTableRec.vue
+++ b/src/components/CGridTableRec/CGridTableRec.vue
@@ -1090,6 +1090,7 @@
      @hide="hidewindow"
      :maximized="$q.screen.lt.sm"
    >
+
      <CMyCardGrpPopup
        v-if="mytable === toolsext.TABMYGROUPS"
        :table="mytable"
@@ -1102,6 +1103,9 @@
        :prop_myrec="myrecdialog"
      >
      </CMyCardCircuitPopup>
+      <CMyCardService v-else-if="shared_consts.TABLES_FAVORITE_BOOKMARK.includes(mytable)"
+        :table="mytable" :prop_myrec="myrecdialog">
+      </CMyCardService>
      <CMyCardPopup v-else :table="mytable" :prop_myrec="myrecdialog">
      </CMyCardPopup>
    </q-dialog>
--- a/src/components/CMyActivities/CMyActivities.ts
+++ b/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,
    }
  }
 })
--- a/src/components/CMyActivities/CMyActivities.vue
+++ b/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-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"
+            <q-tabs
+              v-model="mytab"
+              inline-label
+              dense
+              class="shadow-2"
+            >
+              <q-tab name="my" icon="far fa-user" />
+              <q-tab name="favorite" icon="favorite" content-class="text-red" />
+              <q-tab name="bookmark" icon="bookmark" content-class="text-teal" />
+            </q-tabs>
+
+            <q-tab-panels
+              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"
-                      >
-                      </CMyGroup>
-                    </span>
-                  </q-list>
+                        :title="card.title"
+                      />
+                    </div>
+                  </q-card>
                </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"
+              </q-tab-panel>
+              <q-tab-panel name="favorite">
+                <div
+                  v-for="(card, ind) of mycards"
+                  :key="ind"
+                  :name="card.table"
+                >
+                  <q-card class="q-my-md">
+
+                    <div v-if="card.showfavorite && filtrofavorite(card.table)">
+                      <CSkill
+                        :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"
-                      >
-                      </CMyCircuit>
-                    </span>
-                  </q-list>
+                        :title="card.title"
+                      />
+                    </div>
+                  </q-card>
                </div>
-                <div v-else>
-                  <CSkill
-                    :table="card.table"
-                    :filtercustom="filtroutente"
-                    :butt_modif_new="isMyRecord(myuser.username)"
-                    :visuinpage="true"
-                    :noaut="true"
-                    :title="card.title"
-                  />
-                </div>
-              </q-card>
-            </div>
+              </q-tab-panel>
+            </q-tab-panels>
          </CTitleBanner>
        </div>
      </div>
--- a/src/components/CMyCardCircuitPopup/CMyCardCircuitPopup.ts
+++ b/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)
--- a/src/components/CMyCardGrpPopup/CMyCardGrpPopup.ts
+++ b/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)
--- a/src/components/CMyCardPopup/CMyCardPopup.ts
+++ b/src/components/CMyCardPopup/CMyCardPopup.ts
@@ -34,9 +34,9 @@ export default defineComponent({
      default: null,
    },
    idRec: {
-      type: Number,
+      type: String,
      required: false,
-      default: 0
+      default: ''
    },
    nopopup: {
      type: Boolean,
@@ -66,7 +66,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)
--- a/src/components/CMyCardPopup/CMyCardPopup.vue
+++ b/src/components/CMyCardPopup/CMyCardPopup.vue
@@ -1,6 +1,6 @@
 <template>

-  <q-card class="dialog_card q-mb-lg" v-if="myrec._id">
+  <q-card class="dialog_card q-mb-lg" v-if="myrec && myrec._id">

    <q-footer
      v-if="!nopopup"
--- a/src/components/CMyCardService/CMyCardService.scss
+++ b/src/components/CMyCardService/CMyCardService.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;
+  }
+
+}
--- a/src/components/CMyCardService/CMyCardService.ts
+++ b/src/components/CMyCardService/CMyCardService.ts
@@ -0,0 +1,197 @@
+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 { 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'
+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, useRouter } from 'vue-router'
+import { useNotifStore } from '@store/NotifStore'
+
+export default defineComponent({
+  name: 'CMyCardService',
+  components: {
+    CProfile, CTitleBanner,
+    CMyFieldDb, CDateTime, CMyPage, CMyFieldRec, CAccomodation,
+    CMyUser, CGalleryImages, CMyChipList
+  },
+  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 $router = useRouter()
+
+    const usersList = ref({ show: false, title: '', list: [] })
+
+    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
+    }
+
+    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 {
+      profile,
+      tools,
+      costanti,
+      myrec,
+      shared_consts,
+      globalStore,
+      showPic,
+      userStore,
+      t,
+      fieldsTable,
+      colCitys,
+      toolsext,
+      col,
+      condividipag,
+      showBadge,
+      getlinkpage,
+      calendarStore,
+      getSectorByRec,
+      getRecGoodSkillByRec,
+      usersList,
+      clicca,
+      naviga,
+      getTypeHosps,
+    }
+  }
+})
--- a/src/components/CMyCardService/CMyCardService.vue
+++ b/src/components/CMyCardService/CMyCardService.vue
@@ -0,0 +1,468 @@
+<template>
+  <div v-if="myrec && 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">
+          <div class="">
+            <q-btn
+              flat
+              round
+              color="red"
+              :icon="userStore.isFavorite(myrec._id, table) ?  'favorite' : 'far fa-heart'"
+              @click="clicca(costanti.TIPOFAVBOOK.FAVORITE, 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="teal"
+              :icon="userStore.isBookmarked(myrec._id, table) ?  'bookmark' : 'far fa-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: 200px">
+                  <q-item
+                    v-if="myrec.profile.username_telegram"
+                    clickable
+                    v-close-popup
+                  >
+                    <q-item-section avatar>
+                      <q-icon color="blue" name="far fa-comment" />
+                    </q-item-section>
+                    <q-item-section>
+                      <a :href="tools.getHttpForTelegram(myrec.profile.username_telegram)" target="_blank">{{ $t('dialog.contact') }} - {{tools.getNomeUtenteByRecUser(myrec)}}</a>
+                    </q-item-section>
+                  </q-item>
+                  <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', {num: myrec.myfav ? myrec.myfav.length : 0})
+                      )
+                    "
+                  >
+                    <q-item-section avatar>
+                      <q-icon color="red" name="favorite" />
+                    </q-item-section>
+                    <q-item-section>
+                      {{ $t('cmd.favorite', {num: myrec.myfav ? myrec.myfav.length : 0}) }}
+                    </q-item-section>
+                  </q-item>
+                  <q-item
+                    clickable
+                    v-close-popup
+                    @click="
+                      clicca(
+                        costanti.TIPOFAVBOOK.BOOKMARK,
+                        false,
+                        $t('cmd.bookmark', {num: myrec.mybook ? myrec.mybook.length : 0})
+                      )
+                    "
+                  >
+                    <q-item-section avatar>
+                      <q-icon color="teal" name="bookmark" />
+                    </q-item-section>
+                    <q-item-section>
+                      {{ $t('cmd.bookmark', {num: myrec.mybook ? myrec.mybook.length : 0}) }}
+                    </q-item-section>
+                  </q-item>
+                </q-list>
+              </q-menu>
+            </q-btn>
+          </div>
+        </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 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 v-if="myrec.dateTimeStart">
+            <q-item-section avatar>
+              <q-icon color="green" name="far fa-calendar-alt" />
+            </q-item-section>
+
+            <q-item-section>
+              <q-item-label>
+                <span>{{tools.getstrDateMonthTimeLong(myrec.dateTimeStart)}}</span>
+              </q-item-label>
+            </q-item-section>
+          </q-item>
+          <q-item v-if="myrec.dateTimeEnd">
+            <q-item-section avatar>
+              <q-icon color="red" name="far fa-calendar-alt" />
+            </q-item-section>
+
+            <q-item-section>
+              <q-item-label>
+                <span>{{tools.getstrDateMonthTimeLong(myrec.dateTimeEnd)}}</span>
+              </q-item-label>
+            </q-item-section>
+          </q-item>
+
+          <q-item v-if="getSectorByRec(myrec)">
+            <q-item-section avatar>
+              <q-icon color="blue" name="category" />
+            </q-item-section>
+
+            <q-item-section>
+              <q-item-label>
+                <q-chip
+                  v-if="getSectorByRec(myrec) && getSectorByRec(myrec)[0].descr"
+                  class="glossy"
+                  color="blue"
+                  text-color="white"
+                  dense
+                >
+                  <span class="cal__quota-content">{{
+                    getSectorByRec(myrec)[0].descr
+                  }}</span>
+                </q-chip>
+                <q-chip
+                  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">{{
+                    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>
+
+          <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 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">
+            <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 || nopopup"
+          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
+            v-if="!nopopup"
+            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 && !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-section class="inset-shadow">
+        <div v-for="(rec, i) in usersList.list" :key="i">
+          <CMyUser
+            :mycontact="rec"
+            :visu="costanti.FIND_PEOPLE"
+            @setCmd="tools.setCmd"
+          >
+          </CMyUser>
+        </div>
+      </q-card-section>
+    </q-card>
+  </q-dialog>
+</template>
+
+<script lang="ts" src="./CMyCardService.ts">
+</script>
+
+<style lang="scss" scoped>
+@import './CMyCardService.scss';
+</style>
+
--- a/src/components/CMyCardService/index.ts
+++ b/src/components/CMyCardService/index.ts
@@ -0,0 +1 @@
+export { default as CMyCardService } from './CMyCardService.vue'
--- a/src/components/CMyPageElem/CMyPageElem.ts
+++ b/src/components/CMyPageElem/CMyPageElem.ts
@@ -88,7 +88,7 @@ export default defineComponent({
    })

    function load() {
-      console.log('load', mypathin.value)
+      // console.log('load', mypathin.value)

      if (mypathin.value !== '') {
        globalStore.loadPage('/' + mypathin.value, 'cmypageelem').then(ris => {
@@ -102,7 +102,7 @@ export default defineComponent({
    }

    watch(() => props.mypath, (to: string, from: string) => {
-      console.log('... load', mypathin.value, props.mypath)
+      // console.log('... load', mypathin.value, props.mypath)
      selElem.value = {}
      load()
    })
@@ -116,7 +116,7 @@ export default defineComponent({
      })

    function selElemClick(myelem: IMyElem) {
-      console.log('mypageelem selElemClick', myelem)
+      // console.log('mypageelem selElemClick', myelem)
      selElem.value = {}
      selElem.value = myelem
      visuEditor.value = !!myelem
--- a/src/components/CMyRecCard/CMyRecCard.vue
+++ b/src/components/CMyRecCard/CMyRecCard.vue
@@ -1,77 +1,177 @@
 <!--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 + margin_right)) +`px;`) : ``)">
-    <q-item v-if="myrec" clickable v-ripple :class="`shadow-2 q-btn--rounded ` + ($q.dark.isActive ? `bg-black`: `bg-teal-1`)">
-
-
-
-      <q-item-section v-if="(shared_consts.TABLES_VISU_IMG.includes(table)) && (myrec.photos && myrec.photos.length > 0)" avatar
-                      @click="cmdExt(costanti.CMD_SHOW_PAGE, myrec)">
-        <q-badge v-if="showBadge()" class="q-my-xs self-center" :color="fieldsTable.getColByAdType(myrec.adType)">
+  <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 + margin_right)) + `px;`
+        : ``)
+    "
+  >
+    <q-item v-if="myrec" clickable v-ripple :class="`shadow-2 butt_rounded `">
+      <q-item-section
+        v-if="
+          shared_consts.TABLES_VISU_IMG.includes(table) &&
+          myrec.photos &&
+          myrec.photos.length > 0
+        "
+        avatar
+        @click="cmdExt(costanti.CMD_SHOW_PAGE, myrec)"
+      >
+        <q-badge
+          v-if="showBadge()"
+          class="q-my-xs self-center"
+          :color="fieldsTable.getColByAdType(myrec.adType)"
+        >
          {{ fieldsTable.getValByTabAndId(table, 'adType', myrec.adType) }}
-          <q-icon :name="fieldsTable.getIconByAdType(myrec.adType)" color="white"
-                  class="q-ml-xs"/>
+          <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-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)">
+        <q-badge
+          v-if="showBadge()"
+          class="q-my-xs self-center"
+          :color="fieldsTable.getColByAdType(myrec.adType)"
+        >
          {{ fieldsTable.getValByTabAndId(table, 'adType', myrec.adType) }}
-          <q-icon :name="fieldsTable.getIconByAdType(myrec.adType)" color="white"
-                  class="q-ml-xs"/>
+          <q-icon
+            :name="fieldsTable.getIconByAdType(myrec.adType)"
+            color="white"
+            class="q-ml-xs"
+          />
        </q-badge>
        <q-avatar size="60px">
-          <q-img :src="getImgUser(myrec)" :alt="myrec.username" img-class="imgprofile" height="60px"/>
+          <q-img
+            :src="getImgUser(myrec)"
+            :alt="myrec.username"
+            img-class="imgprofile"
+            height="60px"
+          />
        </q-avatar>
      </q-item-section>

      <q-item-section @click="navigaExt(myrec)">
-        <q-item-label lines="2" class="full-width" >
-          <span v-for="(rec, ind) of tools.getArrSubSector(table, myrec)" :key="ind">
-            <q-chip dense class="text-center shadow-5 glossy text-white bg-green">{{ rec.descr }}</q-chip>
+        <q-item-label lines="2" class="full-width">
+          <span
+            v-for="(rec, ind) of tools.getArrSubSector(table, myrec)"
+            :key="ind"
+          >
+            <q-chip
+              dense
+              class="text-center shadow-5 glossy text-white bg-green"
+              >{{ rec.descr }}</q-chip
+            >
          </span>
          <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
+              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>-->
        </q-item-label>
-        <q-item-label lines="4" v-if="myrec.descr">{{ myrec.descr }}<br>
+        <q-item-label lines="4" v-if="myrec.descr"
+          >{{ myrec.descr }}<br />
        </q-item-label>
-        <q-item-label lines="2" style="text-align: right" class="text_user_city">
-          <span class="text-weight-bold">{{ tools.getNameToShow(myrec) }}</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 lines="1" style="" class="text_user_city">
+          <div class="row justify-between">
+            <div class="text-weight-bold text-italic">
+              {{ tools.getNameToShow(myrec) }}
+            </div>
+            <div class="q-mx-sm">
+              (<span class="">{{ myrec.myfav.length }}</span>
+              <span class="q-mx-xxs"
+                ><q-icon
+                  dense
+                  color="red"
+                  :name="
+                    userStore.isFavorite(myrec._id, table)
+                      ? 'favorite'
+                      : 'far fa-heart'
+                  "
+                />
+              </span>
+              <span class="q-mx-xxs">&nbsp;</span
+              ><span class="">{{ myrec.mybook.length }}</span>
+              <span class="q-mx-xxs"
+                ><q-icon
+                  dense
+                  color="teal"
+                  :name="
+                    userStore.isBookmarked(myrec._id, table)
+                      ? 'bookmark'
+                      : 'far fa-bookmark'
+                  "
+                />
+              </span>
+              )
+            </div>
+          </div>
        </q-item-label>

+        <q-item-label
+          lines="1"
+          style="text-align: right"
+          class="text_user_city"
+        >
+          <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>
      <q-item-section side v-if="tools.canModifyThisRec(myrec) || editOn">
        <q-item-label>
          <q-btn rounded dense icon="fas fa-pencil-alt">
            <q-menu>
              <q-list style="min-width: 150px">
-                <q-item clickable v-close-popup
-                        @click="cmdExt(costanti.CMD_MODIFY, myrec._id)">
+                <q-item
+                  clickable
+                  v-close-popup
+                  @click="cmdExt(costanti.CMD_MODIFY, myrec._id)"
+                >
                  <q-item-section side>
-                    <q-icon name="fas fa-pencil-alt"/>
+                    <q-icon name="fas fa-pencil-alt" />
                  </q-item-section>
                  <q-item-section>{{ $t('reg.edit') }}</q-item-section>
                </q-item>
              </q-list>
              <q-list style="min-width: 150px">
-                <q-item clickable v-close-popup @click="cmdExt(costanti.CMD_DELETE, myrec._id)">
+                <q-item
+                  clickable
+                  v-close-popup
+                  @click="cmdExt(costanti.CMD_DELETE, myrec._id)"
+                >
                  <q-item-section side>
-                    <q-icon name="fas fa-trash-alt"/>
+                    <q-icon name="fas fa-trash-alt" />
                  </q-item-section>
                  <q-item-section>{{ $t('reg.elimina') }}</q-item-section>
                </q-item>
@@ -80,11 +180,9 @@
          </q-btn>
        </q-item-label>
      </q-item-section>
-
    </q-item>
-    <q-separator inset="item"/>
+    <q-separator inset="item" />
  </div>
-
 </template>

 <script lang="ts" src="./CMyRecCard.ts">
--- a/src/components/CMySelectCity/CMySelectCity.vue
+++ b/src/components/CMySelectCity/CMySelectCity.vue
@@ -13,7 +13,7 @@
      :optlab="fieldsTable.getLabelByTable(jointable)"
      :options="globalStore.getTableJoinByName(jointable, false, false, '')"
      :useinput="false"
-      :dark="true"
+      :dark="$q.dark.isActive"
      @update:value="changevalRec"
    >
    </CMySelect>
--- a/src/components/CMyUser/CMyUser.vue
+++ b/src/components/CMyUser/CMyUser.vue
@@ -43,6 +43,7 @@
        <q-item-label v-if="labelFooter" lines="1"
          ><em>{{ labelFooter }}</em></q-item-label
        >
+        <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"
--- a/src/components/CSkill/CSkill.ts
+++ b/src/components/CSkill/CSkill.ts
@@ -114,6 +114,9 @@ export default defineComponent({
            myskill: 1,
            idStatusSkill: 1,
            idContribType: 1,
+            'profile.username_telegram': 1,
+            'profile.favorite': 1,
+            'profile.bookmark': 1,
            idCity: 1,
            pub_to_share: 1,
            numLevel: 1,
@@ -135,6 +138,7 @@ export default defineComponent({
            'profile.img': 1,
            'profile.mygroups': 1,
            'profile.qualifica': 1,
+            'profile.resid_province': 1,
            reported: 1,
          }
        },
@@ -152,6 +156,9 @@ export default defineComponent({
            myskill: 1,
            idStatusSkill: 1,
            idContribType: 1,
+            'profile.username_telegram': 1,
+            'profile.favorite': 1,
+            'profile.bookmark': 1,
            idCity: 1,
            pub_to_share: 1,
            numLevel: 1,
@@ -173,6 +180,7 @@ export default defineComponent({
            'profile.img': 1,
            'profile.mygroups': 1,
            'profile.qualifica': 1,
+            'profile.resid_province': 1,
            reported: 1,
          }
        },
@@ -190,6 +198,9 @@ export default defineComponent({
            myskill: 1,
            idStatusSkill: 1,
            idContribType: 1,
+            'profile.username_telegram': 1,
+            'profile.favorite': 1,
+            'profile.bookmark': 1,
            idCity: 1,
            pub_to_share: 1,
            numLevel: 1,
@@ -210,6 +221,7 @@ export default defineComponent({
            'profile.img': 1,
            'profile.mygroups': 1,
            'profile.qualifica': 1,
+            'profile.resid_province': 1,
            reported: 1,
          }
        },
@@ -252,6 +264,9 @@ export default defineComponent({
            myskill: 1,
            idStatusSkill: 1,
            idContribType: 1,
+            'profile.username_telegram': 1,
+            'profile.favorite': 1,
+            'profile.bookmark': 1,
            idCity: 1,
            pub_to_share: 1,
            numLevel: 1,
@@ -272,6 +287,7 @@ export default defineComponent({
            'profile.img': 1,
            'profile.mygroups': 1,
            'profile.qualifica': 1,
+            'profile.resid_province': 1,
            reported: 1,
          }
        },
@@ -291,6 +307,9 @@ export default defineComponent({
            myskill: 1,
            idStatusSkill: 1,
            idContribType: 1,
+            'profile.username_telegram': 1,
+            'profile.favorite': 1,
+            'profile.bookmark': 1,
            idCity: 1,
            pub_to_share: 1,
            numLevel: 1,
@@ -311,6 +330,7 @@ export default defineComponent({
            'profile.img': 1,
            'profile.mygroups': 1,
            'profile.qualifica': 1,
+            'profile.resid_province': 1,
            reported: 1,
          }
        },
@@ -330,6 +350,9 @@ export default defineComponent({
            myskill: 1,
            idStatusSkill: 1,
            idContribType: 1,
+            'profile.username_telegram': 1,
+            'profile.favorite': 1,
+            'profile.bookmark': 1,
            idCity: 1,
            pub_to_share: 1,
            numLevel: 1,
@@ -351,6 +374,7 @@ export default defineComponent({
            'profile.img': 1,
            'profile.mygroups': 1,
            'profile.qualifica': 1,
+            'profile.resid_province': 1,
          }
        },
        lookup4: {
--- a/src/components/CSkill/CSkill.vue
+++ b/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"
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -679,6 +679,18 @@ h3 {
  border: #666cf6 solid 5px;
 }

+.clBorderService {
+  border-radius: 16px;
+  font-size: 1rem;
+  padding: 6px;
+}
+.clBorderUser {
+  border-radius: 16px;
+  font-size: 1rem;
+  margin-top: 2px;
+  padding: 0px !important;
+}
+
 .clBorderTutor {
  border-radius: 16px;
  border: #f634b5 solid 2px;
@@ -1570,3 +1582,67 @@ h3 {
  max-width: 100%;
  height: auto;
 }
+
+.show_province_title{
+  font-size: 0.85rem;
+  font-style: italic;
+  text-align: right;
+  color:#A0A0A0;
+}
+.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;
+}
+
+.butt_rounded{
+  border-radius: 12px;
+}
+
+.body--light {
+  .butt_rounded{
+    background-color: rgb(234, 241, 244);
+  }
+}.body--dark {
+  .butt_rounded{
+    background-color: black;
+  }
+}
+
+.q-mx-xxs {
+  margin-left: 2px;
+}
--- a/src/model/Calendar.ts
+++ b/src/model/Calendar.ts
@@ -69,6 +69,7 @@ export interface IContribtype {
  _id: any
  label: string
  showprice: boolean
+  color: string
 }

 export interface ILabelValue {
--- a/src/model/GlobalStore.ts
+++ b/src/model/GlobalStore.ts
@@ -955,7 +955,7 @@ export interface IProvince {
 }

 export interface IMySkill extends IMyMain {
-  _id: number
+  _id: string
  idSector: number
  idSkill: number
  // idSubSkill: number[]
@@ -980,7 +980,7 @@ export interface IMyMain {
 }

 export interface IMyGoods extends IMyMain {
-  _id: number
+  _id: string
  idSector: number
  idSkill: number
  idShipping: number[]
@@ -1000,7 +1000,7 @@ export interface IMyGoods extends IMyMain {
 }

 export interface IMyBacheca extends IMyMain {
-  _id: number
+  _id: string
  idSector: number
  idSkill: number
  // idSubSkill: number[]
@@ -1027,7 +1027,7 @@ export interface IAccomodation {
 }

 export interface IMyHosp extends IMyMain {
-  _id: number
+  _id: string
  visibile: boolean
  typeHosp: number
  numMaxPeopleHosp: number
--- a/src/model/UserStore.ts
+++ b/src/model/UserStore.ts
@@ -57,6 +57,19 @@ export interface IUserNotifType {
  value: number
 }

+export interface IBookmark {
+  id: string
+  tab: number
+}
+
+export interface IFavorite {
+  id: string
+  tab: number
+}
+
+export interface IFavBook {
+  username: string
+}

 export interface IUserProfile {
  img?: string
@@ -117,6 +130,10 @@ export interface IUserProfile {
  noNameSurname: boolean
  noCircuit: boolean
  noFoto: boolean
+  bookmark: IBookmark[]
+  favorite: IFavorite[]
+  myfav: IFavBook[]
+  mybook: IFavBook[]

  // in memory
  asked_friends: any[]
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -193,6 +193,7 @@ const msg_it = {
      indietro: 'Indietro',
      finish: 'Fine',
      sendmsg: 'Invia Messaggio',
+      contact: 'Messaggia',
      sendonlymsg: 'Invia solo un Msg',
      msg: {
        titledeleteTask: 'Elimina Task',
@@ -1482,6 +1483,15 @@ const msg_it = {
      step_fine_title: 'Fine',
      step_fine: 'Hai completato l\'aggiornamento del tuo Profilo. Ricorda che potrai modificarlo, cliccando sulla prima icona in alto a destra 🙎🏻‍♂️ .',
    },
+
+    cmd: {
+      favorite_set: 'Aggiunto ai Preferiti',
+      favorite_unset: 'Rimosso dai Preferiti',
+      bookmark_set: 'Aggiunto ai Segnalibri',
+      bookmark_unset: 'Rimosso dai Segnalibri',
+      favorite: 'Piace a {num} utenti',
+      bookmark: 'Salvato da {num} utenti',
+    },
  },

 };
--- a/src/store/CalendarStore.ts
+++ b/src/store/CalendarStore.ts
@@ -88,6 +88,11 @@ export const useCalendarStore = defineStore('CalendarStore', {
      const ctrec = mystate.contribtype.find((mycontr) => mycontr._id === id)
      return (ctrec) ? ctrec.label : ''

+    },
+    getColByContribType: (mystate: ICalendarState) => (id: string) => {
+      const ctrec = mystate.contribtype.find((mycontr) => mycontr._id === id)
+      return (ctrec && ctrec.color) ? ctrec.color : 'green'
+
    },
    getContribtypeRecByLabel: (mystate: ICalendarState) => (label: string) => {
      const ctrec = mystate.contribtype.find((mycontr) => mycontr.label === label)
--- a/src/store/Modules/costanti.ts
+++ b/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,
--- a/src/store/Modules/tools.ts
+++ b/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',
  ],

@@ -3103,10 +3115,16 @@ export const tools = {
                 ${$t('cal.endtime')} ${this.getstrTime(myevent.dateTimeEnd)}`
      }
    } else {
+      if (withhtml) {
      mystr = `<span class="cal__where-content">${this.getstrDateLong(myevent.dateTimeStart)}</span>
                 <span class="cal__hours-content">${$t('cal.starttime')} ${this.getstrTime(myevent.dateTimeStart)} </span>
                  ${$t('cal.enddate')} ${this.getstrDateLong(myevent.dateTimeEnd)}
                  <span class="cal__hours-content">${$t('cal.endtime')} ${this.getstrTime(myevent.dateTimeEnd)} </span>`
+      } else {
+        mystr = `${this.getstrDateLong(myevent.dateTimeStart)}
+                 ${$t('cal.starttime')} ${this.getstrTime(myevent.dateTimeStart)}
+                 ${this.getstrDateLong(myevent.dateTimeEnd)}: ${$t('cal.endtime')} ${this.getstrTime(myevent.dateTimeEnd)}`
+      }
    }

    if (myevent.infoextra) {
@@ -3177,6 +3195,17 @@ export const tools = {
    return ''
  },

+  getstrDateMonthTimeLong(mytimestamp: Date | number | string | undefined) {
+    // console.log('getstrDate', mytimestamp)
+    if (mytimestamp) return date.formatDate(mytimestamp, 'DD MMM YY - HH:mm')
+    return ''
+  },
+  getstrDateMonthLong(mytimestamp: Date | number | string | undefined) {
+    // console.log('getstrDate', mytimestamp)
+    if (mytimestamp) return date.formatDate(mytimestamp, 'DD MMMM YYYY')
+    return ''
+  },
+
  getstrDateMonthWeekTimeShort(mytimestamp: Date | number | string | undefined) {
    // console.log('getstrDate', mytimestamp)
    if (mytimestamp) return `${this.getDayOfWeek(mytimestamp)} ${date.formatDate(mytimestamp, 'DD MMM - HH:mm')}`
@@ -4181,7 +4210,7 @@ export const tools = {
  },

  scrollToTopAll() {
-    window.scrollTo(0,0);
+    window.scrollTo(0, 0);
  },
  scrollToTop() {
    const element = document.getElementById('mypage')
@@ -4501,7 +4530,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) {
@@ -5004,7 +5042,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
@@ -6333,7 +6371,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)
@@ -6827,7 +6865,6 @@ export const tools = {
  getdefaultnewrec_MySkill(): any {

    return {
-      _id: 0,
      idSector: tools.getSelectionByTable('sectors', 0, true),
      idSkill: tools.getSelectionByTable('skills', 0, true),
      idStatusSkill: tools.getSelectionByTable('statusSkills', [1]),
@@ -6846,8 +6883,6 @@ export const tools = {

  getdefaultnewrec_MyGoods(): any {
    return {
-      _id: 0,
-
      // idSectorGood: 0,
      // idGood: 0,
      // idStatusSkill: [],
@@ -6877,7 +6912,6 @@ export const tools = {

  getdefaultnewrec_MyGroup(): any {
    return {
-      _id: 0,
      groupname: '',
      photos: [],
      visibility: 0,
@@ -6912,7 +6946,6 @@ export const tools = {

  getdefaultnewrec_MyBacheca(): any {
    return {
-      _id: 0,
      idSector: tools.getSelectionByTable('sectors', 0, true),
      idSkill: tools.getSelectionByTable('skills', 0, true),
      idStatusSkill: tools.getSelectionByTable('statusSkills', []),
@@ -6935,9 +6968,9 @@ export const tools = {
  getdefaultnewrec_MyHosp(): any {
    return {
      visibile: true,
-      _id: 0,
      typeHosp: tools.getSelectionByTable(toolsext.TABTYPEHOSP, 2),
      idContribType: tools.getSelectionByTable('contribtypes', []),
+      accomodation: [],
      idCity: this.getCitySel(),
      pub_to_share: tools.getSelectionByTable('pub_to_share', shared_consts.PUBTOSHARE.ALL, true),
      photos: [],
@@ -7031,6 +7064,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) {
@@ -7724,7 +7758,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'))
      }
@@ -7738,7 +7772,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'))
      }
@@ -7749,7 +7783,52 @@ export const tools = {

  getPagination(table: string): IPagination {
    return { sortBy: 'desc', descending: true, page: 1, rowsNumber: 0, rowsPerPage: 10 }
-  }
+  },
+
+  getNumTabByTable(table: string) {
+    const myrec = shared_consts.MYTABS.find((rec: any) => rec.table === table)
+    return myrec ? myrec.id : -1
+  },
+
+  removeItemOnce(arr: any, value: any) {
+    const index = arr.indexOf(value)
+    if (index > -1) {
+      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 !

--- a/src/store/UserStore.ts
+++ b/src/store/UserStore.ts
@@ -35,12 +35,17 @@ import { Router } from 'vue-router'
 import { useProjectStore } from '@store/Projects'
 import { shared_consts } from '@/common/shared_vuejs'
 import { costanti } from '@costanti'
-import { 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'
 import { useCircuitStore } from './CircuitStore'

+export const CMD_USER = {
+  SET_FAVORITE: 1,
+  SET_BOOKMARK: 2,
+}
+
 export const DefaultUser: IUserFields = {
  _id: '',
  email: '',
@@ -76,6 +81,10 @@ export const DefaultUser: IUserFields = {
    asked_groups: [],
    refused_groups: [],
    notifs: [],
+    bookmark: [],
+    favorite: [],
+    myfav: [],
+    mybook: [],
    notif_idCities: [],
    notif_provinces: [],
    notif_regions: [],
@@ -141,6 +150,10 @@ export const DefaultProfile: IUserProfile = {
  asked_groups: [],
  refused_groups: [],
  notifs: [],
+  bookmark: [],
+  favorite: [],
+  myfav: [],
+  mybook: [],
  notif_idCities: [],
  notif_provinces: [],
  notif_regions: [],
@@ -236,7 +249,7 @@ export const useUserStore = defineStore('UserStore', {
      return { sortBy: 'name,username', descending: '1,1', page: 1, rowsNumber: 0, rowsPerPage: 10 }
    },
    getSortFieldsAvailable(): any[] {
-      return [{ label: 'Username', value: {'username': 1, 'name': 1} }, { label: 'Nome', value: {'name': 1, 'username': 1} }, { label: 'Ultimi reg.', value: {'date_reg': -1, 'username': 1} }]
+      return [{ label: 'Username', value: { 'username': 1, 'name': 1 } }, { label: 'Nome', value: { 'name': 1, 'username': 1 } }, { label: 'Ultimi reg.', value: { 'date_reg': -1, 'username': 1 } }]
    },

    IsMyFriendByUsername(username: string): boolean {
@@ -865,7 +878,7 @@ export const useUserStore = defineStore('UserStore', {
        value: step,
      }
      this.my.profile.stepTutorial = step
-      const ris = await this.execDbOpUser({mydata})
+      const ris = await this.execDbOpUser({ mydata })

      return ris
    },
@@ -877,7 +890,7 @@ export const useUserStore = defineStore('UserStore', {
      }
      if (this.my.profile.noNameSurname !== val) {
        this.my.profile.noNameSurname = val
-        return await this.execDbOpUser({mydata})
+        return await this.execDbOpUser({ mydata })
      }
    },
    async savenoCircuit(val: boolean) {
@@ -888,7 +901,7 @@ export const useUserStore = defineStore('UserStore', {
      }
      if (this.my.profile.noCircuit !== val) {
        this.my.profile.noCircuit = val
-        return await this.execDbOpUser({mydata})
+        return await this.execDbOpUser({ mydata })
      }
    },
    async savenoFoto(val: boolean) {
@@ -899,7 +912,7 @@ export const useUserStore = defineStore('UserStore', {
      }
      if (this.my.profile.noFoto !== val) {
        this.my.profile.noFoto = val
-        return await this.execDbOpUser({mydata})
+        return await this.execDbOpUser({ mydata })
      }
    },

@@ -1465,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 {}
@@ -1472,7 +1486,7 @@ export const useUserStore = defineStore('UserStore', {

    },

-    async loadGeneric(table: string, id: number, idnotif: string) {
+    async loadGeneric(table: string, id: any, idnotif: string) {
      const data = {
        table,
        id,
@@ -1483,6 +1497,7 @@ export const useUserStore = defineStore('UserStore', {
        .then((res) => {
          return res.data
        }).catch((error) => {
+          console.error('err', error)
          return {}
        })

@@ -1629,6 +1644,79 @@ export const useUserStore = defineStore('UserStore', {
          return {}
        })

-    }
+    },
+
+    async setFavorite($q: any, t: any, id: any, table: string, myrec: any) {
+      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.removeIObjectOnce(this.my.profile.favorite, { id, tab })
+            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'))
+          return {}
+        })
+
+    },
+
+    isBookmarked(id: string, table: string) {
+      const tab = tools.getNumTabByTable(table)
+      const mybookmark = this.my.profile.bookmark.find((rec: IBookmark) => ((rec.id === id) && (rec.tab === tab)))
+      return mybookmark
+    },
+
+    isFavorite(id: string, table: string) {
+      const tab = tools.getNumTabByTable(table)
+      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, myrec: any) {
+      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) {
+            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 {}
+        })
+
+    },
+
  },
 })
--- a/src/store/globalStore.ts
+++ b/src/store/globalStore.ts
@@ -1025,7 +1025,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
      path = path.substring(1)
      const mypage = this.getPage(`/${path}`)

-      console.log('mypage', mypage)
+      // console.log('mypage', mypage)

      // Controlla se l'ho già caricato
      if (!!mypage && (!!mypage.content || mypage.loadFirst || mypage.loaded)) {
--- a/src/views/admin/dbop/dbop.vue
+++ b/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>
--- a/src/views/user/editprofile/editprofile.vue
+++ b/src/views/user/editprofile/editprofile.vue
@@ -127,7 +127,9 @@
      </CMyFieldDb>

      <div class="myrow">
+
        <CMyFieldDb
+          v-if="false"
          :title="$t('reg.nationality')"
          table="users"
          tablesel="countries"
--- a/src/views/user/mycircuit/mycircuit.ts
+++ b/src/views/user/mycircuit/mycircuit.ts
@@ -330,6 +330,7 @@ export default defineComponent({
            'profile.img': 1,
            'profile.mycircuits': 1,
            'profile.qualifica': 1,
+            'profile.resid_province': 1,
            'account._id': 1,
            'account.saldo': 1,
            'account.fidoConcesso': 1,
--- a/src/views/user/mygroup/mygroup.ts
+++ b/src/views/user/mygroup/mygroup.ts
@@ -197,6 +197,7 @@ export default defineComponent({
            'profile.img': 1,
            'profile.mygroups': 1,
            'profile.qualifica': 1,
+            'profile.resid_province': 1,
            reported: 1,
            date_report: 1,
            username_who_report: 1,
--- a/src/views/user/mypagegood/mypagegood.ts
+++ b/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()
--- a/src/views/user/mypagegood/mypagegood.vue
+++ b/src/views/user/mypagegood/mypagegood.vue
@@ -1,23 +1,24 @@
 <template>
-  <CMyPage title="Bene"
-           imgbackground="images/calendario_eventi.jpg"
-           sizes="max-height: 120px" styleadd="bottom: -20px !important;">
-
+  <CMyPage
+    title="Bene"
+    imgbackground="images/calendario_eventi.jpg"
+    sizes="max-height: 120px"
+    styleadd="bottom: -20px !important;"
+  >
    <div v-if="!tools.isLogged()">
      <CCheckIfIsLogged></CCheckIfIsLogged>
    </div>

-    <CMyCardPopup
-      v-if="!!idGood"
+    <CMyCardService
+      v-if="idGood"
      :table="toolsext.TABMYGOODS"
      :nopopup="true"
-      :idRec="idGood">
-
-    </CMyCardPopup>
-
-    <br>
-    <br>
+      :idRec="idGood"
+    >
+    </CMyCardService>

+    <br />
+    <br />
  </CMyPage>
 </template>

--- a/src/views/user/mypagehosp/mypagehosp.ts
+++ b/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()
--- a/src/views/user/mypagehosp/mypagehosp.vue
+++ b/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>
--- a/src/views/user/myprofile/myprofile.vue
+++ b/src/views/user/myprofile/myprofile.vue
@@ -619,9 +619,7 @@
        <div
          v-if="
            userStore.userprofile &&
-            userStore.userprofile._id &&
-            (userStore.IsMyFriendByUsername(userStore.userprofile.username) ||
-              isMyRecord(userStore.userprofile.username))
+            userStore.userprofile._id
          "
        >
          <CTitleBanner
@@ -637,6 +635,13 @@
              class="fit column no-wrap justify-evenly content-start"
            >
              <div class="col-md-6 col-sm-6 q-ma-xs col-xs-12">
+                <CLabel
+                  v-if="!!userStore.userprofile.profile.resid_province"
+                  v-bind="$attrs"
+                  :copy="false"
+                  :value="globalStore.getProvinceByProv(userStore.userprofile.profile.resid_province)"
+                  label="Provincia"
+                />
                <CDateTime
                  v-if="
                    checkifShow('profile.dateofbirth') &&
@@ -657,13 +662,6 @@
                  "
                  label="Cellulare"
                />
-                <CLabel
-                  v-if="!!userStore.userprofile.profile.resid_province"
-                  v-bind="$attrs"
-                  :copy="true"
-                  :value="globalStore.getProvinceByProv(userStore.userprofile.profile.resid_province)"
-                  label="Provincia"
-                />

                <!--
                <CMyFieldRec
--- a/src/views/user/myservice/myservice.ts
+++ b/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()
@@ -37,7 +37,7 @@ export default defineComponent({

    const table = ref(toolsext.TABMYSKILLS)

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

    const filtroutente = ref(<any[]>[])
    const showPic = ref(false)
@@ -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,
--- a/src/views/user/myservice/myservice.vue
+++ b/src/views/user/myservice/myservice.vue
@@ -7,13 +7,11 @@
      <CCheckIfIsLogged></CCheckIfIsLogged>
    </div>
    <div v-else>
-      <CMyCardPopup
-        v-if="!!idSkill"
+      <CMyCardService v-if="idSkill"
        :table="toolsext.TABMYSKILLS"
        :nopopup="true"
        :idRec="idSkill">
-
-      </CMyCardPopup>
+      </CMyCardService>
    </div>

    <!--
Author	SHA1	Message	Date
Surya Paolo	cfed7552b1	versione 0.6.3	2023-04-07 22:37:28 +02:00
Surya Paolo	c122f0930e	ver 0.6.3	2023-04-07 22:20:17 +02:00
Surya Paolo	5789567cd2	aktre modifiche sistemando...	2023-04-07 21:48:33 +02:00
Surya Paolo	32b2eb4755	aggio2	2023-04-07 21:22:04 +02:00
Surya Paolo	41fa886bc8	aggiornamento...	2023-04-07 21:10:16 +02:00
Surya Paolo	a8eb6344ef	Revert "Aggiornamento a 0.6.1" This reverts commit `701e1f1968`.	2023-04-07 20:07:56 +02:00
Surya Paolo	9c08ebaacd	Revert "Aggiornamento a 0.6.1" This reverts commit `701e1f1968`.	2023-04-07 18:38:46 +02:00
Surya Paolo	eb4998dcd2	Revert "Aggiornamento a 0.6.1" This reverts commit `701e1f1968`.	2023-04-07 18:38:22 +02:00
Surya Paolo	799a8a0e15	Revert "nuova veste grafica: myskills, mygoods, mybachecas, myhosps," This reverts commit `6fad472211`.	2023-04-07 18:24:15 +02:00
Surya Paolo	6e6e363059	Revert "Aggiornamento a 0.6.1" This reverts commit `701e1f1968`.	2023-04-07 18:01:48 +02:00
Surya Paolo	7148b773ea	Revert "cambio nome ai circuiti" This reverts commit `0365c58326`.	2023-04-07 17:21:22 +02:00
Surya Paolo	701e1f1968	Aggiornamento a 0.6.1	2023-04-07 17:14:51 +02:00
Surya Paolo	6fad472211	nuova veste grafica: myskills, mygoods, mybachecas, myhosps, - cambiato id (da numero a stringa)	2023-04-07 02:46:27 +02:00
Surya Paolo	edcd244397	new version Visualizzazione Service	2023-04-04 15:27:03 +02:00
				`@@ -0,0 +1 @@`
				`export {default as CGalleryImages} from './CGalleryImages.vue'`
				`@@ -0,0 +1 @@`
				`export { default as CMyCardService } from './CMyCardService.vue'`