diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index 600902c7..4af4a6a3 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -214,6 +214,7 @@ export const shared_consts = { FILTER_NOTE: 536870912, FILTER_SENZA_NOTE: 1073741824, FILTER_DA_CONTATTARE: 2147483648, + FILTER_FACILITATORE: 4294967296, OPTIONS_SEARCH_ONLY_FULL_WORDS: 1, OPTIONS_SEARCH_USER_ONLY_FULL_WORDS: 2, @@ -322,6 +323,10 @@ export const shared_consts = { label: 'Con Provincia inserita', value: 16777216, //FILTER_USER_PROVINCE: }, + { + label: 'Facilitatore RISO', + value: 4294967296, //FILTER_FACILITATORE: ,: + }, ], @@ -2255,6 +2260,7 @@ export const shared_consts = { username_who_report: 1, namecomplete: 1, date_reg: 1, + perm: 1, }; if (proj_add) diff --git a/src/components/CFindUsers/CFindUsers.ts b/src/components/CFindUsers/CFindUsers.ts index fe6eb056..03f009ff 100755 --- a/src/components/CFindUsers/CFindUsers.ts +++ b/src/components/CFindUsers/CFindUsers.ts @@ -108,6 +108,7 @@ export default defineComponent({ searchList.value = [ { + visible: true, label: 'Regione', table: 'regions', key: 'idReg', @@ -121,6 +122,7 @@ export default defineComponent({ icon: 'fas fa-globe-europe' }, { + visible: true, label: 'Provincia', table: 'provinces', key: 'profile.resid_province', @@ -168,6 +170,7 @@ export default defineComponent({ 'profile.da_contattare': 1, 'profile.resid_province': 1, 'mycities.reg': 1, + perm: 1, } }, diff --git a/src/components/CFinder/CFinder.ts b/src/components/CFinder/CFinder.ts index 36de781a..563e0b62 100755 --- a/src/components/CFinder/CFinder.ts +++ b/src/components/CFinder/CFinder.ts @@ -51,6 +51,11 @@ export default defineComponent({ required: false, default: '', }, + filtrocircuito: { + type: String, + required: false, + default: '', + }, selector: { type: Object, required: false, @@ -343,11 +348,12 @@ export default defineComponent({ searchList_Servizi.value = [ { + visible: true, label: 'Regione', table: 'regions', key: 'idReg', type: costanti.FieldType.select, - value: tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'regions', costanti.FILTER_TUTTI), + value: props.filtrocircuito ? costanti.FILTER_TUTTI : tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'regions', costanti.FILTER_TUTTI), addall: true, arrvalue: [], filter: null, @@ -355,11 +361,12 @@ export default defineComponent({ icon: 'fas fa-globe-europe' }, { + visible: true, label: 'Provincia', table: 'provinces', key: 'idProvince', type: costanti.FieldType.select, - value: tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'provinces', costanti.FILTER_TUTTI), + value: props.filtrocircuito ? costanti.FILTER_TUTTI : tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'provinces', costanti.FILTER_TUTTI), addall: true, arrvalue: [], filter: getFilterProvinceByRegion, @@ -368,11 +375,12 @@ export default defineComponent({ tablesel: 'provinces', }, { + visible: props.filtrocircuito ? false : true, label: 'Circuito', table: 'circuits', key: 'profile.mycircuits.circuitname', type: costanti.FieldType.select, - value: tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'circuits', costanti.FILTER_TUTTI), + value: props.filtrocircuito ? props.filtrocircuito : tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'circuits', costanti.FILTER_TUTTI), addall: true, arrvalue: [], filter: null, @@ -380,11 +388,12 @@ export default defineComponent({ icon: 'fas fa-globe-europe' }, { + visible: true, label: 'Comune', table: 'cities', key: 'idCity', type: costanti.FieldType.select_by_server, - value: tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'cities', costanti.FILTER_TUTTI), + value: props.filtrocircuito ? costanti.FILTER_TUTTI : tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'cities', costanti.FILTER_TUTTI), addall: true, arrvalue: [], useinput: true, @@ -406,6 +415,7 @@ export default defineComponent({ filter: null, },*/ { + visible: true, label: 'Settore', table: toolsext.TABSECTORS, key: 'idSector', @@ -430,6 +440,7 @@ export default defineComponent({ useinput: false, },*/ { + visible: true, label: 'Offro/Cerco', table: 'adtypes', key: 'adType', @@ -475,6 +486,7 @@ export default defineComponent({ */ { + visible: true, label: 'Disponibile', table: 'statusSkills', key: 'idStatusSkill', @@ -487,6 +499,7 @@ export default defineComponent({ filteradv: true, }, { + visible: true, label: 'In cambio di', table: 'contribtypes', key: 'idContribType', @@ -500,6 +513,7 @@ export default defineComponent({ //icon: 'swap_horizontal_circle', }, { + visible: true, label: '', table: '', key: '', @@ -530,11 +544,12 @@ export default defineComponent({ filteradv: false, },*/ { + visible: true, label: 'Regione', table: 'regions', key: 'idReg', type: costanti.FieldType.select, - value: tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'regions', costanti.FILTER_TUTTI), + value: props.filtrocircuito ? costanti.FILTER_TUTTI : tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'regions', costanti.FILTER_TUTTI), addall: true, arrvalue: [], filter: null, @@ -542,11 +557,12 @@ export default defineComponent({ icon: 'fas fa-globe-europe' }, { + visible: true, label: 'Provincia', table: 'provinces', key: 'idProvince', type: costanti.FieldType.select, - value: tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'provinces', costanti.FILTER_TUTTI), + value: props.filtrocircuito ? costanti.FILTER_TUTTI : tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'provinces', costanti.FILTER_TUTTI), addall: true, arrvalue: [], filter: getFilterProvinceByRegion, @@ -554,11 +570,12 @@ export default defineComponent({ icon: 'flag', }, { + visible: props.filtrocircuito ? false : true, label: 'Circuito', table: 'circuits', key: 'profile.mycircuits.circuitname', type: costanti.FieldType.select, - value: tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'circuits', costanti.FILTER_TUTTI), + value: props.filtrocircuito ? props.filtrocircuito : tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'circuits', costanti.FILTER_TUTTI), addall: true, arrvalue: [], filter: null, @@ -566,11 +583,12 @@ export default defineComponent({ icon: 'fas fa-globe-europe' }, { + visible: true, label: 'Comune', table: 'cities', key: 'idCity', type: costanti.FieldType.select_by_server, - value: tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'cities', costanti.FILTER_TUTTI), + value: props.filtrocircuito ? costanti.FILTER_TUTTI : tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'cities', costanti.FILTER_TUTTI), addall: true, arrvalue: [], useinput: true, @@ -593,6 +611,7 @@ export default defineComponent({ tablesel: 'pub_to_share', },*/ { + visible: true, label: 'Settore', table: toolsext.TABSECTORS, key: 'idSector', @@ -605,6 +624,7 @@ export default defineComponent({ useinput: false, }, { + visible: true, label: 'Data Inizio', table: 'caldate', key: 'dateTimeStart', @@ -629,6 +649,7 @@ export default defineComponent({ useinput: false, },*/ { + visible: true, label: 'In cambio di', table: 'contribtypes', key: 'idContribType', @@ -642,6 +663,7 @@ export default defineComponent({ //icon: 'swap_horizontal_circle', }, { + visible: true, label: '', table: '', key: '', @@ -660,11 +682,12 @@ export default defineComponent({ searchList_Hosp.value = [ { + visible: true, label: 'Regione', table: 'regions', key: 'idReg', type: costanti.FieldType.select, - value: tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'regions', costanti.FILTER_TUTTI), + value: props.filtrocircuito ? costanti.FILTER_TUTTI : tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'regions', costanti.FILTER_TUTTI), keycookie: '_hosp', addall: true, arrvalue: [], @@ -673,11 +696,12 @@ export default defineComponent({ icon: 'fas fa-globe-europe' }, { + visible: true, label: 'Provincia', table: 'provinces', key: 'idProvince', type: costanti.FieldType.select, - value: tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'provinces', costanti.FILTER_TUTTI), + value: props.filtrocircuito ? costanti.FILTER_TUTTI : tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'provinces', costanti.FILTER_TUTTI), keycookie: '_hosp', addall: true, arrvalue: [], @@ -686,11 +710,12 @@ export default defineComponent({ icon: 'flag', }, { + visible: props.filtrocircuito ? false : true, label: 'Circuito', table: 'circuits', key: 'profile.mycircuits.circuitname', type: costanti.FieldType.select, - value: tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'circuits', costanti.FILTER_TUTTI), + value: props.filtrocircuito ? props.filtrocircuito : tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'circuits', costanti.FILTER_TUTTI), addall: true, arrvalue: [], filter: null, @@ -702,7 +727,7 @@ export default defineComponent({ table: 'cities', key: 'idCity', type: costanti.FieldType.select_by_server, - value: tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'cities', costanti.FILTER_TUTTI), + value: props.filtrocircuito ? costanti.FILTER_TUTTI : tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'cities', costanti.FILTER_TUTTI), keycookie: '_hosp', addall: true, arrvalue: [], @@ -712,6 +737,7 @@ export default defineComponent({ // param1: shared_consts.PARAM_SHOW_PROVINCE, tablesel: 'cities', filteradv: true, + visible: true, }, { label: 'Offro/Cerco', @@ -724,6 +750,7 @@ export default defineComponent({ filter: null, useinput: false, filteradv: true, + visible: true, }, { label: 'Tipologia', @@ -737,6 +764,7 @@ export default defineComponent({ useinput: false, icon: 'flag', filteradv: true, + visible: true, }, { label: 'N° max Ospiti', @@ -750,6 +778,7 @@ export default defineComponent({ useinput: false, icon: 'fas fa-users', filteradv: true, + visible: true, }, { label: 'Preferenze', @@ -763,6 +792,7 @@ export default defineComponent({ useinput: false, icon: 'fas fa-asterisk', filteradv: true, + visible: true, }, { label: 'In cambio di', @@ -775,6 +805,7 @@ export default defineComponent({ useinput: false, icon: 'fas fa-hand-holding', filteradv: true, + visible: true, //icon: 'swap_horizontal_circle', }, { @@ -790,29 +821,32 @@ export default defineComponent({ useinput: false, notinsearch: true, icon: '', + visible: true, }, ] searchList_Beni.value = [ { + visible: true, label: 'Regione', table: 'regions', key: 'idReg', type: costanti.FieldType.select, - value: tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'regions', costanti.FILTER_TUTTI), + value: props.filtrocircuito ? costanti.FILTER_TUTTI : tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'regions', costanti.FILTER_TUTTI), addall: true, arrvalue: [], filter: null, useinput: false, - icon: 'fas fa-globe-europe' + icon: 'fas fa-globe-europe', }, { + visible: true, label: 'Provincia', table: 'provinces', key: 'idProvince', type: costanti.FieldType.select, - value: tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'provinces', costanti.FILTER_TUTTI), + value: props.filtrocircuito ? costanti.FILTER_TUTTI : tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'provinces', costanti.FILTER_TUTTI), addall: true, arrvalue: [], filter: getFilterProvinceByRegion, @@ -820,23 +854,25 @@ export default defineComponent({ icon: 'flag', }, { + visible: props.filtrocircuito ? false : true, label: 'Circuito', table: 'circuits', key: 'profile.mycircuits.circuitname', type: costanti.FieldType.select, - value: tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'circuits', costanti.FILTER_TUTTI), + value: props.filtrocircuito ? props.filtrocircuito : tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'circuits', costanti.FILTER_TUTTI), addall: true, arrvalue: [], filter: null, useinput: false, - icon: 'fas fa-globe-europe' + icon: 'fas fa-globe-europe', }, { + visible: true, label: 'Comune', table: 'cities', key: 'idCity', type: costanti.FieldType.select_by_server, - value: tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'cities', costanti.FILTER_TUTTI), + value: props.filtrocircuito ? costanti.FILTER_TUTTI : tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'cities', costanti.FILTER_TUTTI), addall: true, arrvalue: [], useinput: true, @@ -859,6 +895,7 @@ export default defineComponent({ tablesel: 'pub_to_share', },*/ { + visible: true, label: 'Settore', table: 'sectorgoods', key: 'idSectorGood', @@ -871,6 +908,7 @@ export default defineComponent({ useinput: false, }, { + visible: true, label: 'Categoria', table: 'goods', key: 'idGood', @@ -883,6 +921,7 @@ export default defineComponent({ useinput: false, }, { + visible: true, label: 'Offro/Cerco', table: 'adtypes', key: 'adType', @@ -940,6 +979,7 @@ export default defineComponent({ */ { + visible: true, label: 'In cambio di', table: 'contribtypes', key: 'idContribType', @@ -953,6 +993,7 @@ export default defineComponent({ //icon: 'swap_horizontal_circle', }, { + visible: true, label: 'Altri Filtri', table: 'otherfilters', key: 'otherfilters', @@ -966,6 +1007,7 @@ export default defineComponent({ filteradv: true, }, { + visible: true, label: '', table: '', key: '', @@ -984,6 +1026,7 @@ export default defineComponent({ searchList_MyCircuits.value = [ { + visible: true, label: 'Regione', table: 'regions', key: 'idReg', @@ -996,6 +1039,7 @@ export default defineComponent({ icon: 'fas fa-globe-europe' }, { + visible: true, label: 'Provincia', table: 'provinces', key: 'idProvince', @@ -1008,6 +1052,7 @@ export default defineComponent({ icon: 'flag', }, { + visible: true, label: 'Comune', table: 'cities', key: 'idCity', @@ -1025,6 +1070,7 @@ export default defineComponent({ searchList_Attivita.value = [ { + visible: true, label: 'Regione', table: 'regions', key: 'idReg', @@ -1037,6 +1083,7 @@ export default defineComponent({ icon: 'fas fa-globe-europe' }, { + visible: true, label: 'Provincia', table: 'provinces', key: 'idProvince', @@ -1049,6 +1096,7 @@ export default defineComponent({ icon: 'flag', }, { + visible: true, label: 'Comune', table: 'cities', key: 'idCity', @@ -1063,6 +1111,7 @@ export default defineComponent({ tablesel: 'cities', }, { + visible: true, label: '', table: '', key: '', @@ -1080,6 +1129,7 @@ export default defineComponent({ searchList_MyGroups.value = [ { + visible: true, label: 'Regione', table: 'regions', key: 'idReg', @@ -1092,6 +1142,7 @@ export default defineComponent({ icon: 'fas fa-globe-europe' }, { + visible: true, label: 'Provincia', table: 'provinces', key: 'idProvince', @@ -1104,6 +1155,7 @@ export default defineComponent({ icon: 'flag', }, { + visible: true, label: 'Comune', table: 'cities', key: 'idCity', @@ -1120,11 +1172,12 @@ export default defineComponent({ filteradv: true, }, { + visible: props.filtrocircuito ? false : true, label: 'Circuito', table: 'circuits', key: 'profile.mycircuits.circuitname', type: costanti.FieldType.select, - value: tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'circuits', costanti.FILTER_TUTTI), + value: props.filtrocircuito ? props.filtrocircuito : tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'circuits', costanti.FILTER_TUTTI), addall: true, arrvalue: [], filter: null, @@ -1132,6 +1185,7 @@ export default defineComponent({ icon: 'fas fa-globe-europe' }, { + visible: true, label: 'Categorie', table: 'catgrps', key: 'idCatGrp', @@ -1144,6 +1198,7 @@ export default defineComponent({ icon: 'engineering', }, { + visible: true, label: 'Visiblità', table: 'visibilGroup', key: 'visibility', @@ -1156,6 +1211,7 @@ export default defineComponent({ tablesel: 'visibility', }, { + visible: true, label: '', table: '', key: '', diff --git a/src/components/CGridOriz/CGridOriz.ts b/src/components/CGridOriz/CGridOriz.ts index 8e93fbc7..a932029c 100755 --- a/src/components/CGridOriz/CGridOriz.ts +++ b/src/components/CGridOriz/CGridOriz.ts @@ -338,6 +338,7 @@ export default defineComponent({ searchList_Servizi.value = [ { + visible: true, label: 'Regione', table: 'regions', key: 'idReg', @@ -350,6 +351,7 @@ export default defineComponent({ icon: 'fas fa-globe-europe' }, { + visible: true, label: 'Provincia', table: 'provinces', key: 'idProvince', @@ -363,6 +365,7 @@ export default defineComponent({ tablesel: 'provinces', }, { + visible: true, label: 'Comune', table: 'cities', key: 'idCity', @@ -388,6 +391,7 @@ export default defineComponent({ filter: null, },*/ { + visible: true, label: 'Settore', table: toolsext.TABSECTORS, key: 'idSector', @@ -400,6 +404,7 @@ export default defineComponent({ useinput: false, }, { + visible: true, label: 'Categoria', table: 'skills', key: 'idSkill', @@ -412,6 +417,7 @@ export default defineComponent({ useinput: false, }, { + visible: true, label: 'Offro/Cerco', table: 'adtypes', key: 'adType', @@ -456,6 +462,7 @@ export default defineComponent({ */ { + visible: true, label: 'Disponibile', table: 'statusSkills', key: 'idStatusSkill', @@ -468,6 +475,7 @@ export default defineComponent({ filteradv: true, }, { + visible: true, label: 'In cambio di', table: 'contribtypes', key: 'idContribType', @@ -514,6 +522,7 @@ export default defineComponent({ filteradv: false, },*/ { + visible: true, label: 'Regione', table: 'regions', key: 'idReg', @@ -526,6 +535,7 @@ export default defineComponent({ icon: 'fas fa-globe-europe' }, { + visible: true, label: 'Provincia', table: 'provinces', key: 'idProvince', @@ -564,6 +574,7 @@ export default defineComponent({ tablesel: 'pub_to_share', },*/ { + visible: true, label: 'Settore', table: toolsext.TABSECTORS, key: 'idSector', @@ -576,6 +587,7 @@ export default defineComponent({ useinput: false, }, { + visible: true, label: 'Data Inizio', table: 'caldate', key: 'dateTimeStart', @@ -616,6 +628,7 @@ export default defineComponent({ searchList_Hosp.value = [ { + visible: true, label: 'Regione', table: 'regions', key: 'idReg', @@ -629,6 +642,7 @@ export default defineComponent({ icon: 'fas fa-globe-europe' }, { + visible: true, label: 'Provincia', table: 'provinces', key: 'idProvince', @@ -642,6 +656,7 @@ export default defineComponent({ icon: 'flag', }, { + visible: true, label: 'Comune', table: 'cities', key: 'idCity', @@ -657,6 +672,7 @@ export default defineComponent({ tablesel: 'cities', }, { + visible: true, label: 'Offro/Cerco', table: 'adtypes', key: 'adType', @@ -668,6 +684,7 @@ export default defineComponent({ useinput: false, }, { + visible: true, label: 'Tipologia', table: toolsext.TABTYPEHOSP, key: 'typeHosp', @@ -680,6 +697,7 @@ export default defineComponent({ icon: 'flag', }, { + visible: true, label: 'N° max Ospiti', table: toolsext.TABPEOPLE, key: 'numMaxPeopleHosp', @@ -692,6 +710,7 @@ export default defineComponent({ icon: 'fas fa-users', }, { + visible: true, label: 'Preferenze', table: toolsext.TABPREF, key: 'preferences', @@ -704,6 +723,7 @@ export default defineComponent({ icon: 'fas fa-asterisk', }, { + visible: true, label: 'In cambio di', table: 'contribtypes', key: 'idContribType', @@ -721,6 +741,7 @@ export default defineComponent({ searchList_Beni.value = [ { + visible: true, label: 'Regione', table: 'regions', key: 'idReg', @@ -733,6 +754,7 @@ export default defineComponent({ icon: 'fas fa-globe-europe' }, { + visible: true, label: 'Provincia', table: 'provinces', key: 'idProvince', @@ -745,6 +767,7 @@ export default defineComponent({ icon: 'flag', }, { + visible: true, label: 'Comune', table: 'cities', key: 'idCity', @@ -771,6 +794,7 @@ export default defineComponent({ tablesel: 'pub_to_share', },*/ { + visible: true, label: 'Settore', table: 'sectorgoods', key: 'idSectorGood', @@ -783,6 +807,7 @@ export default defineComponent({ useinput: false, }, { + visible: true, label: 'Categoria', table: 'goods', key: 'idGood', @@ -795,6 +820,7 @@ export default defineComponent({ useinput: false, }, { + visible: true, label: 'Offro/Cerco', table: 'adtypes', key: 'adType', @@ -851,6 +877,7 @@ export default defineComponent({ */ { + visible: true, label: 'In cambio di', table: 'contribtypes', key: 'idContribType', @@ -864,6 +891,7 @@ export default defineComponent({ //icon: 'swap_horizontal_circle', }, { + visible: true, label: 'Altri Filtri', table: 'otherfilters', key: 'otherfilters', @@ -876,6 +904,7 @@ export default defineComponent({ icon: 'fas fa-filter' }, { + visible: true, label: '', table: '', key: '', @@ -894,6 +923,7 @@ export default defineComponent({ searchList_MyCircuits.value = [ { + visible: true, label: 'Regione', table: 'regions', key: 'idReg', @@ -906,6 +936,7 @@ export default defineComponent({ icon: 'fas fa-globe-europe' }, { + visible: true, label: 'Provincia', table: 'provinces', key: 'idProvince', @@ -918,6 +949,7 @@ export default defineComponent({ icon: 'flag', }, { + visible: true, label: 'Comune', table: 'cities', key: 'idCity', @@ -935,6 +967,7 @@ export default defineComponent({ searchList_Attivita.value = [ { + visible: true, label: 'Regione', table: 'regions', key: 'idReg', @@ -947,6 +980,7 @@ export default defineComponent({ icon: 'fas fa-globe-europe' }, { + visible: true, label: 'Provincia', table: 'provinces', key: 'idProvince', @@ -959,6 +993,7 @@ export default defineComponent({ icon: 'flag', }, { + visible: true, label: 'Comune', table: 'cities', key: 'idCity', @@ -976,6 +1011,7 @@ export default defineComponent({ searchList_MyGroups.value = [ { + visible: true, label: 'Regione', table: 'regions', key: 'idReg', @@ -988,6 +1024,7 @@ export default defineComponent({ icon: 'fas fa-globe-europe' }, { + visible: true, label: 'Provincia', table: 'provinces', key: 'idProvince', @@ -1000,6 +1037,7 @@ export default defineComponent({ icon: 'flag', }, { + visible: true, label: 'Comune', table: 'cities', key: 'idCity', @@ -1015,6 +1053,7 @@ export default defineComponent({ icon: 'fas fa-map-marker-alt', }, { + visible: true, label: 'Categorie', table: 'catgrps', key: 'idCatGrp', @@ -1027,6 +1066,7 @@ export default defineComponent({ icon: 'engineering', }, { + visible: true, label: 'Visiblità', table: 'visibilGroup', key: 'visibility', diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index ab2ed095..0194bc00 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -920,7 +920,11 @@ export default defineComponent({ obj[myfield] = item.value if (myfield) { if (item.value !== '' && item.value !== costanti.FILTER_TUTTI) { - filtersearch3and.push({ "profile.mycircuits.circuitname": item.value.name }) + let nomecircuito = item.value + if (tools.isObject(item.value)) + nomecircuito = item.value.name + + filtersearch3and.push({ "profile.mycircuits.circuitname": nomecircuito }) } } @@ -990,7 +994,11 @@ export default defineComponent({ }); } else if (myitemsingle === shared_consts.FILTER_USER_NO_TELEGRAM_ID) { filtercustom.push({ 'profile.teleg_id': { $lt: 1 } }); - + } else if (myitemsingle === shared_consts.FILTER_FACILITATORE) { + filtercustom.push({ + perm: { $bitsAnySet: 0b1000 } + }) + // { 'perm': { $bit: { and: } } }); } }) diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index ba976a5b..f2ccf432 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -112,7 +112,10 @@ > -