aktre modifiche sistemando...

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/extras": "^1.16.2",
-    "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.13",
+    "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.16",
-    "@vue-leaflet/vue-leaflet": "^0.7.0",
+    "@vue-leaflet/vue-leaflet": "^0.9.0",
-    "@vue/compat": "^3.2.45",
+    "@vue/compat": "^3.2.47",
-    "@vue/compiler-sfc": "^3.2.45",
+    "@vue/compiler-sfc": "^3.2.47",
     "@vue/eslint-config-standard": "7.0.0",
-    "@vuelidate/core": "^2.0.0",
+    "@vuelidate/core": "^2.0.2",
-    "@vuelidate/validators": "^2.0.0",
+    "@vuelidate/validators": "^2.0.2",
-    "acorn": "^8.8.1",
+    "acorn": "^8.8.2",
     "animate.css": "^4.1.1",
-    "autoprefixer": "^10.4.13",
+    "autoprefixer": "^10.4.14",
-    "axios": "^1.2.1",
+    "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",
+    "gsap": "^3.11.5",
-    "jquery": "^3.6.2",
+    "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",
+    "vee-validate": "^4.8.4",
-    "vue": "^3.2.45",
+    "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,56 +82,47 @@
     "@types/bcryptjs": "^2.4.2",
     "@types/dotenv": "^8.2.0",
     "@types/googlemaps": "^3.43.3",
-    "@types/jest": "^29.2.4",
+    "@types/jest": "^29.5.0",
-    "@types/js-cookie": "^3.0.2",
+    "@types/js-cookie": "^3.0.3",
-    "@types/node": "18.11.16",
+    "@types/node": "18.15.11",
     "@types/nprogress": "^0.2.0",
     "@types/vue-tel-input": "^2.1.2",
-    "@types/vuelidate": "^0.7.15",
+    "@types/vuelidate": "^0.7.16",
-    "@typescript-eslint/eslint-plugin": "^5.46.1",
+    "@typescript-eslint/eslint-plugin": "^5.57.1",
-    "@typescript-eslint/parser": "^5.46.1",
+    "@typescript-eslint/parser": "^5.57.1",
-    "eslint": "^8.30.0",
+    "eslint": "^8.37.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-import": "^2.26.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",
+    "node-sass": "7.0.0",
-    "npm-check-updates": "^16.6.0",
+    "npm-check-updates": "^16.10.7",
     "optimize-css-assets-webpack-plugin": "^6.0.1",
-    "postcss": "^8.4.20",
+    "postcss": "^8.4.21",
-    "postcss-loader": "^7.0.2",
+    "postcss-loader": "^7.2.4",
-    "sass-loader": "^13.2.0",
+    "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 40 Chrome versions",
-    "last 40 Firefox versions",
-    "last 10 Edge versions",
-    "last 35 Safari versions",
-    "last 60 Android versions",
-    "last 250 ChromeAndroid versions",
-    "last 60 FirefoxAndroid versions",
-    "last 30 iOS versions",
-    "last 10 Opera versions",
     "> 0.05%",
     "not dead"
   ],

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,

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 }
 
