diff --git a/_ALL_SITES/freeplanet.app/db/i18n_website.js b/_ALL_SITES/freeplanet.app/db/i18n_website.js index a03410f3..2837e648 100755 --- a/_ALL_SITES/freeplanet.app/db/i18n_website.js +++ b/_ALL_SITES/freeplanet.app/db/i18n_website.js @@ -9,7 +9,7 @@ const msg_website = { Category: 'Categorie', Todo: 'Todo', personal: 'Personale', - work: 'Lavoro', + bacheca: 'Bacheca', shopping: 'Spesa', Admin: 'Admin', Test1: 'Test1', diff --git a/_ALL_SITES/freeplanet.app/db/static_data.ts b/_ALL_SITES/freeplanet.app/db/static_data.ts index c615dfb2..ddcc917e 100755 --- a/_ALL_SITES/freeplanet.app/db/static_data.ts +++ b/_ALL_SITES/freeplanet.app/db/static_data.ts @@ -384,7 +384,7 @@ const baseroutes: IListRoutes[] = [ order: 10, path: '/bacheca', materialIcon: 'fas fa-bullhorn', - name: 'mypages.work', + name: 'mypages.bacheca', component: () => import('@/root/bacheca/bacheca.vue'), meta: { requiresAuth: true }, inmenu: true, diff --git a/_ALL_SITES/insiemesipuo.app/db/i18n_website.js b/_ALL_SITES/insiemesipuo.app/db/i18n_website.js index c1059426..ae7d4c5d 100755 --- a/_ALL_SITES/insiemesipuo.app/db/i18n_website.js +++ b/_ALL_SITES/insiemesipuo.app/db/i18n_website.js @@ -9,7 +9,7 @@ const msg_website = { Category: 'Categorie', Todo: 'Todo', personal: 'Personale', - work: 'Lavoro', + bacheca: 'Bacheca', shopping: 'Spesa', Admin: 'Admin', Test1: 'Test1', diff --git a/_ALL_SITES/insiemesipuo.app/db/static_data.ts b/_ALL_SITES/insiemesipuo.app/db/static_data.ts index 35538e13..1494f48d 100755 --- a/_ALL_SITES/insiemesipuo.app/db/static_data.ts +++ b/_ALL_SITES/insiemesipuo.app/db/static_data.ts @@ -384,7 +384,7 @@ const baseroutes: IListRoutes[] = [ order: 100, path: '/bacheca', materialIcon: 'fas fa-bullhorn', - name: 'mypages.work', + name: 'mypages.bacheca', component: () => import('@/root/bacheca/bacheca.vue'), meta: { requiresAuth: true }, inmenu: true, diff --git a/_ALL_SITES/popolodelnuovomondo.app/db/i18n_website.js b/_ALL_SITES/popolodelnuovomondo.app/db/i18n_website.js index c1059426..ae7d4c5d 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/db/i18n_website.js +++ b/_ALL_SITES/popolodelnuovomondo.app/db/i18n_website.js @@ -9,7 +9,7 @@ const msg_website = { Category: 'Categorie', Todo: 'Todo', personal: 'Personale', - work: 'Lavoro', + bacheca: 'Bacheca', shopping: 'Spesa', Admin: 'Admin', Test1: 'Test1', diff --git a/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts b/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts index cc610b2e..06a99c43 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts +++ b/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts @@ -384,7 +384,7 @@ const baseroutes: IListRoutes[] = [ order: 10, path: '/bacheca', materialIcon: 'fas fa-bullhorn', - name: 'mypages.work', + name: 'mypages.bacheca', component: () => import('@/root/bacheca/bacheca.vue'), meta: { requiresAuth: true }, inmenu: true, diff --git a/src/components/CFinder/CFinder.vue b/src/components/CFinder/CFinder.vue index 41c21b05..b6ca5f81 100755 --- a/src/components/CFinder/CFinder.vue +++ b/src/components/CFinder/CFinder.vue @@ -21,7 +21,8 @@ col_title="descr" col_footer="idCity" col_tabfooter="mycities" - :vertical="-1" + :vertical="costanti.VISUTABLE_LISTA" + :showType="costanti.SHOW_MYSKILL" :nodataLabel="idSector > 0 ? 'Nessuna Competenza trovata': 'Selezionare un Settore'" :prop_search="true" :finder="true" diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index de75fdfa..6842ffe2 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -32,6 +32,7 @@ import { useQuasar } from 'quasar' import { costanti } from '@costanti' import translate from '@/globalroutines/util' import { toolsext } from '@store/Modules/toolsext' +import { CMySkill } from '@/components/CMySkill' export default defineComponent({ name: 'CGridTableRec', @@ -204,7 +205,7 @@ export default defineComponent({ default: '', }, }, - components: { CMyPopupEdit, CTitleBanner, CMyFieldDb, CMySelect, CMyFriends, CMyGroups, CMyUser }, + components: { CMyPopupEdit, CTitleBanner, CMyFieldDb, CMySelect, CMyFriends, CMyGroups, CMyUser, CMySkill }, setup(props, { emit }) { const $q = useQuasar() const { t } = useI18n() @@ -900,7 +901,7 @@ export default defineComponent({ pagination.value = props.prop_pagination myvertical.value = props.vertical - myvertical.value = tools.getCookie('myv_' + props.prop_mytable, props.vertical) + // myvertical.value = tools.getCookie('myv_' + props.prop_mytable, props.vertical) showfilteradv.value = tools.getCookie('s_adv', false) } diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index e6f708eb..2bd3b3d9 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -1,6 +1,6 @@