- fix QSelect

- permessi none/friends/all

_ALL_SITES/freeplanet.app/db/lang/ws_it.js

@@ -24,7 +24,7 @@ const msg_website_it = {
     home: 'Home',
     profile: 'Profilo',
     profile2: 'ProfiloU',
-    profile3: 'Profilo3',
+    mypage2: 'mypage2',
     test: 'Test',
     projects: 'Progetti',
     report: 'Report Ore',

_ALL_SITES/freeplanet.app/db/static_data.ts

@@ -105,6 +105,19 @@ const routes_admin: IListRoutes[] = [
     inmenu: true,
     submenu: true,
     onlyAdmin: true
+  },
+  {
+    active: true,
+    order: 1040,
+    path: '/admin/importfile',
+    materialIcon: 'event_seat',
+    name: 'otherpages.manage.importfile',
+    component: () => import('@/rootgen/admin/importdata/importdata.vue'),
+    level_parent: 0.0,
+    level_child: 0.5,
+    inmenu: true,
+    submenu: true,
+    onlyAdmin: true
   }
 ]
 
@@ -387,9 +400,31 @@ const baseroutes: IListRoutes[] = [
     inmenu: true,
     infooter: true,
   },
+  {
+    active: true,
+    order: 120,
+    path: '/editprofile',
+    materialIcon: 'fas fa-user',
+    name: 'pages.profile3',
+    component: () => import('@/views/user/editprofile/editprofile.vue'),
+    meta: { requiresAuth: true },
+    inmenu: false,
+    infooter: false,
+  },
   {
     active: true,
     order: 130,
+    path: '/friends',
+    materialIcon: 'fas fa-users',
+    name: 'mypages.friends',
+    component: () => import('@/views/user/myfriends/myfriends.vue'),
+    meta: { requiresAuth: true },
+    inmenu: true,
+    infooter: true,
+  },
+  {
+    active: true,
+    order: 135,
     path: '/my/:username',
     materialIcon: 'fas fa-user',
     name: 'pages.profile2',
@@ -400,48 +435,15 @@ const baseroutes: IListRoutes[] = [
   },
   {
     active: true,
-    order: 120,
+    order: 130,
-    path: '/test',
+    path: '/mypage/:idSkill',
     materialIcon: 'fas fa-user',
-    name: 'pages.test',
+    name: 'pages.mypage2',
-    component: () => import('@/views/user/test/test.vue'),
+    component: () => import('@/views/user/mypageskill/mypageskill.vue'),
     meta: { requiresAuth: true },
-    inmenu: true,
+    inmenu: false,
-    infooter: true,
+    infooter: false,
   },
-  /*{
-    active: true,
-    order: 6,
-    path: '/b',
-    faIcon: 'fa fa-list-alt',
-    materialIcon: 'format_list_numbered',
-    name: 'pages.Todo',
-    routes2: routes_todo,
-    level_parent: 0,
-    level_child: 0.5,
-    inmenu: true,
-    solotitle: true,
-    infooter: true,
-  },
-
-   */
-
-  /*
-  <{
-    active: true,
-    order: 7,
-    path: '/c',
-    faIcon: 'fa fa-list-alt',
-    materialIcon: 'next_week',
-    name: 'pages.projects',
-    // routes2: routes_projects,
-    level_parent: 0,
-    level_child: 0.5,
-    inmenu: true,
-    solotitle: true,
-    infooter: true,
-  },
-  */
   {
     active: true,
     order: 2000,

_ALL_SITES/freeplanet.app/root/home/home.ts

@@ -12,6 +12,7 @@ import { CVerifyTelegram } from '@src/components/CVerifyTelegram'
 import { useGlobalStore } from '@store/globalStore'
 import { useUserStore } from '@store/UserStore'
 import { static_data } from '@/db/static_data'
+import MixinBase from '@/mixins/mixin-base'
 
 
 export default defineComponent({
@@ -20,6 +21,7 @@ export default defineComponent({
   setup() {
     const globalStore = useGlobalStore()
     const userStore = useUserStore()
+    const { getValDb } = MixinBase()
 
     function isEmailVerified() {
       return userStore.my.verified_email
@@ -44,6 +46,10 @@ export default defineComponent({
       return userStore.isUserOk()
     }
 
+    function getLinkBotTelegram(): string {
+      return getValDb('TELEG_BOT_LINK', false)
+    }
+
     return {
       tools,
       static_data,
@@ -53,6 +59,7 @@ export default defineComponent({
       isLogged,
       openrighttoolbar,
       isUserOk,
+      getLinkBotTelegram,
     }
   },
 })

_ALL_SITES/freeplanet.app/root/home/home.vue

@@ -11,6 +11,7 @@
 
     <!--<CMapsEsempio></CMapsEsempio>-->
 
+
     <div v-if="isLogged()">
       <CVerifyEmail v-if="!isEmailVerified()">
 
@@ -21,15 +22,17 @@
       </CVerifyTelegram>
 
       <div v-if="isUserOk()">
-        <q-banner rounded class="bg-primary text-white">
+        <div v-if="isUserOk()">
-          <div class="text-h6 text-center">
+          <q-banner rounded class="bg-primary text-white">
-            Ora Accedi al Bot Telegram <br>
+            <div class="text-h6 text-center">
-            per vedere tutti i Menu e le chat !
+              Ora Accedi al Bot Telegram <br>
-          </div>
+              per vedere tutti i Menu e le chat !
-          <template v-slot:action>
+            </div>
-            <q-btn flat color="white" label="Accedi al Bot Telegram" @click="getLinkBotTelegram()"/>
+            <template v-slot:action>
-          </template>
+              <q-btn icon="fab fa-telegram" flat color="white" label="Accedi al Bot Telegram" type="a" target="__blank" :href="getLinkBotTelegram()"/>
-        </q-banner>
+            </template>
+          </q-banner>
+        </div>
       </div>
 
     </div>

_ALL_SITES/insiemesipuo.app/db/lang/ws_it.js

@@ -24,6 +24,7 @@ const msg_website_it = {
     home: 'Home',
     profile: 'Profilo',
     profile2: 'ProfiloU',
+    mypage2: 'mypage2',
     test: 'Test',
     projects: 'Progetti',
     report: 'Report Ore',

_ALL_SITES/insiemesipuo.app/db/static_data.ts

@@ -105,6 +105,19 @@ const routes_admin: IListRoutes[] = [
     inmenu: true,
     submenu: true,
     onlyAdmin: true
+  },
+  {
+    active: true,
+    order: 1040,
+    path: '/admin/importfile',
+    materialIcon: 'event_seat',
+    name: 'otherpages.manage.importfile',
+    component: () => import('@/rootgen/admin/importdata/importdata.vue'),
+    level_parent: 0.0,
+    level_child: 0.5,
+    inmenu: true,
+    submenu: true,
+    onlyAdmin: true
   }
 ]
 
@@ -365,20 +378,53 @@ const baseroutes: IListRoutes[] = [
     inmenu: true,
     infooter: true,
   },
+  /*{
+    active: true,
+    order: 100,
+    path: '/presentazione',
+    materialIcon: 'fas fa-info',
+    name: 'pages.presentazione',
+    component: () => import('@src/root/presentazione/presentazione.vue'),
+    reqauth: false,
+    inmenu: true,
+    infooter: true,
+  },*/
   {
     active: true,
     order: 120,
-    path: '/profile',
+    path: '/myprofile',
     materialIcon: 'fas fa-user',
     name: 'pages.profile',
-    component: () => import('@/views/user/editprofile/editprofile.vue'),
+    component: () => import('@/views/user/myprofile/myprofile.vue'),
     meta: { requiresAuth: true },
     inmenu: true,
     infooter: true,
   },
+  {
+    active: true,
+    order: 120,
+    path: '/editprofile',
+    materialIcon: 'fas fa-user',
+    name: 'pages.profile3',
+    component: () => import('@/views/user/editprofile/editprofile.vue'),
+    meta: { requiresAuth: true },
+    inmenu: false,
+    infooter: false,
+  },
   {
     active: true,
     order: 130,
+    path: '/friends',
+    materialIcon: 'fas fa-users',
+    name: 'mypages.friends',
+    component: () => import('@/views/user/myfriends/myfriends.vue'),
+    meta: { requiresAuth: true },
+    inmenu: true,
+    infooter: true,
+  },
+  {
+    active: true,
+    order: 135,
     path: '/my/:username',
     materialIcon: 'fas fa-user',
     name: 'pages.profile2',
@@ -390,47 +436,14 @@ const baseroutes: IListRoutes[] = [
   {
     active: true,
     order: 130,
-    path: '/mypage/:idskill',
+    path: '/mypage/:idSkill',
     materialIcon: 'fas fa-user',
-    name: 'pages.profile2',
+    name: 'pages.mypage2',
     component: () => import('@/views/user/mypageskill/mypageskill.vue'),
     meta: { requiresAuth: true },
     inmenu: false,
     infooter: false,
   },
-  /*{
-    active: true,
-    order: 6,
-    path: '/b',
-    faIcon: 'fa fa-list-alt',
-    materialIcon: 'format_list_numbered',
-    name: 'pages.Todo',
-    routes2: routes_todo,
-    level_parent: 0,
-    level_child: 0.5,
-    inmenu: true,
-    solotitle: true,
-    infooter: true,
-  },
-
-   */
-
-  /*
-  <{
-    active: true,
-    order: 7,
-    path: '/c',
-    faIcon: 'fa fa-list-alt',
-    materialIcon: 'next_week',
-    name: 'pages.projects',
-    // routes2: routes_projects,
-    level_parent: 0,
-    level_child: 0.5,
-    inmenu: true,
-    solotitle: true,
-    infooter: true,
-  },
-  */
   {
     active: true,
     order: 2000,

_ALL_SITES/insiemesipuo.app/root/home/home.ts

@@ -12,6 +12,7 @@ import { CVerifyTelegram } from '@src/components/CVerifyTelegram'
 import { useGlobalStore } from '@store/globalStore'
 import { useUserStore } from '@store/UserStore'
 import { static_data } from '@/db/static_data'
+import MixinBase from '@/mixins/mixin-base'
 
 
 export default defineComponent({
@@ -20,6 +21,7 @@ export default defineComponent({
   setup() {
     const globalStore = useGlobalStore()
     const userStore = useUserStore()
+    const { getValDb } = MixinBase()
 
     function isEmailVerified() {
       return userStore.my.verified_email
@@ -44,6 +46,10 @@ export default defineComponent({
       return userStore.isUserOk()
     }
 
+    function getLinkBotTelegram(): string {
+      return getValDb('TELEG_BOT_LINK', false)
+    }
+
     return {
       tools,
       static_data,
@@ -53,6 +59,7 @@ export default defineComponent({
       isLogged,
       openrighttoolbar,
       isUserOk,
+      getLinkBotTelegram,
     }
   },
 })

_ALL_SITES/insiemesipuo.app/root/home/home.vue

@@ -11,6 +11,7 @@
 
     <!--<CMapsEsempio></CMapsEsempio>-->
 
+
     <div v-if="isLogged()">
       <CVerifyEmail v-if="!isEmailVerified()">
 
@@ -21,15 +22,17 @@
       </CVerifyTelegram>
 
       <div v-if="isUserOk()">
-        <q-banner rounded class="bg-primary text-white">
+        <div v-if="isUserOk()">
-          <div class="text-h6 text-center">
+          <q-banner rounded class="bg-primary text-white">
-            Ora Accedi al Bot Telegram <br>
+            <div class="text-h6 text-center">
-            per vedere tutti i Menu e le chat !
+              Ora Accedi al Bot Telegram <br>
-          </div>
+              per vedere tutti i Menu e le chat !
-          <template v-slot:action>
+            </div>
-            <q-btn flat color="white" label="Accedi al Bot Telegram" @click="getLinkBotTelegram()"/>
+            <template v-slot:action>
-          </template>
+              <q-btn icon="fab fa-telegram" flat color="white" label="Accedi al Bot Telegram" type="a" target="__blank" :href="getLinkBotTelegram()"/>
-        </q-banner>
+            </template>
+          </q-banner>
+        </div>
       </div>
 
     </div>

_ALL_SITES/popolodelnuovomondo.app/.env.development

@@ -11,11 +11,11 @@ PROVA_PAOLO="PROVA ENV FUNZIONA!"
 LANG_DEFAULT="it"
 PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF"
 MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T"
-MONGODB_HOST="http://192.168.1.8:3000"
+MONGODB_HOST="http://192.168.0.200:3000"
 LOGO_REG="freeplanet-logo-full.svg"
 TEST_NAME="Paolo"
 TEST_SURNAME="Arena"
-TEST_EMAIL="paolo@freeplanet.app"
+TEST_EMAIL="perseo@freeplanet.app"
 TEST_USERNAME="paoloar773"
 TEST_PASSWORD="passpao1fr@1A"
 TEST_APORTADOR=""

_ALL_SITES/popolodelnuovomondo.app/db/lang/ws_it.js

@@ -24,6 +24,7 @@ const msg_website_it = {
     home: 'Home',
     profile: 'Profilo',
     profile2: 'ProfiloU',
+    mypage2: 'mypage2',
     test: 'Test',
     projects: 'Progetti',
     report: 'Report Ore',

_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts

@@ -392,17 +392,39 @@ const baseroutes: IListRoutes[] = [
   {
     active: true,
     order: 120,
-    path: '/profile',
+    path: '/myprofile',
     materialIcon: 'fas fa-user',
     name: 'pages.profile',
-    component: () => import('@/views/user/editprofile/editprofile.vue'),
+    component: () => import('@/views/user/myprofile/myprofile.vue'),
     meta: { requiresAuth: true },
     inmenu: true,
     infooter: true,
   },
+  {
+    active: true,
+    order: 120,
+    path: '/editprofile',
+    materialIcon: 'fas fa-user',
+    name: 'pages.profile3',
+    component: () => import('@/views/user/editprofile/editprofile.vue'),
+    meta: { requiresAuth: true },
+    inmenu: false,
+    infooter: false,
+  },
   {
     active: true,
     order: 130,
+    path: '/friends',
+    materialIcon: 'fas fa-users',
+    name: 'mypages.friends',
+    component: () => import('@/views/user/myfriends/myfriends.vue'),
+    meta: { requiresAuth: true },
+    inmenu: true,
+    infooter: true,
+  },
+  {
+    active: true,
+    order: 135,
     path: '/my/:username',
     materialIcon: 'fas fa-user',
     name: 'pages.profile2',
@@ -413,48 +435,15 @@ const baseroutes: IListRoutes[] = [
   },
   {
     active: true,
-    order: 120,
+    order: 130,
-    path: '/test',
+    path: '/mypage/:idSkill',
     materialIcon: 'fas fa-user',
-    name: 'pages.test',
+    name: 'pages.mypage2',
-    component: () => import('@/views/user/test/test.vue'),
+    component: () => import('@/views/user/mypageskill/mypageskill.vue'),
     meta: { requiresAuth: true },
-    inmenu: true,
+    inmenu: false,
-    infooter: true,
+    infooter: false,
   },
-  /*{
-    active: true,
-    order: 6,
-    path: '/b',
-    faIcon: 'fa fa-list-alt',
-    materialIcon: 'format_list_numbered',
-    name: 'pages.Todo',
-    routes2: routes_todo,
-    level_parent: 0,
-    level_child: 0.5,
-    inmenu: true,
-    solotitle: true,
-    infooter: true,
-  },
-
-   */
-
-  /*
-  <{
-    active: true,
-    order: 7,
-    path: '/c',
-    faIcon: 'fa fa-list-alt',
-    materialIcon: 'next_week',
-    name: 'pages.projects',
-    // routes2: routes_projects,
-    level_parent: 0,
-    level_child: 0.5,
-    inmenu: true,
-    solotitle: true,
-    infooter: true,
-  },
-  */
   {
     active: true,
     order: 2000,

_ALL_SITES/popolodelnuovomondo.app/package.json

@@ -23,25 +23,25 @@
   "dependencies": {
     "axios": "0.21.4",
     "@vue/eslint-config-standard": "5.1.2",
-    "@quasar/extras": "^1.12.2",
+    "@quasar/extras": "^1.12.4",
-    "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.11",
+    "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.12",
     "@vue/compat": "^3.2.26",
     "@vue/compiler-sfc": "^3.2.26",
-    "@vuelidate/core": "^2.0.0-alpha.32",
+    "@vuelidate/core": "^2.0.0-alpha.34",
-    "@vuelidate/validators": "^2.0.0-alpha.25",
+    "@vuelidate/validators": "^2.0.0-alpha.26",
-    "acorn": "^8.6.0",
+    "acorn": "^8.7.0",
-    "autoprefixer": "^10.4.0",
+    "autoprefixer": "^10.4.2",
     "bcryptjs": "^2.4.3",
-    "core-js": "^3.20.0",
+    "core-js": "^3.20.3",
     "crypto": "^1.0.1",
-    "date-fns": "^2.27.0",
+    "date-fns": "^2.28.0",
-    "dotenv": "^10.0.0",
+    "dotenv": "^11.0.0",
     "echarts": "^5.2.2",
-    "eslint-plugin-quasar": "^1.0.0",
+    "eslint-plugin-quasar": "^1.1.0",
     "eslint-plugin-standard": "^5.0.0",
-    "graphql": "^16.1.0",
+    "graphql": "^16.2.0",
     "graphql-tag": "^2.12.6",
-    "gsap": "^3.9.0",
+    "gsap": "^3.9.1",
     "jquery": "^3.6.0",
     "js-cookie": "^3.0.1",
     "localforage": "^1.10.0",
@@ -49,9 +49,9 @@
     "normalize.css": "^8.0.1",
     "npm": "^8.3.0",
     "nprogress": "^0.2.0",
-    "pinia": "^2.0.6",
+    "pinia": "^2.0.9",
     "prerender-spa-plugin": "^3.4.0",
-    "quasar": "^2.3.4",
+    "quasar": "^2.4.12",
     "quasar-extras": "^2.0.9",
     "register-service-worker": "^1.7.2",
     "vee-validate": "^4.4.10",
@@ -72,9 +72,9 @@
   },
   "devDependencies": {
     "node-sass": "6.0.1",
-    "webpack": "^5.0.0",
+    "webpack": "^5.66.0",
-    "@quasar/app": "^3.2.5",
+    "@quasar/app": "^3.2.9",
-    "@quasar/quasar-app-extension-qcalendar": "^4.0.0-beta.11",
+    "@quasar/quasar-app-extension-qcalendar": "^4.0.0-beta.12",
     "@types/bcryptjs": "^2.4.2",
     "@types/dotenv": "^8.2.0",
     "@types/googlemaps": "^3.43.3",
@@ -84,31 +84,31 @@
     "@types/nprogress": "^0.2.0",
     "@types/vue-tel-input": "^2.1.2",
     "@types/vuelidate": "^0.7.15",
-    "@typescript-eslint/eslint-plugin": "^5.7.0",
+    "@typescript-eslint/eslint-plugin": "^5.10.0",
-    "@typescript-eslint/parser": "^5.7.0",
+    "@typescript-eslint/parser": "^5.10.0",
-    "eslint": "^8.4.1",
+    "eslint": "^8.7.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^5.2.0",
-    "eslint-plugin-vue": "^8.2.0",
+    "eslint-plugin-vue": "^8.3.0",
     "file-loader": "^6.2.0",
     "html-webpack-plugin": "^5.5.0",
     "http-proxy-middleware": "^2.0.1",
     "jest": "^27.4.5",
     "json-loader": "^0.5.7",
-    "npm-check-updates": "^12.0.5",
+    "npm-check-updates": "^12.1.0",
     "optimize-css-assets-webpack-plugin": "^6.0.1",
     "postcss": "^8.4.5",
     "postcss-loader": "^6.2.1",
     "sass-loader": "^12.4.0",
     "strip-ansi": "=7.0.1",
-    "ts-jest": "^27.1.1",
+    "ts-jest": "^27.1.2",
     "ts-loader": "^9.2.6",
     "tslint": "^6.1.3",
     "tslint-config-standard": "^9.0.0",
     "tslint-loader": "^3.5.4",
-    "typescript": "^4.5.4",
+    "typescript": "^4.5.5",
     "vue-cli-plugin-element-ui": "^1.1.4",
     "vueify": "^9.4.1",
     "workbox-webpack-plugin": "^6.4.2"

_ALL_SITES/popolodelnuovomondo.app/quasar.conf.js

@@ -148,6 +148,7 @@ module.exports = configure((ctx) => ({
     https: false,
     port: 8083,
     open: false, // opens browser window automatically
+    liveReload: false,
   },
 
   // https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-framework
@@ -217,7 +218,6 @@ module.exports = configure((ctx) => ({
       'QCarouselSlide',
       'QPageScroller',
       'QAvatar',
-      'QSkeleton',
       'QImg',
       'QSplitter',
       'QRating',

src/components/CFinder/CFinder.ts

@@ -34,16 +34,15 @@ export default defineComponent({
     const searchList = ref(<ISearchList[]>[])
 
     const idSector = computed(() => {
-      let myval = 0
+      let myval: any = null
-      searchList.value.forEach((rec) => {
+      myval = searchList.value.find((rec) => (rec.table === 'sectors'))
-        console.log('  rec', rec)
+      if (myval) {
-        if (rec.table === 'sectors') {
+        const ris = myval.value || 0
-          console.log('trovato')
+        // console.log('idSector=', ris)
-          myval = rec.value
+        return ris
-        }
+      } else {
-      })
+        return 0
-      console.log('IDSECTOR = ' + myval)
+      }
-      return myval
     })
 
     function mounted() {
@@ -109,7 +108,7 @@ export default defineComponent({
           addall: true,
           filter: getFilterSkills,
           showcount: true,
-          useinput: true,
+          useinput: false,
         },
         {
           label: 'Specializzazione',
@@ -122,6 +121,7 @@ export default defineComponent({
           filter: getFilterSubSkills,
           showcount: true,
           useinput: false,
+          icon: 'far fa-id-card',
         },
         /*{
           label: 'Regione',
@@ -143,6 +143,7 @@ export default defineComponent({
           arrvalue: tools.getCookie(tools.COOK_SEARCH + 'provinces', [costanti.FILTER_TUTTI]),
           filter: null,
           useinput: true,
+          icon: 'flag',
         },
         {
           label: 'Città',
@@ -177,6 +178,7 @@ export default defineComponent({
           type: costanti.FieldType.multiselect,
           filter: null,
           useinput: false,
+          icon: 'mood',
         },
         {
           label: 'Contributo',
@@ -187,6 +189,8 @@ export default defineComponent({
           type: costanti.FieldType.multiselect,
           filter: null,
           useinput: false,
+          icon: 'currency_exchange',
+          //icon: 'swap_horizontal_circle',
         },
 
       ]

src/components/CGridTableRec/CGridTableRec.ts

@@ -279,7 +279,17 @@ export default defineComponent({
           if (item.table === 'skills') {
             // console.log('---PRIMA ', item.value)
             const valsaved = tools.getCookie(tools.COOK_SEARCH + 'skills' + '_' + newval, costanti.FILTER_TUTTI)
-            if (valsaved)
+            // check if exist
+            const recSkill = searchList.value.find((rec) => rec.table === 'skills')
+            let trovato = false
+            if (recSkill) {
+              console.log('recSkill.value', recSkill)
+              const arrvalues = valoriopt.value(recSkill.value, false)
+              console.log('arrvalues', arrvalues)
+              if (arrvalues)
+                trovato = arrvalues.find((rec: any) => rec[recSkill.key] === valsaved)
+            }
+            if (valsaved && trovato)
               item.value = valsaved
             else
               item.value = costanti.FILTER_TUTTI
@@ -438,7 +448,7 @@ export default defineComponent({
         }
       }
 
-      console.log('filtersearch', filtersearch)
+      // console.log('filtersearch', filtersearch)
 
       if (props.prop_search) {
         let nosearch = false
@@ -450,7 +460,6 @@ export default defineComponent({
           if (props.keyMain) {
             nosearch = true
             filtersearch.forEach((rec: any) => {
-              console.log('rec', rec)
               if (!!rec[props.keyMain]) {
                 nosearch = false
               }
@@ -464,7 +473,7 @@ export default defineComponent({
         }
       }
 
-      console.log('filtercustom', props.filtercustom)
+      // console.log('filtercustom', props.filtercustom)
 
 
       let params: IParamsQuery = {
@@ -843,7 +852,7 @@ export default defineComponent({
     function mounted() {
       // console.log('GridTable mounted', tablesel.value)
 
-      console.log('props.filtercustom', props.filtercustom)
+      // console.log('props.filtercustom', props.filtercustom)
 
 
       if (!!props.tablesList) {

src/components/CGridTableRec/CGridTableRec.vue

@@ -105,6 +105,7 @@
              :class="$q.screen.lt.sm ? `` : `row`  + ` text-blue `">
           <span v-for="(item, index) in searchList" :key="index">
             <CMySelect
+              :col="fieldsTable.getColByTable('myskills', item.key)"
               v-if="(item.type === costanti.FieldType.select) || (item.type === costanti.FieldType.select_by_server)"
               :label="labelcombo(item)"
               v-model:value="item.value"
@@ -115,6 +116,7 @@
               label-color="primary"
               class="combowidth"
               color="primary"
+              :icon_alternative="item.icon"
               :optval="fieldsTable.getKeyByTable(item.table)"
               :optlab="fieldsTable.getLabelByTable(item.table)"
               :options="valoriopt(item, false)"
@@ -127,6 +129,7 @@
 
             <CMySelect
               v-if="item.type === costanti.FieldType.multiselect_by_server"
+              :col="fieldsTable.getColByTable('myskills', item.key)"
               :multiselect_by_server="true"
               :label="labelcombo(item)"
               v-model:arrvalue="item.arrvalue"
@@ -138,6 +141,7 @@
               label-color="primary"
               class="combowidth"
               color="primary"
+              :icon_alternative="item.icon"
               :optval="fieldsTable.getKeyByTable(item.table)"
               :optlab="fieldsTable.getLabelByTable(item.table)"
               :options="valoriopt(item, false)"
@@ -164,6 +168,9 @@
               :option-value="fieldsTable.getKeyByTable(item.table)"
             >
 
+              <template v-if="item.icon" v-slot:prepend>
+                <q-icon :name="item.icon" />
+              </template>
               <template
                 v-if="item.arrvalue.length >= 1"
                 v-slot:selected-item="scope">
@@ -389,7 +396,6 @@
               class="q-ma-sm q-pa-sm colmodif col-grow rounded-borders " style="border: 1px solid #bbb"
               @click="colclicksel = mycol">
 
-              mycol : {{mycol}}
               <CMyPopupEdit
                 :table="mytable"
                 :canEdit="true"

src/components/CMyFieldDb/CMyFieldDb.ts

@@ -31,6 +31,11 @@ export default defineComponent({
       required: false,
       default: -1,
     },
+    maxlength: {
+      type: Number,
+      required: false,
+      default: 0,
+    },
     mysubsubkey: {
       type: String,
       required: false,
@@ -97,7 +102,7 @@ export default defineComponent({
     const { t } = useI18n()
     const globalStore = useGlobalStore()
 
-    const col = ref(<IColGridTable> { name: 'test' })
+    const col = ref(<IColGridTable> { name: 'test', fieldtype: 0, showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView, visible: true, maxlength: props.maxlength })
     const row = ref({})
 
     const { setValDb, getValDb } = MixinBase()

src/components/CMyPopupEdit/CMyPopupEdit.ts

@@ -177,7 +177,7 @@ export default defineComponent({
 
     const myImgGall = ref(<IImgGallery[]>[{}])
 
-    const col = ref(<IColGridTable> { name: 'test', fieldtype: 0 })
+    const col = ref(<IColGridTable> { name: 'test', fieldtype: 0, showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView, visible: true, maxlength: props.mycol ? props.mycol.maxlength : 0 })
 
     const myrow = toRef(props, 'row')
 

src/components/CMyPopupEdit/CMyPopupEdit.vue

@@ -1,6 +1,6 @@
 <template>
   <div :class="getclassCol(col)">
-    <div v-if="tools.checkIfShowField(col, (isInModif ? tools.TIPOVIS_EDIT_RECORD : 0) + (insertMode ? tools.TIPOVIS_NEW_RECORD : 0), visulabel, myvalue)" style="flex-grow: 1;">
+    <div v-if="tools.checkIfShowField(col, insertMode ? tools.TIPOVIS_NEW_RECORD : (isInModif ? tools.TIPOVIS_EDIT_RECORD : tools.TIPOVIS_SHOW_RECORD), visulabel, myvalue)" style="flex-grow: 1;">
       <div
         :class="{ flex: !isInModif, 'justify-center': true }">
         <div>
@@ -32,7 +32,6 @@
           </div>
           <div v-else-if="col.fieldtype === costanti.FieldType.string">
             <div v-if="visulabel || isInModif" :class="{ flex: !isInModif}">
-
               <q-input
                 v-bind="$attrs"
                 v-model="myvalue"
@@ -196,7 +195,6 @@
           </div>
           <div v-else-if="col.fieldtype === costanti.FieldType.date">
             <CDateTime
-              v-if="myvalue"
               :label="col.label"
               class="cursor-pointer"
               v-model:value="myvalue"

src/components/CMySelect/CMySelect.ts

@@ -115,6 +115,11 @@ export default defineComponent({
     withToggle: {
       type: Boolean,
       default: false,
+    },
+    icon_alternative: {
+      type: String,
+      required: false,
+      default: '',
     }
   },
   components: {},
@@ -317,6 +322,9 @@ export default defineComponent({
 
       if (props.col.jointable) {
         optionsreal.value = globalStore.getTableJoinByName(props.col.jointable, props.col.addall, props.col.filter)
+        // console.log('optionsreal.value', optionsreal.value)
+      } else {
+        optionsreal.value = props.options
       }
 
       myarr = optionsreal.value
@@ -326,7 +334,7 @@ export default defineComponent({
 
         // console.log('needle', needle, 'props.multiple', props.multiple)
         if (props.filter_table) {
-          // console.log('  FILTERTABLE', props.filter_field, myarr)
+          console.log('  FILTERTABLE', props.filter_field, myarr)
           if (props.multiple) {
             myarr = myarr.filter((rec: any) => rec[props.filter_field] === needle)
           } else {
@@ -348,6 +356,7 @@ export default defineComponent({
         // console.log('     myarr: ', myarr)
       }
 
+      // console.log('     myarr: ', myarr)
       return myarr
     }
 
@@ -494,6 +503,15 @@ export default defineComponent({
       }
     }
 
+    function getIcon() {
+      if (props.icon_alternative)
+        return props.icon_alternative
+      if (props.col && props.col['icon']) {
+        return props.col['icon']
+      }
+      return ''
+    }
+
     onMounted(mounted)
 
 
@@ -507,6 +525,7 @@ export default defineComponent({
       checkIfShowRec,
       abortFilterFn,
       newvaluefuncfirst,
+      getIcon,
     }
   }
 })

src/components/CMySelect/CMySelect.vue

@@ -25,6 +25,9 @@
         :option-value="optval"
         class="combowidth"
       >
+        <template v-if="getIcon() && !sola_lettura" v-slot:prepend>
+          <q-icon :name="getIcon()" />
+        </template>
 
         <template v-slot:no-option>
           <q-item>
@@ -89,6 +92,9 @@
         v-bind="$attrs"
         style="width: 250px"
       >
+        <template v-if="getIcon()" v-slot:prepend>
+          <q-icon :name="getIcon()" />
+        </template>
         <template v-slot:no-option>
           <q-item>
             <q-item-section class="text-grey">
@@ -128,6 +134,9 @@
         :option-label="optlab"
         :dense="dense">
 
+        <template v-if="getIcon()" v-slot:prepend>
+          <q-icon :name="getIcon()" />
+        </template>
         <template
           v-slot:selected-item="scope">
           <div v-if="scope.opt[optlab]">
@@ -137,7 +146,6 @@
               @remove="scope.removeAtIndex(scope.index)"
               v-if="checkIfShowRec(scope.opt)"
               color="white"
-              text-color="mycol"
               class="q-my-none q-ml-xs q-mr-none"
             >
               <q-avatar color="primary" text-color="white" :icon="scope.opt.icon ? scope.opt.icon : ''" size="12px"/>
@@ -182,6 +190,9 @@
         map-options
         v-bind="$attrs"
         class="combowidth">
+        <template v-if="getIcon()" v-slot:prepend>
+          <q-icon :name="getIcon()" />
+        </template>
         <template v-slot:option="scope">
           <q-item v-bind="scope.itemProps">
             <q-item-section avatar>

src/components/CMyUser/CMyUser.vue

@@ -10,7 +10,7 @@
         <q-item-section @click="naviga(`/my/` + contact.username)">
           <q-item-label><strong>{{ contact.name }} {{ contact.surname }}</strong> ({{ contact.username }})
           </q-item-label>
-          <q-item-label caption lines="1"><em>{{ contact.profile.qualifica }}</em></q-item-label>
+          <q-item-label v-if="contact.profile" caption lines="1"><em>{{ contact.profile.qualifica }}</em></q-item-label>
         </q-item-section>
 
         <q-item-section side v-if="visu === costanti.FRIENDS">

src/db/lang/ws_it.js

@@ -24,6 +24,7 @@ const msg_website_it = {
     home: 'Home',
     profile: 'Profilo',
     profile2: 'ProfiloU',
+    mypage2: 'mypage2',
     test: 'Test',
     projects: 'Progetti',
     report: 'Report Ore',

src/db/static_data.ts

@@ -424,7 +424,7 @@ const baseroutes: IListRoutes[] = [
   },
   {
     active: true,
-    order: 130,
+    order: 135,
     path: '/my/:username',
     materialIcon: 'fas fa-user',
     name: 'pages.profile2',
@@ -438,7 +438,7 @@ const baseroutes: IListRoutes[] = [
     order: 130,
     path: '/mypage/:idSkill',
     materialIcon: 'fas fa-user',
-    name: 'pages.profile2',
+    name: 'pages.mypage2',
     component: () => import('@/views/user/mypageskill/mypageskill.vue'),
     meta: { requiresAuth: true },
     inmenu: false,

src/model/GlobalStore.ts

@@ -539,6 +539,7 @@ export interface ISearchList {
   addall?: boolean
   showcount?: boolean
   tablesel?: string
+  icon?: string
 }
 
 export interface IFilter {

src/statics/lang/it.js

@@ -683,6 +683,7 @@ const msg_it = {
       showlastschedule: 'Vedi tutto il Calendario',
     },
     msgs: {
+      telegrammsg: 'Msg Telegram',
       message: 'Messaggio',
       messages: 'Messaggi',
       nomessage: 'Nessun Messaggio',

src/store/Modules/fieldsTable.ts

@@ -441,6 +441,7 @@ export const colmySkills = [
     jointable: 'sectors',
     showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit,
     visible: true,
+    icon: 'category',
   }),
   AddCol({
     name: 'idSkill',
@@ -451,7 +452,7 @@ export const colmySkills = [
     filter_table: 'sectors',
     filter_field: 'idSector',
     noshowlabel: true,
-    icon: 'far fa-id-card',
+    icon: 'engineering',
     showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView,
     allowNewValue: true,
   }),
@@ -464,7 +465,7 @@ export const colmySkills = [
     filter_table: 'skills',
     filter_field: 'idSkill',
     noshowlabel: true,
-    icon: 'fas fa-scroll',
+    icon: 'far fa-id-card',
     showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView,
     allowNewValue: true,
   }),
@@ -476,7 +477,7 @@ export const colmySkills = [
     jointable: 'levels',
     showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
     noshowlabel: true,
-    icon: 'fas fa-layer-group',
+    icon: 'grading',
   }),
   AddCol({
     name: 'idStatusSkill',
@@ -484,6 +485,8 @@ export const colmySkills = [
     fieldtype: costanti.FieldType.multiselect,
     jointable: 'statusSkills',
     showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
+    noshowlabel: true,
+    icon: 'mood',
   }),
   AddCol({
     name: 'idContribType',
@@ -492,7 +495,8 @@ export const colmySkills = [
     jointable: 'contribtypes',
     showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
     noshowlabel: true,
-    icon: 'fas fa-hands-helping',
+    icon: 'currency_exchange',
+    //icon: 'fas fa-hands-helping',
   }),
   AddCol({
     name: 'idCity',
@@ -916,6 +920,16 @@ export const fieldsTable = {
   getrecTableList(mytable: string) {
     return this.tablesList.find((rec) => rec.value === mytable)
   },
+  getColByTable(mytable: string, namecol: string) {
+    const tablerec: any = this.tablesList.find((rec) => rec.value === mytable)
+    if (tablerec) {
+      // console.log('tablerec', tablerec.columns)
+      const mycol = tablerec.columns.find((col: any) => col.name === namecol)
+      // console.log('mycol = ', mycol)
+      return mycol
+    } else
+      return null
+  },
   getKeyByTable(mytable: string): string {
     const myrec = this.getrecTableList(mytable)
     if (myrec) return ((myrec.colkey) ? myrec.colkey : '_id')
@@ -1388,7 +1402,7 @@ export const fieldsTable = {
     AddCol({
       name: 'profile.nationality', field: 'profile', subfield: 'nationality', label_trans: 'reg.nationality',
     }),
-    AddCol({ name: 'profile.dateofbirth', label_trans: 'reg.dateofbirth', fieldtype: costanti.FieldType.onlydate }),
+    AddCol({ name: 'profile.dateofbirth', label_trans: 'reg.dateofbirth', fieldtype: costanti.FieldType.date }),
     AddCol({ name: 'profile.born_city', label_trans: 'reg.born_city', fieldtype: costanti.FieldType.string }),
     AddCol({ name: 'profile.born_province', label_trans: 'reg.born_province', fieldtype: costanti.FieldType.string }),
     AddCol({ name: 'profile.born_country', label_trans: 'reg.born_country', fieldtype: costanti.FieldType.string }),

src/store/Modules/tools.ts

@@ -55,6 +55,8 @@ export const tools = {
 
   COOK_SEARCH: 'SEARCH_',
 
+  FRIENDS_SEARCH: 'FR_SE',
+
   getprefCountries: ['it', 'es', 'us'],
 
   APORTADOR_NONE: '------',

src/store/globalStore.ts

@@ -752,7 +752,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
     },
 
     async loadTable(params: IParamsQuery) {
-      console.log('loadTable', params)
+      // console.log('loadTable', params)
       const userStore = useUserStore()
 
       return Api.SendReq('/gettable', 'POST', params)

src/views/user/myfriends/myfriends.ts

@@ -30,7 +30,14 @@ export default defineComponent({
       searchList.value = []
       filtercustom.value = []
       arrfilterand.value = []
+
+      const filt_loaded = tools.getCookie(tools.COOK_SEARCH + tools.FRIENDS_SEARCH)
+      filter.value = filt_loaded ? filt_loaded : costanti.FIND_PEOPLE
     }
+    watch(() => filter.value, (newval: any, oldval) => {
+      tools.setCookie(tools.COOK_SEARCH + tools.FRIENDS_SEARCH, newval)
+
+    })
 
     function extraparams() {
       let lk_tab = 'users'

src/views/user/myprofile/myprofile.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="q-gutter-sm q-pa-sm q-pb-md">
-
+    <div v-if="myuser.date_reg" class="fit column no-wrap justify-evenly items-center content-start">
-    <div v-if="myuser.profile" class="fit column no-wrap justify-evenly items-center content-start">
 
       <div class="">
         <q-avatar size="140px">
@@ -18,8 +17,8 @@
         {{ myuser.username }}
       </div>
       <div class="col-12 text-h7">
-        <span v-if="myuser.profile.born_city">{{ myuser.profile.born_city }}</span> <span
+        <span v-if="myuser.profile && myuser.profile.born_city">{{ myuser.profile.born_city }}</span> <span
-        v-if="myuser.profile.nationality && myuser.profile.nationality !== 'Italia'">({{
+        v-if="myuser.profile && myuser.profile.nationality && myuser.profile.nationality !== 'Italia'">({{
           myuser.profile.nationality
         }})</span>
       </div>
@@ -39,11 +38,13 @@
         />
       </div>
 
-      <div class="col-12 text-h8 q-mt-sm">
+      <div v-if="myuser.name">
-        <em><span class="qualifica">{{ myuser.profile.qualifica }}</span></em>
+        <div class="col-12 text-h8 q-mt-sm">
-      </div>
+          <em><span class="qualifica">{{ myuser.profile.qualifica }}</span></em>
-      <div class="col-12 text-h8 q-mt-sm">
+        </div>
-        {{ myuser.profile.biografia }}
+        <div class="col-12 text-h8 q-mt-sm">
+          {{ myuser.profile.biografia }}
+        </div>
       </div>
 
       <q-btn
@@ -54,7 +55,7 @@
         to="/editprofile">
       </q-btn>
 
-      <div class="myrow justify-evenly items-center q-pa-sm q-ma-sm">
+      <div v-if="myuser.name" class="myrow justify-evenly items-center q-pa-sm q-ma-sm">
 
         <div class="col-6 q-ma-xs">
           <q-btn
@@ -62,7 +63,7 @@
             color="blue" type="a"
             size="md"
             rounded
-            :label="$t('msgs.message')"
+            :label="$t('msgs.telegrammsg')"
             :href="getLinkUserTelegram()" target="__blank">
           </q-btn>
 
@@ -101,25 +102,27 @@
       </q-card>
     </div>
 
-    <CTitleBanner
+    <div v-if="myuser.name">
-      class="" :title="$t('dashboard.info')" bgcolor="bg-primary" clcolor="text-white"
+      <CTitleBanner
-      myclass="myshad" :canopen="true">
+        class="" :title="$t('dashboard.info')" bgcolor="bg-primary" clcolor="text-white"
+        myclass="myshad" :canopen="true">
 
-      <div v-if="myuser.profile" class="fit column no-wrap justify-evenly content-start">
+        <div v-if="myuser.profile" class="fit column no-wrap justify-evenly content-start">
 
-        <div class="col-6 text-h6">
+          <div class="col-6 text-h6">
-          <CDateTime
+            <CDateTime
-            v-if="checkifShow('profile.dateofbirth') && !!myuser.profile.dateofbirth"
+              v-if="checkifShow('profile.dateofbirth') && !!myuser.profile.dateofbirth"
-            v-model:value="myuser.profile.dateofbirth"
+              v-model:value="myuser.profile.dateofbirth"
-            :label="$t('reg.dateofbirth')"
+              :label="$t('reg.dateofbirth')"
-            :canEdit="false">
+              :canEdit="false">
-          </CDateTime>
+            </CDateTime>
+
+          </div>
 
         </div>
 
-      </div>
+      </CTitleBanner>
-
+    </div>
-    </CTitleBanner>
 
     <CTitleBanner
       class="" title="Competenze e Talenti" bgcolor="bg-positive" clcolor="text-white"