diff --git a/src/components/CEventsCalendar/CEventsCalendar.ts b/src/components/CEventsCalendar/CEventsCalendar.ts index d00c82cf..8c3d9f19 100755 --- a/src/components/CEventsCalendar/CEventsCalendar.ts +++ b/src/components/CEventsCalendar/CEventsCalendar.ts @@ -808,7 +808,7 @@ export default defineComponent({ function createContribType(value: any) { console.log('createContribType', value) - tools.createNewRecord($q, 'contribtype', { label: value }).then((myrec) => { + tools.createNewRecord($q, 'contribtypes', { label: value }).then((myrec) => { // console.log('myrec') calendarStore.contribtype.push(myrec) }) diff --git a/src/components/CFinder/CFinder.ts b/src/components/CFinder/CFinder.ts index e80d1c29..b2701e06 100755 --- a/src/components/CFinder/CFinder.ts +++ b/src/components/CFinder/CFinder.ts @@ -98,6 +98,15 @@ export default defineComponent({ type: costanti.FieldType.multiselect, filter: null, }, + { + label: 'Contributo', + table: 'contribtypes', + key: 'idContribType', + value: 0, + arrvalue: tools.getCookie(tools.COOK_SEARCH + 'contribtypes', [costanti.FILTER_TUTTI]), + type: costanti.FieldType.multiselect, + filter: null, + }, ] @@ -126,11 +135,12 @@ export default defineComponent({ const data = await globalStore.saveSubRec(mydata) } - function getdefaultnewrec(): any { + function getdefaultnewrec(): IMySkill { return { _id: 0, idSkill: 0, idStatusSkill: [], + idContribType: [], idCity: [], NumLevel: 0, photos: [], @@ -148,10 +158,19 @@ export default defineComponent({ lk_FF: '_id', lk_as: 'user', af_objId_tab: 'myId', + }, + lookup2: { + lk_tab: 'skills', + lk_LF: 'idSkill', + lk_FF: '_id', + lk_as: 'recSkill', + af_objId_tab: '', lk_proj: { - 'sector.idSector': 1, + recSkill: 1, + sector: 1, idSkill: 1, idStatusSkill: 1, + idContribType: 1, idCity: 1, numLevel: 1, photos: 1, @@ -165,29 +184,13 @@ export default defineComponent({ surname: 1 } }, - lookup2: { + lookup3: { lk_tab: 'sectors', - lk_LF: 'idSkill', + lk_LF: 'recSkill.idSector', lk_FF: '_id', lk_as: 'sector', af_objId_tab: '', - lk_proj: { - 'sector.idSector': 1, - idSkill: 1, - idStatusSkill: 1, - idCity: 1, - numLevel: 1, - photos: 1, - note: 1, - subTitle: 1, - date_created: 1, - date_updated: 1, - userId: 1, - username: 1, - name: 1, - surname: 1 - } - } + }, } } diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index 36d4f373..6bf2d276 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -263,9 +263,16 @@ export default defineComponent({ // console.log('sortBy', sortBy) let filtersearch: any[] = [] + let filtersearch2: any[] = [] - let recSector = searchList.value.find((item: ISearchList) => item.table === 'sectors') - let idSector = recSector ? recSector.value : 0 + let recSector = null; + let idSector = 0; + if (searchList.value) { + recSector = searchList.value.find((item: ISearchList) => item.table === 'sectors') + idSector = recSector ? recSector.value : 0 + } + + // console.table(searchList.value) if (searchList.value) { searchList.value.forEach((item: ISearchList) => { @@ -275,7 +282,12 @@ export default defineComponent({ objitem[item.key] = item.value filtersearch.push(objitem) } else if (item.arrvalue.length > 0) { - const myarr = item.arrvalue.filter((value: any) => value > 0) + const myarr = item.arrvalue.filter((value: any) => { + if (typeof value === 'number') { + return value > 0; + } + return true; + }) let arr2: any = [] @@ -292,11 +304,10 @@ export default defineComponent({ filtersearch.push(obj2) } else { if (item.table === 'skills' && item.value === costanti.FILTER_TUTTI) { + let obj2: any = {} // idSector - let obj2: any = { - idSector: idSector - } - filtersearch.push(obj2) + obj2['sector._id'] = idSector + filtersearch2.push(obj2) } } } @@ -305,7 +316,6 @@ export default defineComponent({ console.log('filtersearch', filtersearch) - if (props.prop_search) { let nosearch = false if (filtersearch.length <= 0 && !param_myfilter) { @@ -342,6 +352,8 @@ export default defineComponent({ // @ts-ignore filtersearch: filtersearch, // @ts-ignore + filtersearch2: filtersearch2, + // @ts-ignore filtercustom: props.filtercustom, sortBy: myobj, descending, @@ -995,8 +1007,14 @@ export default defineComponent({ if (ris) { // console.log('ris', ris) newRecordBool.value = false - const indrec = serverData.value.findIndex((rec: IMySkill) => rec._id === ris._id) + const indrec = serverData.value.findIndex((rec: any) => rec._id === ris._id) console.log('indrec', indrec, serverData.value[indrec]) + + if (fieldsTable.tableWithUsername.includes(props.prop_mytable)) { + ris.username = userStore.my.username + } + + // console.table(serverData.value) if (indrec >= 0) serverData.value[indrec] = ris else @@ -1049,6 +1067,10 @@ export default defineComponent({ return props.labelBtnAddRow !== addRow.value } + function checkIfShowRec(rec: any) { + return (rec._id > 0 && typeof rec._id === 'number') || rec._id !== 'number' + } + // onMounted(mounted) @@ -1118,6 +1140,7 @@ export default defineComponent({ searchList, searchval, canModifyThisRec, + checkIfShowRec, } } }) diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index 084c09f7..223bd8df 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -130,7 +130,7 @@