@@ -1159,6 +1159,8 @@ export default defineComponent({
               idStatusSkill: 1,
               idContribType: 1,
               'profile.username_telegram': 1,
+              'profile.favorite': 1,
+              'profile.bookmark': 1,
               idCity: 1,
               pub_to_share: 1,
               numLevel: 1,
@@ -1228,6 +1230,8 @@ export default defineComponent({
               idStatusSkill: 1,
               idContribType: 1,
               'profile.username_telegram': 1,
+              'profile.favorite': 1,
+              'profile.bookmark': 1,
               idCity: 1,
               pub_to_share: 1,
               dateTimeStart: 1,
@@ -1305,6 +1309,8 @@ export default defineComponent({
               preferences: 1,
               idContribType: 1,
               'profile.username_telegram': 1,
+              'profile.favorite': 1,
+              'profile.bookmark': 1,
               photos: 1,
               idCity: 1,
               pub_to_share: 1,
@@ -1352,6 +1358,8 @@ export default defineComponent({
               idStatusSkill: 1,
               idContribType: 1,
               'profile.username_telegram': 1,
+              'profile.favorite': 1,
+              'profile.bookmark': 1,
               idCity: 1,
               pub_to_share: 1,
               numLevel: 1,

src/components/CFinder/CFinder.vue

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

src/components/CMyActivities/CMyActivities.ts

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

src/components/CMyCardCircuitPopup/CMyCardCircuitPopup.ts

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

src/components/CMyCardGrpPopup/CMyCardGrpPopup.ts

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

src/components/CMyRecCard/CMyRecCard.vue

@@ -1,77 +1,177 @@
 <!--suppress ALL -->
 <template>
-  <div class="q-py-xs centermydiv cardrec"
+  <div
-       :style="`max-width: `+ (tools.getwidth($q) - 20) +`px; ` + ($q.screen.lt.sm ? (`min-width: `+ (tools.getwidth($q) - (20 + margin_right)) +`px;`) : ``)">
+    class="q-py-xs centermydiv cardrec"
-    <q-item v-if="myrec" clickable v-ripple :class="`shadow-2 q-btn--rounded ` + ($q.dark.isActive ? `bg-black`: `bg-teal-1`)">
+    :style="
-
+      `max-width: ` +
-
+      (tools.getwidth($q) - 20) +
-
+      `px; ` +
-      <q-item-section v-if="(shared_consts.TABLES_VISU_IMG.includes(table)) && (myrec.photos && myrec.photos.length > 0)" avatar
+      ($q.screen.lt.sm
-                      @click="cmdExt(costanti.CMD_SHOW_PAGE, myrec)">
+        ? `min-width: ` + (tools.getwidth($q) - (20 + margin_right)) + `px;`
-        <q-badge v-if="showBadge()" class="q-my-xs self-center" :color="fieldsTable.getColByAdType(myrec.adType)">
+        : ``)
+    "
+  >
+    <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"
+          <q-icon
-                  class="q-ml-xs"/>
+            :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"
+          <q-img
-                 img-class="imgprofile" height="60px"/>
+            :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
-        <q-badge v-if="showBadge()" class="q-my-xs self-center" :color="fieldsTable.getColByAdType(myrec.adType)">
+          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"
+          <q-icon
-                  class="q-ml-xs"/>
+            :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" >
+        <q-item-label lines="2" class="full-width">
-          <span v-for="(rec, ind) of tools.getArrSubSector(table, myrec)" :key="ind">
+          <span
-            <q-chip dense class="text-center shadow-5 glossy text-white bg-green">{{ rec.descr }}</q-chip>
+            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">
+            <span
-              <q-chip dense class="text-center shadow-5 glossy text-white bg-blue">{{ rec.descr }}</q-chip></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">
+        <q-item-label lines="1" style="" class="text_user_city">
-          <span class="text-weight-bold">{{ tools.getNameToShow(myrec) }}</span> -
+          <div class="row justify-between">
-          <span v-for="(rec, ind) of myrec.mycities" :key="ind"><span v-if="ind > 0">, </span>{{ rec.comune }} ({{ rec.prov }})</span>
+            <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
+                <q-item
-                        @click="cmdExt(costanti.CMD_MODIFY, myrec._id)">
+                  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">

src/components/CMyUser/CMyUser.vue

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

src/components/CSendCoins/CSendCoins.vue

@@ -24,7 +24,7 @@
             label="Circuito"
           >
           </q-select>
-          <div v-else>Circuito: {{ circuitname }}</div>
+          <div v-else>{{ circuitname }}</div>
 
           <q-banner
             rounded

src/components/CSkill/CSkill.ts

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

src/components/CSkill/CSkill.vue

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

src/model/UserStore.ts

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

src/statics/lang/it.js

@@ -1200,6 +1200,7 @@ const msg_it = {
       lista_ricev_title: 'Questa è la lista degli Utenti che hanno cliccato su "Ricevi RIS" nelle ultime 8 ore',
       info: 'Informazioni su questo Circuito',
       aggiuntive: 'Il Circuito è una una rete di individui, che fanno riferimento ad un territorio provinciale, nella quale ciascuno può offrire i propri talenti, competenze e produzioni (Beni, Servizi, Ospitalità, ecc.) e riceverne da altri, utilizzando anche i <strong>RIS</strong> come metodo di scambio, sulla base di <strong>relazioni di fiducia</strong>.',
+      collettivi_info: 'Il Conto Collettivo è affidato ad un gruppo di persone, attivo nel territorio provinciale, che lo utilizza per organizzare iniziative di interesse comune, nello spirito di Riso.',
       name: 'Nome Circuito',
       path: 'Nome Pagina',
       subname: 'SottoNome',
@@ -1488,8 +1489,8 @@ const msg_it = {
       favorite_unset: 'Rimosso dai Preferiti',
       bookmark_set: 'Aggiunto ai Segnalibri',
       bookmark_unset: 'Rimosso dai Segnalibri',
-      favorite: 'Utenti Favoriti',
+      favorite: 'Piace a {num} utenti',
-      bookmark: 'Utenti Segnalibri',
+      bookmark: 'Salvato da {num} utenti',
     },
   },
 

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) {
@@ -4192,7 +4210,7 @@ export const tools = {
   },
 
   scrollToTopAll() {
-    window.scrollTo(0,0);
+    window.scrollTo(0, 0);
   },
   scrollToTop() {
     const element = document.getElementById('mypage')
@@ -4512,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) {
@@ -5015,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
@@ -6344,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)
@@ -6943,10 +6970,10 @@ export const tools = {
       visibile: true,
       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: [],
-      accomodation: [],
       descr: '',
       note: '',
       website: '',
@@ -7037,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) {
@@ -7730,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'))
       }
@@ -7744,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'))
       }
@@ -7758,7 +7786,8 @@ export const tools = {
   },
 
   getNumTabByTable(table: string) {
-    return shared_consts.MYTABS.findIndex((rec: any) => rec.table === table)
+    const myrec = shared_consts.MYTABS.find((rec: any) => rec.table === table)
+    return myrec ? myrec.id : -1
   },
 
   removeItemOnce(arr: any, value: any) {
@@ -7767,7 +7796,39 @@ export const tools = {
       arr.splice(index, 1)
     }
     return arr;
-  }
+  },
+
+  indexOfObject(arr: any, obj: any) {
+    let l = arr.length, i, k, ok;
+    for (let i = 0; i < l; i++) {
+      ok = true;
+      for (k in obj) if (obj.hasOwnProperty(k)) {
+        if (arr[i][k] !== obj[k]) {
+          ok = false;
+          break;
+        }
+      }
+      if (ok) return i;
+    }
+    return -1; // no match
+  },
+
+  removeIObjectOnce(arr: any, obj: IBookmark | IFavorite) {
+    const index = this.indexOfObject(arr, obj)
+    if (index > -1) {
+      arr.splice(index, 1)
+    }
+    return arr;
+  },
+
+  optionsTable(table: string) {
+    if (shared_consts.TABLES_FAVORITE_BOOKMARK.includes(table))
+      return shared_consts.OPTIONS_ADD_COUNT_FAVORITE
+
+    return 0
+  },
+
+
 
   // FINE !
 

src/store/UserStore.ts

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

src/views/admin/dbop/dbop.vue

@@ -316,6 +316,13 @@
           EseguiFunz('ReplaceUsername', search_username, replace_username)
         "
       ></q-btn>
+      <q-btn
+        label="Replace Circuit"
+        color="primary"
+        @click="
+          EseguiFunz('ReplaceCircuitName', search_username, replace_username)
+        "
+      ></q-btn>
       <br />
     </div>
     <div class="row">
@@ -328,6 +335,16 @@
       ></q-btn>
       <br />
     </div>
+    <div class="row">
+      <q-btn
+        label="Replace All Circuits with 'Circuito RIS nomeprovincia'"
+        color="primary"
+        @click="
+          EseguiFunz('ReplaceAllCircuits')
+        "
+      ></q-btn>
+      <br />
+    </div>
     <div class="row">
       <q-input
         v-model="valmin"
@@ -397,6 +414,22 @@
       ></q-btn>
       <br />
     </div>
+    <div class="row">
+      <q-btn
+        label="Converti Tabelle: myskills, mygoods da INT a STRING"
+        color="primary"
+        @click="EseguiFunz('ConvTablesFromIntToString', '', '')"
+      ></q-btn>
+      <br />
+    </div>
+    <div class="row">
+      <q-btn
+        label="Removeinteger"
+        color="primary"
+        @click="EseguiFunz('Removeinteger', '', '')"
+      ></q-btn>
+      <br />
+    </div>
 
     <q-field stack-label dense>
       <template v-slot:control>

src/views/user/mycircuit/mycircuit.vue

@@ -256,6 +256,9 @@
               style="max-width: 500px"
               v-if="tools.iCanShowCircuitsMember(circuit)"
             >
+              <div class="text-h7 q-mb-sm">
+                <div v-html="$t('circuit.collettivi_info')"></div>
+              </div>
               <q-tabs
                 v-show="tools.iAmAdminCircuit(circuit.name)"
                 v-model="tabmembers"

src/views/user/mypagegood/mypagegood.ts

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

src/views/user/mypagegood/mypagegood.vue

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

src/views/user/mypagehosp/mypagehosp.ts

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

src/views/user/mypagehosp/mypagehosp.vue

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

src/views/user/myservice/myservice.ts

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

src/views/user/myservice/myservice.vue

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