diff --git a/_ALL_SITES/freeplanet.app/db/static_data.ts b/_ALL_SITES/freeplanet.app/db/static_data.ts
index ddcc917e..ebde12d4 100755
--- a/_ALL_SITES/freeplanet.app/db/static_data.ts
+++ b/_ALL_SITES/freeplanet.app/db/static_data.ts
@@ -390,6 +390,17 @@ const baseroutes: IListRoutes[] = [
inmenu: true,
infooter: true,
},
+ {
+ active: true,
+ order: 15,
+ path: '/work',
+ materialIcon: 'fas fa-briefcase',
+ name: 'mypages.work',
+ component: () => import('@/root/work/work.vue'),
+ meta: { requiresAuth: true },
+ inmenu: true,
+ infooter: true,
+ },
{
active: true,
order: 100,
@@ -470,10 +481,32 @@ const baseroutes: IListRoutes[] = [
{
active: true,
order: 130,
- path: '/mypage/:idSkill',
+ path: '/mypage/:idBacheca',
materialIcon: 'fas fa-user',
name: 'pages.mypage2',
- component: () => import('@/views/user/mypageskill/mypageskill.vue'),
+ component: () => import('@/views/user/mypagebacheca/mypagebacheca.vue'),
+ meta: { requiresAuth: true },
+ inmenu: false,
+ infooter: false,
+ },
+ {
+ active: true,
+ order: 130,
+ path: '/mywork/:idSkill',
+ materialIcon: '',
+ name: 'pages.mywork2',
+ component: () => import('@/views/user/mywork/mywork.vue'),
+ meta: { requiresAuth: true },
+ inmenu: false,
+ infooter: false,
+ },
+ {
+ active: true,
+ order: 400,
+ path: '/test',
+ materialIcon: 'fas fa-test',
+ name: 'mypages.test',
+ component: () => import('@/views/testServer/testServer.vue'),
meta: { requiresAuth: true },
inmenu: false,
infooter: false,
diff --git a/_ALL_SITES/insiemesipuo.app/db/static_data.ts b/_ALL_SITES/insiemesipuo.app/db/static_data.ts
index 1494f48d..a4ed2a78 100755
--- a/_ALL_SITES/insiemesipuo.app/db/static_data.ts
+++ b/_ALL_SITES/insiemesipuo.app/db/static_data.ts
@@ -390,6 +390,17 @@ const baseroutes: IListRoutes[] = [
inmenu: true,
infooter: true,
},
+ {
+ active: true,
+ order: 15,
+ path: '/work',
+ materialIcon: 'fas fa-briefcase',
+ name: 'mypages.work',
+ component: () => import('@/root/work/work.vue'),
+ meta: { requiresAuth: true },
+ inmenu: true,
+ infooter: true,
+ },
/*{
active: true,
order: 100,
@@ -470,10 +481,32 @@ const baseroutes: IListRoutes[] = [
{
active: true,
order: 130,
- path: '/mypage/:idSkill',
+ path: '/mypage/:idBacheca',
materialIcon: 'fas fa-user',
name: 'pages.mypage2',
- component: () => import('@/views/user/mypageskill/mypageskill.vue'),
+ component: () => import('@/views/user/mypagebacheca/mypagebacheca.vue'),
+ meta: { requiresAuth: true },
+ inmenu: false,
+ infooter: false,
+ },
+ {
+ active: true,
+ order: 130,
+ path: '/mywork/:idSkill',
+ materialIcon: '',
+ name: 'pages.mywork2',
+ component: () => import('@/views/user/mywork/mywork.vue'),
+ meta: { requiresAuth: true },
+ inmenu: false,
+ infooter: false,
+ },
+ {
+ active: true,
+ order: 400,
+ path: '/test',
+ materialIcon: 'fas fa-test',
+ name: 'mypages.test',
+ component: () => import('@/views/testServer/testServer.vue'),
meta: { requiresAuth: true },
inmenu: false,
infooter: false,
diff --git a/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts b/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts
index 06a99c43..b4d16497 100755
--- a/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts
+++ b/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts
@@ -390,6 +390,17 @@ const baseroutes: IListRoutes[] = [
inmenu: true,
infooter: true,
},
+ {
+ active: true,
+ order: 15,
+ path: '/work',
+ materialIcon: 'fas fa-briefcase',
+ name: 'mypages.work',
+ component: () => import('@/root/work/work.vue'),
+ meta: { requiresAuth: true },
+ inmenu: true,
+ infooter: true,
+ },
/*{
active: true,
order: 100,
@@ -470,10 +481,32 @@ const baseroutes: IListRoutes[] = [
{
active: true,
order: 130,
- path: '/mypage/:idSkill',
- materialIcon: 'fas fa-user',
+ path: '/mypage/:idBacheca',
+ materialIcon: '',
name: 'pages.mypage2',
- component: () => import('@/views/user/mypageskill/mypageskill.vue'),
+ component: () => import('@/views/user/mypagebacheca/mypagebacheca.vue'),
+ meta: { requiresAuth: true },
+ inmenu: false,
+ infooter: false,
+ },
+ {
+ active: true,
+ order: 130,
+ path: '/mywork/:idSkill',
+ materialIcon: '',
+ name: 'pages.mywork2',
+ component: () => import('@/views/user/mywork/mywork.vue'),
+ meta: { requiresAuth: true },
+ inmenu: false,
+ infooter: false,
+ },
+ {
+ active: true,
+ order: 400,
+ path: '/test',
+ materialIcon: 'fas fa-test',
+ name: 'mypages.test',
+ component: () => import('@/views/testServer/testServer.vue'),
meta: { requiresAuth: true },
inmenu: false,
infooter: false,
diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts
index 7905ee43..b4c54c85 100755
--- a/src/common/shared_vuejs.ts
+++ b/src/common/shared_vuejs.ts
@@ -84,14 +84,23 @@ export const shared_consts = {
PARAM_SHOW_PROVINCE: 1,
- TABLES_ID_NUMBER: ['permissions', 'levels', 'adtypes', 'statusSkills', 'sectors', 'catgrps', 'skills', 'subskills', 'cities', 'provinces', 'myskills', 'mygroups'],
- TABLES_USER_ID: ['myskills'],
- TABLES_UPDATE_LASTMODIFIED: ['myskills', 'mybots'],
- TABLES_FINDER: ['myskills', 'mygroups'],
+ TABLES_MYSKILLS: 'myskills',
+ TABLES_MYBACHECAS: 'mybachecas',
- TABLES_PERM_CHANGE_FOR_USERS: ['myskills'],
- TABLES_VISU_LISTA_USER: ['myskills', 'users'],
- TABLES_NOT_SHOW_IF_USERNAME: ['myskills'],
+ TABLES_USER_INCLUDE_MY: ['mygroups'],
+ TABLES_GETCOMPLETEREC: ['myskills'],
+ TABLES_PERM_NEWREC: ['skills', 'subskills', 'mygroups'],
+ TABLES_REC_ID: ['skills', 'subskills'],
+
+ TABLES_ID_NUMBER: ['permissions', 'levels', 'adtypes', 'statusSkills', 'sectors', 'catgrps', 'skills', 'subskills', 'cities', 'provinces', 'myskills', 'mybachecas', 'mygroups'],
+ TABLES_USER_ID: ['myskills', 'mybachecas'],
+ TABLES_UPDATE_LASTMODIFIED: ['myskills', 'mybots'],
+ TABLES_FINDER: ['myskills', 'mybachecas', 'mygroups'],
+ TABLES_VISU_CMYSRECCARD: ['myskills', 'mybachecas'],
+
+ TABLES_PERM_CHANGE_FOR_USERS: ['myskills', 'mybachecas'],
+ TABLES_VISU_LISTA_USER: ['myskills', 'mybachecas', 'users'],
+ TABLES_NOT_SHOW_IF_USERNAME: ['myskills', 'mybachecas'],
VISIB_ALL: 0,
VISIB_ONLYIF_VERIFIED: 1,
diff --git a/src/components/CDashboard/CDashboard.ts b/src/components/CDashboard/CDashboard.ts
index e1378647..fe2445f9 100755
--- a/src/components/CDashboard/CDashboard.ts
+++ b/src/components/CDashboard/CDashboard.ts
@@ -19,7 +19,7 @@ export default defineComponent({
const globalStore = useGlobalStore()
const { t } = useI18n();
- const calcstat = computed(() => userStore.my.calcstat ? userStore.my.calcstat : {numUsersReg: 0, numMySkills: 0} )
+ const calcstat = computed(() => userStore.my.calcstat ? userStore.my.calcstat : {numUsersReg: 0, numMySkills: 0, numMyBachecas: 0} )
return {
userStore,
diff --git a/src/components/CDashboard/CDashboard.vue b/src/components/CDashboard/CDashboard.vue
index b046e8ef..33242eb6 100755
--- a/src/components/CDashboard/CDashboard.vue
+++ b/src/components/CDashboard/CDashboard.vue
@@ -29,7 +29,29 @@
{{ calcstat.numMySkills }}
- Competenze Aggiunte
+ Competenze
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ calcstat.numMyBachecas }}
+ Annunci
diff --git a/src/components/CFinder/CFinder.ts b/src/components/CFinder/CFinder.ts
index 52e8a27a..2b204fc3 100755
--- a/src/components/CFinder/CFinder.ts
+++ b/src/components/CFinder/CFinder.ts
@@ -8,18 +8,20 @@ import { CMyFieldDb } from '@/components/CMyFieldDb'
import { costanti } from '@costanti'
import { useGlobalStore } from '@store/globalStore'
import { useUserStore } from '@store/UserStore'
-import { colmySkills } from '@store/Modules/fieldsTable'
+
import { CGridTableRec } from '@/components/CGridTableRec'
-import { IMySkill, ISearchList, ISkill } from 'model'
+import { IColGridTable, IMyBacheca, IMySkill, ISearchList, ISkill } from 'model'
import { shared_consts } from '@/common/shared_vuejs'
import { useI18n } from '@/boot/i18n'
+import { toolsext } from '@store/Modules/toolsext'
+import { fieldsTable } from '@store/Modules/fieldsTable'
export default defineComponent({
name: 'CFinder',
props: {
- defaultnewrec: {
- type: Function,
- required: false,
+ table: {
+ type: String,
+ required: true,
},
},
components: {
@@ -38,12 +40,19 @@ export default defineComponent({
const search = ref('')
const myrecfiltertoggle = ref(tools.FILTER_ALL)
+ const prop_colkey = ref('idSkill')
+ const col_title = ref('descr')
+ const col_footer = ref('idCity')
+ const col_tabfooter = ref('mycities')
+
+ const col = ref({})
+
const idSector = computed(() => {
let myval: any = null
myval = searchList.value.find((rec) => (rec.table === 'sectors'))
if (myval) {
const ris = myval.value || 0
- console.log('idSector=', ris)
+ // console.log('idSector=', ris)
return ris
} else {
return 0
@@ -61,13 +70,16 @@ export default defineComponent({
function mounted() {
- /*arrfilterand.value = [
- {
- label: 'Competenze',
- value: shared_consts.FILTER_MYSKILL_SKILL
- },
- ]*/
+ let obj = tools.getParamsByTable(props.table)
+
+ col.value = fieldsTable.getArrColsByTable(props.table)
+
+ prop_colkey.value = obj.prop_colkey
+ col_title.value = obj.col_title
+ col_footer.value = obj.col_footer
+ col_tabfooter.value = obj.col_tabfooter
+
function getFilterSkills(recSkill: any, index: number, arr: any) {
const recsectors: any = searchList.value.find((rec) => rec.table === 'sectors')
@@ -100,6 +112,8 @@ export default defineComponent({
}
+
+
searchList.value = [
{
label: 'Provincia',
@@ -243,22 +257,6 @@ export default defineComponent({
}
- function getdefaultnewrec(): IMySkill {
- return {
- _id: 0,
- idSector: 0,
- idSkill: 0,
- idSubSkill: [],
- idStatusSkill: [],
- idContribType: [],
- idCity: [],
- NumLevel: 0,
- adType: 0,
- photos: [],
- note: '',
- descr: '',
- }
- }
function extraparams() {
@@ -314,7 +312,7 @@ export default defineComponent({
lk_tab: 'subskills',
lk_LF: 'idSubSkill',
lk_FF: '_id',
- lk_as: 'myskill',
+ lk_as: 'myrec',
af_objId_tab: '',
},
lookup5: {
@@ -327,6 +325,16 @@ export default defineComponent({
}
}
+ function getdefaultnewrec(): any {
+ if (props.table === toolsext.TABMYSKILLS) {
+ return tools.getdefaultnewrec_MySkill()
+ } else if (props.table === toolsext.TABMYBACHECAS) {
+ return tools.getdefaultnewrec_MyBacheca()
+ }
+ return null
+ }
+
+
function doSearch() {
//
}
@@ -337,8 +345,6 @@ export default defineComponent({
t,
tools,
costanti,
- colmySkills,
- getdefaultnewrec,
extraparams,
arrfilterand,
filtercustom,
@@ -347,6 +353,13 @@ export default defineComponent({
search,
doSearch,
myrecfiltertoggle,
+ prop_colkey,
+ col_title,
+ col_footer,
+ col_tabfooter,
+ col,
+ toolsext,
+ getdefaultnewrec,
}
},
})
diff --git a/src/components/CFinder/CFinder.vue b/src/components/CFinder/CFinder.vue
index 027342e0..13409393 100755
--- a/src/components/CFinder/CFinder.vue
+++ b/src/components/CFinder/CFinder.vue
@@ -26,16 +26,16 @@
-->
-
+
- AA
@@ -19,7 +18,8 @@
-
+
+
diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts
index 2ee1c004..c9590a56 100755
--- a/src/components/CGridTableRec/CGridTableRec.ts
+++ b/src/components/CGridTableRec/CGridTableRec.ts
@@ -23,6 +23,7 @@ import { CMyFriends } from '../CMyFriends'
import { CMyUser } from '../CMyUser'
import { CMyGroups } from '../CMyGroups'
import { CMyFieldDb } from '../CMyFieldDb'
+import { CMyRecCard } from '../CMyRecCard'
import { CMySelect } from '../CMySelect'
import { CTitleBanner } from '../CTitleBanner'
@@ -32,7 +33,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'
+import { CMyCardPopup } from '@/components/CMyCardPopup'
export default defineComponent({
name: 'CGridTableRec',
@@ -205,7 +206,7 @@ export default defineComponent({
default: '',
},
},
- components: { CMyPopupEdit, CTitleBanner, CMyFieldDb, CMySelect, CMyFriends, CMyGroups, CMyUser, CMySkill },
+ components: { CMyPopupEdit, CTitleBanner, CMyFieldDb, CMySelect, CMyFriends, CMyGroups, CMyUser, CMyRecCard, CMyCardPopup },
setup(props, { emit }) {
const $q = useQuasar()
const { t } = useI18n()
@@ -233,6 +234,9 @@ export default defineComponent({
const loading = ref(false)
+ const visupagedialog = ref(false)
+ const myrecdialog = ref(null)
+
const startsearch = ref(false)
const serverData: any = ref([])
@@ -282,7 +286,7 @@ export default defineComponent({
})
watch(() => searchList.value, (to: any, from: any) => {
- console.log('watch searchlist', to)
+ // console.log('watch searchlist', to)
refresh()
})
@@ -291,12 +295,12 @@ export default defineComponent({
})
watch(() => props.filtercustom, (to: any, from: any) => {
- console.log('filtercustom', to)
+ // console.log('filtercustom', to)
refresh()
})
function searchval(newval: any, table: any) {
- console.log('searchval', newval, table)
+ // console.log('searchval', newval, table)
tools.setCookie(tools.COOK_SEARCH + table, newval)
if (table === 'skills') {
@@ -317,9 +321,9 @@ export default defineComponent({
const recSkill = searchList.value.find((rec) => rec.table === 'skills')
let trovato = false
if (recSkill) {
- console.log('recSkill.value', recSkill)
+ // console.log('recSkill.value', recSkill)
const arrvalues = valoriopt.value(recSkill.value, false)
- console.log('arrvalues', arrvalues)
+ // console.log('arrvalues', arrvalues)
if (arrvalues)
trovato = arrvalues.find((rec: any) => rec[recSkill.key] === valsaved)
}
@@ -579,8 +583,8 @@ export default defineComponent({
emit('savefilter', myfilterand)
}
- function onRequest(props: any) {
- const { page, rowsPerPage, rowsNumber, sortBy, descending } = props.pagination
+ function onRequest(myprops: any) {
+ const { page, rowsPerPage, rowsNumber, sortBy, descending } = myprops.pagination
const myfilternow = myfilter.value
const myfilterandnow = myfilterand.value
@@ -1055,11 +1059,11 @@ export default defineComponent({
function checkIfColShow(field: string | undefined) {
let vis = true
- if (shared_consts.TABLES_NOT_SHOW_IF_USERNAME.includes(props.prop_mytable) && !props.prop_search) {
+ /*if (shared_consts.TABLES_NOT_SHOW_IF_USERNAME.includes(props.prop_mytable) && !props.prop_search) {
if (field === 'username') {
vis = false
}
- }
+ }*/
return vis
}
@@ -1087,7 +1091,7 @@ export default defineComponent({
}
function changeTable(mysel: any) {
- console.log('changeTable', tablesel.value)
+ // console.log('changeTable', tablesel.value)
if (tablesel.value === undefined || tablesel.value === '')
return
@@ -1432,6 +1436,12 @@ export default defineComponent({
function cmdExt(cmd: any, id: any, val2: any) {
console.log('cmd', cmd)
+ if (cmd === costanti.CMD_SHOW_PAGE) {
+ visupagedialog.value = true
+ myrecdialog.value = id
+ return true
+ }
+
let action = 0
if (cmd === costanti.CMD_DELETE) {
action = lists.MenuAction.DELETE_RECTABLE
@@ -1532,6 +1542,8 @@ export default defineComponent({
getLabelFooterByRow,
showfilteradv,
cmdExt,
+ visupagedialog,
+ myrecdialog,
}
}
})
diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue
index c277eb5f..b1e43d82 100755
--- a/src/components/CGridTableRec/CGridTableRec.vue
+++ b/src/components/CGridTableRec/CGridTableRec.vue
@@ -313,13 +313,14 @@
-
-
+
-
+
@@ -394,7 +395,6 @@
-
@@ -406,6 +406,7 @@
+
+
+
+
+
+
+
@@ -450,7 +459,7 @@
-
+
Nuovo:
@@ -517,9 +526,9 @@
-
+
-
+
{{ recModif[col_title] }}
diff --git a/src/components/CMainView/CMainView.vue b/src/components/CMainView/CMainView.vue
index d3e873c6..4197dac0 100755
--- a/src/components/CMainView/CMainView.vue
+++ b/src/components/CMainView/CMainView.vue
@@ -4,6 +4,9 @@
+
+
diff --git a/src/components/CMyCardPopup/CMyCardPopup.scss b/src/components/CMyCardPopup/CMyCardPopup.scss
new file mode 100644
index 00000000..cd7f34d8
--- /dev/null
+++ b/src/components/CMyCardPopup/CMyCardPopup.scss
@@ -0,0 +1,34 @@
+.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;
+
+}
diff --git a/src/components/CMyCardPopup/CMyCardPopup.ts b/src/components/CMyCardPopup/CMyCardPopup.ts
new file mode 100644
index 00000000..5e7bf70e
--- /dev/null
+++ b/src/components/CMyCardPopup/CMyCardPopup.ts
@@ -0,0 +1,95 @@
+import { computed, defineComponent, onMounted, PropType, ref, watch } from 'vue'
+
+import { CMyFieldDb } from '@/components/CMyFieldDb'
+import { CTitleBanner } from '@/components/CTitleBanner'
+import { CProfile } from '@/components/CProfile'
+import { CDateTime } from '@/components/CDateTime'
+import { CMyPage } from '@/components/CMyPage'
+import { CMyFieldRec } from '@/components/CMyFieldRec'
+import { tools } from '@store/Modules/tools'
+import { useUserStore } from '@store/UserStore'
+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, IMyBacheca, IUserFields } from 'model'
+import { shared_consts } from '@/common/shared_vuejs'
+import { colCitys, fieldsTable } from '@store/Modules/fieldsTable'
+
+export default defineComponent({
+ name: 'CMyCardPopup',
+ components: { CProfile, CTitleBanner, CMyFieldDb, CDateTime, CMyPage, CMyFieldRec },
+ props: {
+ table: {
+ type: String,
+ required: true,
+ },
+ prop_myrec: {
+ type: Object as PropType,
+ required: false,
+ default: null,
+ },
+ idRec: {
+ type: Number,
+ required: false,
+ default: 0
+ }
+ },
+ setup(props) {
+
+ const userStore = useUserStore()
+ const globalStore = useGlobalStore()
+ const $q = useQuasar()
+ const { t } = useI18n()
+
+ const showPic = ref(false)
+
+ const mybacheca = ref({})
+ const col = ref({})
+
+ function profile() {
+ return userStore.my.profile
+ }
+
+ function load() {
+ // Carica il profilo di quest'utente
+ if (props.idRec > 0) {
+ userStore.loadGeneric(props.table, props.idRec).then((ris) => {
+ mybacheca.value = ris
+ })
+
+ } else {
+ mybacheca.value = props.prop_myrec
+ }
+
+ col.value = fieldsTable.getArrColsByTable(props.table)
+ }
+
+ watch(() => props.idRec, (to: any, from: any) => {
+ load()
+ })
+
+ function mounted() {
+ load()
+ }
+
+ onMounted(mounted)
+
+ return {
+ profile,
+ tools,
+ costanti,
+ mybacheca,
+ shared_consts,
+ globalStore,
+ showPic,
+ userStore,
+ t,
+ fieldsTable,
+ colCitys,
+ toolsext,
+ col,
+ }
+ }
+})
diff --git a/src/components/CMyCardPopup/CMyCardPopup.vue b/src/components/CMyCardPopup/CMyCardPopup.vue
new file mode 100644
index 00000000..8feb8d7c
--- /dev/null
+++ b/src/components/CMyCardPopup/CMyCardPopup.vue
@@ -0,0 +1,59 @@
+
+
+
+ {{ mybacheca.username }}
+
+
+
+
+
+
+ {{
+ fieldsTable.getValByTabAndId(table, 'adType', mybacheca.adType)
+ }}
+
+
+
+
+
+
+
+
+
+
+ {{ tools.getValue(mybacheca, mycol.field, mycol.subfield) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/CMyCardPopup/index.ts b/src/components/CMyCardPopup/index.ts
new file mode 100644
index 00000000..005c562a
--- /dev/null
+++ b/src/components/CMyCardPopup/index.ts
@@ -0,0 +1 @@
+export { default as CMyCardPopup } from './CMyCardPopup.vue'
diff --git a/src/components/CMyFieldDb/CMyFieldDb.vue b/src/components/CMyFieldDb/CMyFieldDb.vue
index 4f5c217f..77089aad 100755
--- a/src/components/CMyFieldDb/CMyFieldDb.vue
+++ b/src/components/CMyFieldDb/CMyFieldDb.vue
@@ -20,7 +20,7 @@
-
+
col.name === props.field)
+ let columns = fieldsTable.getArrColsByTable(props.table)
+ if (columns) {
+ col.value = columns.find((col: any) => col.field === props.field)
} else {
col.value = fieldsTable.getColByTable(props.table, props.field)
}
diff --git a/src/components/CMyFieldRec/CMyFieldRec.vue b/src/components/CMyFieldRec/CMyFieldRec.vue
index 0abb5b2d..fab91441 100755
--- a/src/components/CMyFieldRec/CMyFieldRec.vue
+++ b/src/components/CMyFieldRec/CMyFieldRec.vue
@@ -2,7 +2,7 @@
-
+
@@ -20,7 +20,7 @@
-
+
-
+
-
+
{{ grp.title }} ({{ grp.groupname }})
{{ grp.descr }}
diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.ts b/src/components/CMyPopupEdit/CMyPopupEdit.ts
index d8c86245..446e45d8 100755
--- a/src/components/CMyPopupEdit/CMyPopupEdit.ts
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.ts
@@ -22,6 +22,8 @@ import { costanti } from '@costanti'
import { fieldsTable } from '@store/Modules/fieldsTable'
import MixinBase from '@/mixins/mixin-base'
import MixinUsers from '@/mixins/mixin-users'
+import { toolsext } from '@store/Modules/toolsext'
+import { shared_consts } from '@/common/shared_vuejs'
export default defineComponent({
name: 'CMyPopupEdit',
@@ -657,8 +659,8 @@ export default defineComponent({
}
function getToByCol(col: IColGridTable){
- if (props.table === 'myskills') {
- return '/mypage/'+ props.row['_id']
+ if (shared_consts.TABLES_REC_ID.includes(props.table)) {
+ return '/' + tools.getDirectoryByTable(props.table) + '/' + props.row['_id']
} else if (props.table === 'mygroups') {
return '/grp/' + props.row['groupname']
}
diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.vue b/src/components/CMyPopupEdit/CMyPopupEdit.vue
index dec9b155..c369bdc6 100755
--- a/src/components/CMyPopupEdit/CMyPopupEdit.vue
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.vue
@@ -1,6 +1,8 @@
-
+
@@ -30,6 +32,25 @@
@update:model-value="Savedb">
+
@@ -108,7 +130,7 @@
@@ -418,7 +440,9 @@
- {{t(col.label_trans)}} {{ $t('event.testo_di_spiegazione') }}:
+ {{ t(col.label_trans) }} {{
+ $t('event.testo_di_spiegazione')
+ }}:
@@ -517,7 +541,8 @@
-
+
+
diff --git a/src/components/CMySkill/CMySkill.scss b/src/components/CMyRecCard/CMyRecCard.scss
similarity index 100%
rename from src/components/CMySkill/CMySkill.scss
rename to src/components/CMyRecCard/CMyRecCard.scss
diff --git a/src/components/CMySkill/CMySkill.ts b/src/components/CMyRecCard/CMyRecCard.ts
similarity index 63%
rename from src/components/CMySkill/CMySkill.ts
rename to src/components/CMyRecCard/CMyRecCard.ts
index 1eea77ff..454b66cd 100755
--- a/src/components/CMySkill/CMySkill.ts
+++ b/src/components/CMyRecCard/CMyRecCard.ts
@@ -1,20 +1,26 @@
import { defineComponent, onMounted, PropType, ref, watch } from 'vue'
import { useUserStore } from '@store/UserStore'
-import { IImgGallery, IMySkill, IUserFields, IUserProfile } from 'model'
+import { IImgGallery, IUserFields, IUserProfile } from 'model'
import { costanti } from '@costanti'
import { shared_consts } from '@/common/shared_vuejs'
import { fieldsTable } from '@store/Modules/fieldsTable'
import { tools } from '@store/Modules/tools'
import { useQuasar } from 'quasar'
import { useI18n } from '@/boot/i18n'
-import { useRoute, useRouter } from 'vue-router'
+import { CMyCardPopup } from '@/components/CMyCardPopup'
+// import { useRouter } from 'vue-router'
export default defineComponent({
- name: 'CMySkill',
+ name: 'CMyRecCard',
+ components: { CMyCardPopup },
emits: ['setCmd', 'cmdext'],
props: {
- prop_myskill: {
- type: Object as PropType
,
+ table: {
+ type: String,
+ required: true,
+ },
+ prop_myrec: {
+ type: Object as PropType,
required: false,
default: null,
},
@@ -23,23 +29,22 @@ export default defineComponent({
setup(props, { emit }) {
const userStore = useUserStore()
- const $q = useQuasar()
+ // const $q = useQuasar()
const { t } = useI18n()
- const $router = useRouter()
- const $route = useRoute()
+ // const $router = useRouter()
- const username = ref('')
+ const myrec = ref(null)
- const myskill = ref(null)
+ const visupage = ref(false)
+
+ watch(() => props.prop_myrec, (newval, oldval) => {
- watch(() => props.prop_myskill, (newval, oldval) => {
- console.log('watch: myskill')
mounted()
})
function mounted() {
- if (props.prop_myskill) {
- myskill.value = props.prop_myskill
+ if (props.prop_myrec) {
+ myrec.value = props.prop_myrec
}
}
@@ -47,9 +52,9 @@ export default defineComponent({
return userStore.getImgByProfile(profile)
}
- function naviga(path: string) {
+ /*function naviga(path: string) {
$router.push(path)
- }
+ }*/
function setCmd($q: any, cmd: number, myusername: string, value: any, groupname: string) {
emit('setCmd', $q, cmd, myusername, value, groupname)
@@ -62,16 +67,18 @@ export default defineComponent({
onMounted(mounted)
return {
- myskill,
+ t,
+ myrec,
costanti,
getImgUser,
- naviga,
+ // naviga,
setCmd,
shared_consts,
userStore,
tools,
fieldsTable,
cmdExt,
+ visupage,
}
},
})
diff --git a/src/components/CMySkill/CMySkill.vue b/src/components/CMyRecCard/CMyRecCard.vue
similarity index 54%
rename from src/components/CMySkill/CMySkill.vue
rename to src/components/CMyRecCard/CMyRecCard.vue
index afd5f323..cc900ef8 100755
--- a/src/components/CMySkill/CMySkill.vue
+++ b/src/components/CMyRecCard/CMyRecCard.vue
@@ -1,48 +1,48 @@
-
-
-
- {{ fieldsTable.getValByTabAndId('myskills', 'adType', myskill.adType) }}
-
+
+
+ {{ fieldsTable.getValByTabAndId(table, 'adType', myrec.adType) }}
+
-
+
-
+
- {{ rec.descr }}
- {{ rec.descr }}
-
+
- {{ myskill.descr }}
+ {{ myrec.descr }}
- {{ myskill.username }} -
- , {{ rec.comune }}
+ {{ myrec.username }} -
+ , {{ rec.comune }}
-
+
+ @click="cmdExt(costanti.CMD_MODIFY, myrec._id)">
{{ $t('reg.edit') }}
-
+
{{ $t('reg.elimina') }}
@@ -51,16 +51,15 @@
-
-
diff --git a/src/components/CMyRecCard/index.ts b/src/components/CMyRecCard/index.ts
new file mode 100755
index 00000000..579c92de
--- /dev/null
+++ b/src/components/CMyRecCard/index.ts
@@ -0,0 +1 @@
+export { default as CMyRecCard } from './CMyRecCard.vue'
diff --git a/src/components/CMySkill/index.ts b/src/components/CMySkill/index.ts
deleted file mode 100755
index b09110be..00000000
--- a/src/components/CMySkill/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as CMySkill } from './CMySkill.vue'
diff --git a/src/components/CSkill/CSkill.ts b/src/components/CSkill/CSkill.ts
index 27763188..d4bd6204 100755
--- a/src/components/CSkill/CSkill.ts
+++ b/src/components/CSkill/CSkill.ts
@@ -9,11 +9,17 @@ import { useGlobalStore } from '@store/globalStore'
import { useUserStore } from '@store/UserStore'
import { colmySkills } from '@store/Modules/fieldsTable'
import { CGridTableRec } from '@/components/CGridTableRec'
-import { IMySkill, ISkill } from 'model'
+import { IColGridTable, IMySkill, ISkill } from 'model'
+import { toolsext } from '@store/Modules/toolsext'
+import { fieldsTable } from '@store/Modules/fieldsTable'
export default defineComponent({
name: 'CSkill',
props: {
+ table: {
+ type: String,
+ required: true,
+ },
defaultnewrec: {
type: Function,
required: false,
@@ -40,29 +46,31 @@ export default defineComponent({
CMyFieldDb, CGridTableRec,
},
setup(props, { attrs, slots, emit }) {
- const mytable = 'users'
const globalStore = useGlobalStore()
const userStore = useUserStore()
+ const table = ref(toolsext.TABMYSKILLS)
+
+ const col = ref({})
+
+ const prop_colkey = ref('')
+ const col_title = ref('')
+ const col_footer = ref('')
+ const col_tabfooter = ref('')
+
+ function mounted() {
+
+ let obj = tools.getParamsByTable(props.table)
+
+ col.value = fieldsTable.getArrColsByTable(props.table)
+
+ prop_colkey.value = obj.prop_colkey
+ col_title.value = obj.col_title
+ col_footer.value = obj.col_footer
+ col_tabfooter.value = obj.col_tabfooter
- function getdefaultnewrec(): IMySkill {
- return {
- _id: 0,
- idSector: 0,
- idSkill: 0,
- idSubSkill: [],
- idStatusSkill: [],
- idContribType: [],
- idCity: [],
- NumLevel: 0,
- adType: 0,
- photos: [],
- note: '',
- descr: '',
- }
}
-
function extraparams() {
let lk_tab = 'users'
let lk_LF = 'userId'
@@ -178,7 +186,7 @@ export default defineComponent({
lk_tab: 'subskills',
lk_LF: 'idSubSkill',
lk_FF: '_id',
- lk_as: 'myskill',
+ lk_as: 'myrec',
af_objId_tab: '',
},
lookup5: {
@@ -192,12 +200,29 @@ export default defineComponent({
}
}
+ function getdefaultnewrec(): any {
+ if (props.table === toolsext.TABMYSKILLS) {
+ return tools.getdefaultnewrec_MySkill()
+ } else if (props.table === toolsext.TABMYBACHECAS) {
+ return tools.getdefaultnewrec_MyBacheca()
+ }
+ return null
+ }
+
+ onMounted(mounted)
+
return {
tools,
costanti,
colmySkills,
- getdefaultnewrec,
extraparams,
+ fieldsTable,
+ col,
+ prop_colkey,
+ col_title,
+ col_footer,
+ col_tabfooter,
+ getdefaultnewrec,
}
},
})
diff --git a/src/components/CSkill/CSkill.vue b/src/components/CSkill/CSkill.vue
index 782562a2..69da6335 100755
--- a/src/components/CSkill/CSkill.vue
+++ b/src/components/CSkill/CSkill.vue
@@ -2,17 +2,17 @@
div{
+ background: rgba(0,0,0,0.17) !important;
+}
diff --git a/src/components/CTestServer/CTestServer.ts b/src/components/CTestServer/CTestServer.ts
new file mode 100755
index 00000000..a70a0ab7
--- /dev/null
+++ b/src/components/CTestServer/CTestServer.ts
@@ -0,0 +1,44 @@
+import {
+ computed,
+ defineComponent, onBeforeMount, onBeforeUnmount, onMounted, ref, toRef, toRefs, watch,
+} from 'vue'
+
+import { tools } from '@store/Modules/tools'
+import { costanti } from '@costanti'
+import { useGlobalStore } from '@store/globalStore'
+import { useUserStore } from '@store/UserStore'
+import { useI18n } from '@/boot/i18n'
+
+export default defineComponent({
+ name: 'CTestServer',
+ props: {
+ },
+ components: {
+ },
+ setup(props, { attrs, slots, emit }) {
+ const { t } = useI18n()
+ const globalStore = useGlobalStore()
+ const userStore = useUserStore()
+
+ const testServer = ref({})
+
+ function mounted() {
+ ricarica()
+ }
+
+ async function ricarica() {
+ testServer.value = {}
+ testServer.value = await globalStore.loadPageTest()
+ }
+
+ onMounted(mounted)
+
+ return {
+ t,
+ tools,
+ costanti,
+ testServer,
+ ricarica,
+ }
+ },
+})
diff --git a/src/components/CTestServer/CTestServer.vue b/src/components/CTestServer/CTestServer.vue
new file mode 100755
index 00000000..05fa1ea3
--- /dev/null
+++ b/src/components/CTestServer/CTestServer.vue
@@ -0,0 +1,25 @@
+
+
+
+
+ Server: {{testServer}}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/CTestServer/index.ts b/src/components/CTestServer/index.ts
new file mode 100755
index 00000000..79a6810d
--- /dev/null
+++ b/src/components/CTestServer/index.ts
@@ -0,0 +1 @@
+export { default as CTestServer } from './CTestServer.vue'
diff --git a/src/components/Header/Header.vue b/src/components/Header/Header.vue
index 6b8d9c2d..190dc374 100755
--- a/src/components/Header/Header.vue
+++ b/src/components/Header/Header.vue
@@ -98,11 +98,6 @@
-->
-
-
@@ -123,18 +118,16 @@
-
-
-
-
+
+
+ />
import('@/root/work/work.vue'),
+ meta: { requiresAuth: true },
+ inmenu: true,
+ infooter: true,
+ },
/*{
active: true,
order: 100,
@@ -470,10 +481,32 @@ const baseroutes: IListRoutes[] = [
{
active: true,
order: 130,
- path: '/mypage/:idSkill',
+ path: '/mypage/:idBacheca',
materialIcon: 'fas fa-user',
name: 'pages.mypage2',
- component: () => import('@/views/user/mypageskill/mypageskill.vue'),
+ component: () => import('@/views/user/mypagebacheca/mypagebacheca.vue'),
+ meta: { requiresAuth: true },
+ inmenu: false,
+ infooter: false,
+ },
+ {
+ active: true,
+ order: 130,
+ path: '/mywork/:idSkill',
+ materialIcon: '',
+ name: 'pages.mywork2',
+ component: () => import('@/views/user/mywork/mywork.vue'),
+ meta: { requiresAuth: true },
+ inmenu: false,
+ infooter: false,
+ },
+ {
+ active: true,
+ order: 400,
+ path: '/test',
+ materialIcon: 'fas fa-test',
+ name: 'mypages.test',
+ component: () => import('@/views/testServer/testServer.vue'),
meta: { requiresAuth: true },
inmenu: false,
infooter: false,
diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts
index 2835368f..3292cf72 100755
--- a/src/model/GlobalStore.ts
+++ b/src/model/GlobalStore.ts
@@ -691,3 +691,20 @@ export interface IMySkill {
date_updated?: Date,
}
+export interface IMyBacheca {
+ _id: number
+ idSector: number
+ idSkill: number
+ idSubSkill: number[]
+ idStatusSkill: number[]
+ idContribType: string[]
+ idCity: number[]
+ photos: IGallery[]
+ NumLevel: number
+ adType: number
+ note: string
+ descr: string
+ date_created?: Date,
+ date_updated?: Date,
+}
+
diff --git a/src/model/UserStore.ts b/src/model/UserStore.ts
index 1d5bc60d..cc3b289d 100755
--- a/src/model/UserStore.ts
+++ b/src/model/UserStore.ts
@@ -33,6 +33,7 @@ export interface IMyGroup {
export interface ICalcStat {
numUsersReg: number
numMySkills: number
+ numMyBachecas: number
numGroups: number
}
diff --git a/src/root/bacheca/bacheca.ts b/src/root/bacheca/bacheca.ts
index 32fb638b..ed41ef99 100755
--- a/src/root/bacheca/bacheca.ts
+++ b/src/root/bacheca/bacheca.ts
@@ -3,6 +3,7 @@ import {
} from 'vue'
import { tools } from '@src/store/Modules/tools'
+import { toolsext } from '@src/store/Modules/toolsext'
import { CSkill } from '@/components/CSkill'
import { CFinder } from '@/components/CFinder'
import { CDashboard } from '@/components/CDashboard'
@@ -17,6 +18,7 @@ import { static_data } from '@/db/static_data'
import MixinBase from '@/mixins/mixin-base'
import MixinUsers from '@/mixins/mixin-users'
+import { colmyBachecas } from '@store/Modules/fieldsTable'
export default defineComponent({
name: 'bacheca',
@@ -51,7 +53,9 @@ export default defineComponent({
}
return {
+ colmyBachecas,
tools,
+ toolsext,
static_data,
isEmailVerified,
TelegCode,
diff --git a/src/root/bacheca/bacheca.vue b/src/root/bacheca/bacheca.vue
index 35936490..c3137ed4 100755
--- a/src/root/bacheca/bacheca.vue
+++ b/src/root/bacheca/bacheca.vue
@@ -5,7 +5,8 @@
-
+
diff --git a/src/root/work/work.scss b/src/root/work/work.scss
new file mode 100755
index 00000000..e69de29b
diff --git a/src/root/work/work.ts b/src/root/work/work.ts
new file mode 100755
index 00000000..14c325b9
--- /dev/null
+++ b/src/root/work/work.ts
@@ -0,0 +1,71 @@
+import {
+ defineComponent, ref, computed,
+} from 'vue'
+
+import { tools } from '@src/store/Modules/tools'
+import { toolsext } from '@src/store/Modules/toolsext'
+import { CSkill } from '@/components/CSkill'
+import { CFinder } from '@/components/CFinder'
+import { CDashboard } from '@/components/CDashboard'
+import { CChartMap } from '@src/components/CChartMap'
+import { CUserNonVerif } from '@/components/CUserNonVerif'
+import { CMapsEsempio } from '@src/components/CMapsEsempio'
+import { CVerifyEmail } from '@src/components/CVerifyEmail'
+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'
+import MixinUsers from '@/mixins/mixin-users'
+
+import { colmySkills } from '@store/Modules/fieldsTable'
+
+export default defineComponent({
+ name: 'bacheca',
+ components: { CSkill, CChartMap, CMapsEsempio, CFinder, CVerifyEmail, CVerifyTelegram, CDashboard, CUserNonVerif },
+ setup() {
+ const globalStore = useGlobalStore()
+ const userStore = useUserStore()
+ const { getValDb } = MixinBase()
+ const { isEmailVerified, TelegVerificato } = MixinUsers()
+
+
+
+ function TelegCode() {
+ return userStore.my.profile.teleg_checkcode
+ }
+
+ function openrighttoolbar() {
+ globalStore.rightDrawerOpen = true
+ }
+
+ function isLogged() {
+ return userStore.isLogged
+ }
+ function isUserOk() {
+ return userStore.isUserOk()
+ }
+
+ function getLinkBotTelegram(): string {
+ if ( tools.isTest() && !process.env.DEV) {
+ return getValDb('TELEG_BOT_LINK_TEST', false)
+ } else{
+ return getValDb('TELEG_BOT_LINK', false)
+ }
+ }
+
+ return {
+ tools,
+ toolsext,
+ static_data,
+ isEmailVerified,
+ TelegCode,
+ TelegVerificato,
+ isLogged,
+ openrighttoolbar,
+ isUserOk,
+ getLinkBotTelegram,
+ colmySkills,
+ }
+ },
+})
diff --git a/src/root/work/work.vue b/src/root/work/work.vue
new file mode 100755
index 00000000..e0e85551
--- /dev/null
+++ b/src/root/work/work.vue
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index c6d0f4c3..83e3ed7e 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -878,6 +878,8 @@ const msg_it = {
create_group: 'Crea Gruppo',
friends: 'Amici',
bacheca: 'Bacheca',
+ work: 'Lavoro',
+ test: 'Test',
groups: 'Gruppi',
request_friends: 'Rich. Amicizia',
request_sent_friends: 'Rich. Inviate',
diff --git a/src/store/Modules/costanti.ts b/src/store/Modules/costanti.ts
index 8131b235..f3849bd8 100755
--- a/src/store/Modules/costanti.ts
+++ b/src/store/Modules/costanti.ts
@@ -10,7 +10,7 @@ export const costanti = {
SHOW_USERINFO: 1,
SHOW_GROUPINFO: 5,
- SHOW_MYSKILL: 10,
+ SHOW_MYCARD: 10,
BINARY_CHECK: 1,
@@ -42,6 +42,7 @@ export const costanti = {
CMD_DELETE: 1,
CMD_MODIFY: 2,
+ CMD_SHOW_PAGE: 3,
SHOW_ALL: 50,
@@ -61,6 +62,8 @@ export const costanti = {
ALLOWCHAR_CODE: 1,
+ NESSUN_IMMAGINE: 'none',
+
showWhen: {
NewRec: 1,
InPage: 2,
@@ -106,6 +109,7 @@ export const costanti = {
crypted: 9000,
object: 10000,
separator: 11000,
+ username_chip: 12000,
},
FieldTypeArr: [
diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts
index a803f04f..63c46a2b 100755
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -3,6 +3,7 @@ import { useUserStore } from '@store/UserStore'
import { lists } from './lists'
import { costanti } from './costanti'
import { useGlobalStore } from '@store/globalStore'
+import { toolsext } from '@store/Modules/toolsext'
const DeleteRec = {
name: 'deleterec',
@@ -172,12 +173,17 @@ export const colmybot = [
AddCol({ name: 'riga', label_trans: 'bot.riga', fieldtype: costanti.FieldType.number }),
AddCol({ name: 'index', label_trans: 'bot.index', fieldtype: costanti.FieldType.number }),
AddCol({ name: 'active', label_trans: 'bot.active', fieldtype: costanti.FieldType.boolean }),
- AddCol({ name: 'lang', label_trans: 'bot.lang', fieldtype: costanti.FieldType.select, jointable: 'lang' }),
+ AddCol({ name: 'lang', label_trans: 'bot.lang', fieldtype: costanti.FieldType.select, jointable: 'lang' }),
AddCol({ name: 'main', label_trans: 'bot.main', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'label', label_trans: 'bot.label' }),
AddCol({ name: 'type', label_trans: 'bot.type', fieldtype: costanti.FieldType.select, jointable: 'bottype' }),
AddCol({ name: 'value', label_trans: 'bot.value' }),
- AddCol({ name: 'visibility', label_trans: 'bot.visibility', fieldtype: costanti.FieldType.binary, jointable: 'visibility' }),
+ AddCol({
+ name: 'visibility',
+ label_trans: 'bot.visibility',
+ fieldtype: costanti.FieldType.binary,
+ jointable: 'visibility'
+ }),
AddCol({ name: 'date_updated', label_trans: 'bot.date_updated', fieldtype: costanti.FieldType.date }),
AddCol(DeleteRec),
AddCol(DuplicateRec),
@@ -278,7 +284,11 @@ export const colTableHours = [
// AddCol({ name: 'time_start', label_trans: 'hours.time_start', fieldtype: costanti.FieldType.number }),
// AddCol({ name: 'time_end', label_trans: 'hours.time_end', fieldtype: costanti.FieldType.number }),
AddCol({ name: 'descr', label_trans: 'hours.note' }),
- AddCol({ name: 'username', label_trans: 'reg.username_short', showWhen: costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView }),
+ AddCol({
+ name: 'username',
+ label_trans: 'reg.username_short',
+ showWhen: costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView
+ }),
AddCol(DeleteRec),
AddCol(DuplicateRec),
]
@@ -403,14 +413,18 @@ export const colTablePhones = [
export const colTableUsersGeneric = [
AddCol({ name: 'username', label_trans: 'reg.username_short' }),
- AddCol({ name: 'date', label_trans: 'reg.date', fieldtype: costanti.FieldType.onlydate,
- showWhen: costanti.showWhen.InPage + costanti.showWhen.InView_OnlyifExist }),
+ AddCol({
+ name: 'date', label_trans: 'reg.date', fieldtype: costanti.FieldType.onlydate,
+ showWhen: costanti.showWhen.InPage + costanti.showWhen.InView_OnlyifExist
+ }),
]
export const colTableMyGroup = [
AddCol({ name: 'groupname', label_trans: 'reg.groupname' }),
- AddCol({ name: 'date', label_trans: 'reg.date', fieldtype: costanti.FieldType.onlydate,
- showWhen: costanti.showWhen.InPage + costanti.showWhen.InView_OnlyifExist }),
+ AddCol({
+ name: 'date', label_trans: 'reg.date', fieldtype: costanti.FieldType.onlydate,
+ showWhen: costanti.showWhen.InPage + costanti.showWhen.InView_OnlyifExist
+ }),
]
export const colSkills = [
@@ -461,7 +475,8 @@ export const colmyUserPeople = [
export const colmyUserGroup = [
// AddCol({ name: '_id', label_trans: 'reg.id' }),
- AddCol({ name: 'groupname', label_trans: 'reg.groupname', required: true,
+ AddCol({
+ name: 'groupname', label_trans: 'reg.groupname', required: true,
maxlength: 30,
allowchar: costanti.ALLOWCHAR_CODE,
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit,
@@ -478,10 +493,15 @@ export const colmyUserGroup = [
noshowlabel: true,
}),
AddCol({ name: 'descr', label_trans: 'proj.longdescr', required: true, noshowlabel: true, }),
- AddCol({ name: 'visibility', label_trans: 'bot.visibility', fieldtype: costanti.FieldType.multiselect, jointable: 'visibilGroup',
+ AddCol({
+ name: 'visibility',
+ label_trans: 'bot.visibility',
+ fieldtype: costanti.FieldType.multiselect,
+ jointable: 'visibilGroup',
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
}),
- AddCol({ name: 'pwd', label_trans: 'groups.pwd', fieldtype: costanti.FieldType.crypted,
+ AddCol({
+ name: 'pwd', label_trans: 'groups.pwd', fieldtype: costanti.FieldType.crypted,
visibleif: costanti.BINARY_CHECK, visib_field: 'visibility', visib_value: costanti.RISERVATO_PASSWORD,
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit,
}),
@@ -497,7 +517,7 @@ export const colmyUserGroup = [
label_trans: 'skill.photos',
fieldtype: costanti.FieldType.listimages,
jointable: '',
- showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView,
}),
AddCol({
name: 'idCity',
@@ -512,16 +532,19 @@ export const colmyUserGroup = [
remote_key: '_id',
remote_field: 'comune',
}),
- AddCol({ name: 'date_created', label_trans: 'reg.date_created', fieldtype: costanti.FieldType.onlydate,
- showWhen: costanti.showWhen.InPage + costanti.showWhen.InView_OnlyifExist }),
- AddCol({ name: 'note', label_trans: 'proj.longdescr', fieldtype: costanti.FieldType.html,
- titlepopupedit: 'Dettagli', field_extra1: 'groupname', subfield_extra1: '' }),
+ AddCol({
+ name: 'date_created', label_trans: 'reg.date_created', fieldtype: costanti.FieldType.onlydate,
+ showWhen: costanti.showWhen.InPage + costanti.showWhen.InView_OnlyifExist
+ }),
+ AddCol({
+ name: 'note', label_trans: 'proj.longdescr', fieldtype: costanti.FieldType.html,
+ titlepopupedit: 'Dettagli', field_extra1: 'groupname', subfield_extra1: ''
+ }),
AddCol(ModifRec),
AddCol(DeleteRec),
]
-
export const colmySkills = [
/*AddCol({
name: 'userId', label_trans: 'order.users', fieldtype: costanti.FieldType.string, jointable: 'users',
@@ -531,6 +554,16 @@ export const colmySkills = [
//AddCol({ name: 'surname', label_trans: 'reg.surname', fieldtype: costanti.FieldType.string }),
// AddCol({ name: 'subTitle', label_trans: 'event.title', fieldtype: costanti.FieldType.string,
// showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit , maxlength: 70, noshowlabel: true }),
+ AddCol({
+ name: 'username',
+ label_trans: 'reg.username',
+ foredit: false,
+ tipovisu: costanti.TipoVisu.LINK,
+ fieldtype: costanti.FieldType.username_chip,
+ link: '/my/username',
+ noshowlabel: true,
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView,
+ }),
AddCol({
name: 'adType',
label_trans: 'adTypes.name',
@@ -541,16 +574,13 @@ export const colmySkills = [
icon: 'fas fa-bullhorn',
noshowlabel: true,
}),
- AddCol({ name: 'descr', label_trans: 'proj.shortdescr', fieldtype: costanti.FieldType.string,
- showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist, noshowlabel: true, maxlength: 200 }),
AddCol({
- name: 'photos',
- label_trans: 'skill.photos',
- fieldtype: costanti.FieldType.listimages,
- jointable: '',
- showpicprofile_ifnotset: true,
- showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView,
- visible: true,
+ name: 'descr',
+ label_trans: 'proj.shortdescr',
+ fieldtype: costanti.FieldType.string,
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
+ noshowlabel: true,
+ maxlength: 200
}),
AddCol({
name: 'idSector',
@@ -630,10 +660,154 @@ export const colmySkills = [
remote_key: '_id',
remote_field: 'comune',
}),
- AddCol({ name: 'username', label_trans: 'reg.username', foredit: false, tipovisu: costanti.TipoVisu.LINK, link: '/my/username', noshowlabel: true }),
- AddCol({ name: 'note', label_trans: 'proj.longdescr', fieldtype: costanti.FieldType.html,
+ AddCol({
+ name: 'photos',
+ label_trans: 'skill.photos',
+ fieldtype: costanti.FieldType.listimages,
+ jointable: '',
+ showpicprofile_ifnotset: true,
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView,
+ }),
+ AddCol({
+ name: 'note', label_trans: 'proj.longdescr', fieldtype: costanti.FieldType.html,
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
- titlepopupedit: 'Dettagli', field_extra1: 'username', subfield_extra1: '' }),
+ titlepopupedit: 'Dettagli', field_extra1: 'username', subfield_extra1: ''
+ }),
+ AddCol({ name: 'website', label_trans: 'producer.website' }),
+ AddCol(DuplicateRec),
+ AddCol(ModifRec),
+ AddCol(DeleteRec),
+]
+
+export const colmyBachecas = [
+ /*AddCol({
+ name: 'userId', label_trans: 'order.users', fieldtype: costanti.FieldType.string, jointable: 'users',
+ visible: false
+ }), */
+ //AddCol({ name: 'name', label_trans: 'reg.name', fieldtype: costanti.FieldType.string }),
+ //AddCol({ name: 'surname', label_trans: 'reg.surname', fieldtype: costanti.FieldType.string }),
+ // AddCol({ name: 'subTitle', label_trans: 'event.title', fieldtype: costanti.FieldType.string,
+ // showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit , maxlength: 70, noshowlabel: true }),
+ AddCol({
+ name: 'username',
+ label_trans: 'reg.username',
+ foredit: false,
+ tipovisu: costanti.TipoVisu.LINK,
+ fieldtype: costanti.FieldType.username_chip,
+ link: '/my/username',
+ noshowlabel: true,
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView,
+ }),
+ AddCol({
+ name: 'adType',
+ label_trans: 'adTypes.name',
+ fieldtype: costanti.FieldType.select,
+ required: true,
+ jointable: 'adtypes',
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit,
+ icon: 'fas fa-bullhorn',
+ noshowlabel: true,
+ }),
+ AddCol({
+ name: 'descr',
+ label_trans: 'proj.shortdescr',
+ fieldtype: costanti.FieldType.string,
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
+ noshowlabel: true,
+ maxlength: 200
+ }),
+ AddCol({
+ name: 'idSector',
+ label_trans: 'sectors.name',
+ fieldtype: costanti.FieldType.select,
+ required: true,
+ jointable: 'sectors',
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit,
+ visible: true,
+ icon: 'category',
+ }),
+ AddCol({
+ name: 'idSkill',
+ label_trans: 'skill.name',
+ fieldtype: costanti.FieldType.select,
+ required: true,
+ jointable: 'skills',
+ filter_table: 'sectors',
+ filter_field: 'idSector',
+ noshowlabel: true,
+ icon: 'engineering',
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView,
+ allowNewValue: true,
+ }),
+ AddCol({
+ name: 'idSubSkill',
+ label_trans: 'skill.subskill',
+ fieldtype: costanti.FieldType.multiselect,
+ required: false,
+ jointable: 'subskills',
+ filter_table: 'skills',
+ filter_field: 'idSkill',
+ noshowlabel: true,
+ icon: 'far fa-id-card',
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
+ allowNewValue: true,
+ }),
+ AddCol({
+ name: 'numLevel',
+ label_trans: 'level.name',
+ fieldtype: costanti.FieldType.star3,
+ required: false,
+ jointable: 'levels',
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
+ noshowlabel: false,
+ icon: 'grading',
+ }),
+ AddCol({
+ name: 'idStatusSkill',
+ label_trans: 'statusSkill.name',
+ 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',
+ label_trans: 'contribtype.name',
+ fieldtype: costanti.FieldType.multiselect,
+ jointable: 'contribtypes',
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
+ noshowlabel: true,
+ icon: 'currency_exchange',
+ //icon: 'fas fa-hands-helping',
+ }),
+ AddCol({
+ name: 'idCity',
+ label_trans: 'skill.city',
+ fieldtype: costanti.FieldType.multiselect_by_server,
+ jointable: 'cities',
+ tablesel: 'cities',
+ noshowlabel: true,
+ icon: 'fas fa-map-marker-alt',
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
+ remote_table: 'mycities',
+ remote_key: '_id',
+ remote_field: 'comune',
+ }),
+ AddCol({
+ name: 'photos',
+ label_trans: 'skill.photos',
+ fieldtype: costanti.FieldType.listimages,
+ jointable: '',
+ showpicprofile_ifnotset: true,
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView,
+ }),
+ AddCol({
+ name: 'note', label_trans: 'proj.longdescr', fieldtype: costanti.FieldType.html,
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
+ titlepopupedit: 'Dettagli', field_extra1: 'username', subfield_extra1: ''
+ }),
+ AddCol({ name: 'website', label_trans: 'producer.website' }),
AddCol(DuplicateRec),
AddCol(ModifRec),
AddCol(DeleteRec),
@@ -665,7 +839,11 @@ export const colTableSites = [
AddCol({ name: 'telegram_key', label_trans: 'sites.telegram_key', fieldtype: costanti.FieldType.string }),
AddCol({ name: 'telegram_bot_name', label_trans: 'sites.telegram_bot_name', fieldtype: costanti.FieldType.string }),
AddCol({ name: 'telegram_key_test', label_trans: 'sites.telegram_key_test', fieldtype: costanti.FieldType.string }),
- AddCol({ name: 'telegram_bot_name_test', label_trans: 'sites.telegram_bot_name_test', fieldtype: costanti.FieldType.string }),
+ AddCol({
+ name: 'telegram_bot_name_test',
+ label_trans: 'sites.telegram_bot_name_test',
+ fieldtype: costanti.FieldType.string
+ }),
AddCol({ name: 'pathreg_add', label_trans: 'sites.pathreg_add', fieldtype: costanti.FieldType.string }),
AddCol({ name: 'ask_to_verify_reg', label_trans: 'sites.ask_to_verify_reg', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'who', label_trans: 'sites.who', fieldtype: costanti.FieldType.string }),
@@ -1057,6 +1235,13 @@ export const fieldsTable = {
} else
return null
},
+ getArrColsByTable(mytable: string) {
+ const tablerec: any = this.tablesList.find((rec) => rec.value === mytable)
+ if (tablerec) {
+ return tablerec.columns
+ } else
+ return null
+ },
getKeyByTable(mytable: string): string {
const myrec = this.getrecTableList(mytable)
if (myrec) return ((myrec.colkey) ? myrec.colkey : '_id')
@@ -1340,7 +1525,11 @@ export const fieldsTable = {
AddCol({ name: 'lasttimeonline', label_trans: 'reg.lasttimeonline', fieldtype: costanti.FieldType.date }),
// AddCol({ name: 'idapp', label_trans: 'reg.idapp', fieldtype: costanti.FieldType.string }),
AddCol({
- name: 'perm', label_trans: 'reg.perm', fieldtype: costanti.FieldType.binary, jointable: 'permissions', titlepopupedit: 'Permessi'
+ name: 'perm',
+ label_trans: 'reg.perm',
+ fieldtype: costanti.FieldType.binary,
+ jointable: 'permissions',
+ titlepopupedit: 'Permessi'
}),
AddCol({ name: 'ipaddr', label_trans: 'reg.ipaddr' }),
AddCol(DeleteRec),
@@ -1505,7 +1694,11 @@ export const fieldsTable = {
AddCol({ name: 'lasttimeonline', label_trans: 'reg.lasttimeonline', fieldtype: costanti.FieldType.date }),
// AddCol({ name: 'idapp', label_trans: 'reg.idapp', fieldtype: costanti.FieldType.string }),
AddCol({
- name: 'perm', label_trans: 'reg.perm', fieldtype: costanti.FieldType.binary, jointable: 'permissions', titlepopupedit: 'Permessi'
+ name: 'perm',
+ label_trans: 'reg.perm',
+ fieldtype: costanti.FieldType.binary,
+ jointable: 'permissions',
+ titlepopupedit: 'Permessi'
}),
AddCol({ name: 'ipaddr', label_trans: 'reg.ipaddr' }),
AddCol({ name: 'deleted', label_trans: 'reg.deleted', fieldtype: costanti.FieldType.boolean }),
@@ -1524,7 +1717,11 @@ export const fieldsTable = {
AddCol({ name: 'verified_email', label_trans: 'reg.verified_email', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'note', label_trans: 'reg.note' }),
AddCol({ name: 'aportador_solidario', label_trans: 'reg.aportador_solidario' }),
- AddCol({ name: 'verified_by_aportador', label_trans: 'reg.verified_by_aportador', fieldtype: costanti.FieldType.boolean }),
+ AddCol({
+ name: 'verified_by_aportador',
+ label_trans: 'reg.verified_by_aportador',
+ fieldtype: costanti.FieldType.boolean
+ }),
AddCol({ name: 'trust_modified', label_trans: 'reg.trust_modified', fieldtype: costanti.FieldType.date }),
AddCol({ name: 'blocked', label_trans: 'reg.blocked', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'username_who_block', label_trans: 'reg.username_who_block' }),
@@ -1661,7 +1858,11 @@ export const fieldsTable = {
AddCol({ name: 'date_reg', label_trans: 'reg.date_reg', fieldtype: costanti.FieldType.date }),
AddCol({ name: 'lasttimeonline', label_trans: 'reg.lasttimeonline', fieldtype: costanti.FieldType.date }),
AddCol({
- name: 'perm', label_trans: 'reg.perm', fieldtype: costanti.FieldType.binary, jointable: 'permissions', titlepopupedit: 'Permessi'
+ name: 'perm',
+ label_trans: 'reg.perm',
+ fieldtype: costanti.FieldType.binary,
+ jointable: 'permissions',
+ titlepopupedit: 'Permessi'
}),
AddCol({ name: 'ipaddr', label_trans: 'reg.ipaddr' }),
AddCol({ name: 'deleted', label_trans: 'reg.deleted', fieldtype: costanti.FieldType.boolean }),
@@ -1723,6 +1924,7 @@ export const fieldsTable = {
tableForUsers: [
'myskills',
+ 'mybachecas',
],
tableRemotePickup: [
@@ -1733,6 +1935,7 @@ export const fieldsTable = {
tableWithUsername: [
'myskills',
+ 'mybachecas',
],
tablesList: [
@@ -1982,11 +2185,18 @@ export const fieldsTable = {
collabel: 'key',
},
{
- value: 'myskills',
+ value: toolsext.TABMYSKILLS,
label: 'Mie Competenze',
columns: colmySkills,
colkey: '_id',
- collabel: (rec: any) => `${rec.name} ${rec.surname}`,
+ collabel: (rec: any) => `${rec.descr}`,
+ },
+ {
+ value: toolsext.TABMYBACHECAS,
+ label: 'Bacheca',
+ columns: colmyBachecas,
+ colkey: '_id',
+ collabel: (rec: any) => `${rec.descr}`,
},
{
value: 'skills',
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index a9a29c40..2dcb6cf3 100644
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -12,7 +12,7 @@ import {
ITodo,
IUserFields,
Privacy,
- TipoVisu, IGroup,
+ TipoVisu, IGroup, IMySkill, IMyBacheca,
} from '@model'
import { lists } from '@store/Modules/lists'
@@ -105,7 +105,6 @@ export const tools = {
'lime',
'orange',
'deeporange',
- 'blue-gray',
'yellow',
],
@@ -4894,11 +4893,81 @@ export const tools = {
return Array.isArray(val)
},
- isUserOk(){
+ isUserOk() {
const userStore = useUserStore()
return userStore.isUserOk()
},
+ getParamsByTable(table: string) {
+
+ let obj = {
+ prop_colkey: '',
+ col_title: '',
+ col_footer: '',
+ col_tabfooter: '',
+ }
+ if (table === toolsext.TABMYSKILLS) {
+ obj.prop_colkey = 'idSkill'
+ obj.col_title = 'descr'
+ obj.col_footer = 'idCity'
+ obj.col_tabfooter = 'mycities'
+ } else if (table === toolsext.TABMYBACHECAS) {
+ obj.prop_colkey = 'idSkill'
+ obj.col_title = 'descr'
+ obj.col_footer = 'idCity'
+ obj.col_tabfooter = 'mycities'
+ }
+
+ return obj
+
+ },
+
+ getdefaultnewrec_MySkill(): any {
+ return {
+ _id: 0,
+ idSector: 0,
+ idSkill: 0,
+ idSubSkill: [],
+ idStatusSkill: [],
+ idContribType: [],
+ idCity: [],
+ NumLevel: 0,
+ adType: 0,
+ photos: [],
+ note: '',
+ descr: '',
+ }
+ },
+
+ getdefaultnewrec_MyBacheca(): any {
+ return {
+ _id: 0,
+ idSector: 0,
+ idSkill: 0,
+ idSubSkill: [],
+ idStatusSkill: [],
+ idContribType: [],
+ idCity: [],
+ NumLevel: 0,
+ adType: 0,
+ photos: [],
+ note: '',
+ descr: '',
+
+ }
+ },
+
+ getDirectoryByTable(table: string) {
+ if (table === toolsext.TABMYSKILLS) {
+ return 'mywork'
+ } else if (table === toolsext.TABMYBACHECAS) {
+ return 'mypage'
+ } else if (table === 'mygroups') {
+ return 'grp'
+ }
+
+ return ''
+ },
// getLocale() {
// if (navigator.languages && navigator.languages.length > 0) {
diff --git a/src/store/Modules/toolsext.ts b/src/store/Modules/toolsext.ts
index 7796c6ff..0ab7c260 100755
--- a/src/store/Modules/toolsext.ts
+++ b/src/store/Modules/toolsext.ts
@@ -61,6 +61,7 @@ export const toolsext = {
TABFRIENDS: 'friends',
TABMYGROUPS: 'mygroups',
TABMYSKILLS: 'myskills',
+ TABMYBACHECAS: 'mybachecas',
TABNAVI: 'navi',
TABLISTAINGRESSO: 'listaingressos',
TABGRADUATORIA: 'graduatorias',
diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts
index ff0c49f4..727e6d73 100755
--- a/src/store/UserStore.ts
+++ b/src/store/UserStore.ts
@@ -234,7 +234,6 @@ export const useUserStore = defineStore('UserStore', {
},
getImgByProfile(userparam: IUserFields, reale: any = false): string {
-
try {
if (userparam.profile && userparam.profile.img) {
return costanti.DIR_UPLOAD + 'profile/' + userparam.username + '/' + userparam.profile.img
@@ -939,6 +938,21 @@ export const useUserStore = defineStore('UserStore', {
},
+ async loadGeneric(table: string, id: number) {
+ const data = {
+ table,
+ id
+ }
+
+ return Api.SendReq('/mygen/page', 'POST', data)
+ .then((res) => {
+ return res.data
+ }).catch((error) => {
+ return {}
+ })
+
+ },
+
async loadFriends(username: string) {
return Api.SendReq('/users/friends', 'POST', null)
.then((ris) => {
diff --git a/src/store/globalStore.ts b/src/store/globalStore.ts
index 6712c65e..748bbc90 100644
--- a/src/store/globalStore.ts
+++ b/src/store/globalStore.ts
@@ -827,6 +827,21 @@ export const useGlobalStore = defineStore('GlobalStore', {
})
},
+ async loadPageTest() {
+
+ console.log('loadPageTest')
+
+ let obj = { test: 'OK! Versione Client: ' + tools.getvers() }
+
+ return Api.SendReq('/testServer', 'POST', obj)
+ .then((res) => {
+ return res
+ })
+ .catch((error) => {
+ return error
+ })
+ },
+
async saveTable(mydata: any) {
// console.log('saveTable', mydata)
const userStore = useUserStore()
diff --git a/src/views/testServer/testServer.scss b/src/views/testServer/testServer.scss
new file mode 100755
index 00000000..e69de29b
diff --git a/src/views/testServer/testServer.ts b/src/views/testServer/testServer.ts
new file mode 100755
index 00000000..85405f47
--- /dev/null
+++ b/src/views/testServer/testServer.ts
@@ -0,0 +1,15 @@
+import {
+ defineComponent, ref, computed,
+} from 'vue'
+
+import { CTestServer } from '../../components/CTestServer'
+
+export default defineComponent({
+ name: 'testServer',
+ components: { CTestServer },
+ setup() {
+
+ return {
+ }
+ },
+})
diff --git a/src/views/testServer/testServer.vue b/src/views/testServer/testServer.vue
new file mode 100755
index 00000000..65fe8d9b
--- /dev/null
+++ b/src/views/testServer/testServer.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/user/mypageskill/mypageskill.scss b/src/views/user/mypagebacheca/mypagebacheca.scss
similarity index 100%
rename from src/views/user/mypageskill/mypageskill.scss
rename to src/views/user/mypagebacheca/mypagebacheca.scss
diff --git a/src/views/user/mypagebacheca/mypagebacheca.ts b/src/views/user/mypagebacheca/mypagebacheca.ts
new file mode 100755
index 00000000..344dbb95
--- /dev/null
+++ b/src/views/user/mypagebacheca/mypagebacheca.ts
@@ -0,0 +1,27 @@
+import { computed, defineComponent, onMounted, ref, watch } from 'vue'
+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 { toolsext } from '@store/Modules/toolsext'
+
+export default defineComponent({
+ name: 'mypagebacheca',
+ components: { CMyCardPopup },
+ props: {},
+ setup() {
+ const userStore = useUserStore()
+ const $route = useRoute()
+ const $q = useQuasar()
+ const { t } = useI18n()
+
+ const idBacheca = computed(() => $route.params.idBacheca ? $route.params.idBacheca.toString() : 0)
+
+ return {
+ t,
+ idBacheca,
+ toolsext,
+ }
+ }
+})
diff --git a/src/views/user/mypagebacheca/mypagebacheca.vue b/src/views/user/mypagebacheca/mypagebacheca.vue
new file mode 100755
index 00000000..8305753c
--- /dev/null
+++ b/src/views/user/mypagebacheca/mypagebacheca.vue
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/user/mywork/mywork.scss b/src/views/user/mywork/mywork.scss
new file mode 100755
index 00000000..558a623b
--- /dev/null
+++ b/src/views/user/mywork/mywork.scss
@@ -0,0 +1,18 @@
+.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;
+}
diff --git a/src/views/user/mypageskill/mypageskill.ts b/src/views/user/mywork/mywork.ts
similarity index 97%
rename from src/views/user/mypageskill/mypageskill.ts
rename to src/views/user/mywork/mywork.ts
index d92b1d89..be548eb2 100755
--- a/src/views/user/mypageskill/mypageskill.ts
+++ b/src/views/user/mywork/mywork.ts
@@ -21,7 +21,7 @@ import { colCitys } from '@store/Modules/fieldsTable'
export default defineComponent({
- name: 'myuser',
+ name: 'mywork',
components: { CProfile, CTitleBanner, CMyFieldDb, CSkill, CDateTime, CMyPage },
props: {},
setup() {
@@ -33,6 +33,8 @@ export default defineComponent({
const animation = ref('fade')
+ const table = ref(toolsext.TABMYSKILLS)
+
const idSkill = computed(() => $route.params.idSkill ? $route.params.idSkill.toString() : 0)
const filtroutente = ref([])
@@ -94,6 +96,7 @@ export default defineComponent({
animation,
fieldsTable,
colCitys,
+ table,
}
}
})
diff --git a/src/views/user/mypageskill/mypageskill.vue b/src/views/user/mywork/mywork.vue
similarity index 92%
rename from src/views/user/mypageskill/mypageskill.vue
rename to src/views/user/mywork/mywork.vue
index 2a71d713..de5b56a1 100755
--- a/src/views/user/mypageskill/mypageskill.vue
+++ b/src/views/user/mywork/mywork.vue
@@ -16,6 +16,7 @@
@@ -46,10 +47,10 @@
-