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 @@ > -
+
{{ contact.profile.qualifica }}
Note: {{ contact.profile.note }}

Da Contattare
+
⭐️ Facilitatore RISO
diff --git a/src/css/app.scss b/src/css/app.scss index 0914ffca..c8fe7712 100755 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -2590,4 +2590,9 @@ body.body--dark { .custom-z-index { z-index: 2000 !important; +} + +.mybadge { + border-radius: 10px !important; + text-shadow: .05rem .05rem .15rem #878787; } \ No newline at end of file diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts index ac7a93f4..6fe4837e 100755 --- a/src/model/GlobalStore.ts +++ b/src/model/GlobalStore.ts @@ -1026,6 +1026,7 @@ export interface ISearchList { icon?: string filteradv?: boolean filter_extra?: object + visible: boolean } export interface IFilter { diff --git a/src/rootgen/admin/userPanel/userPanel.vue b/src/rootgen/admin/userPanel/userPanel.vue index 93a7ebce..38a3ac1e 100755 --- a/src/rootgen/admin/userPanel/userPanel.vue +++ b/src/rootgen/admin/userPanel/userPanel.vue @@ -171,6 +171,7 @@ +
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index d2f8fe92..3e271865 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -48,6 +48,8 @@ const msg_it = { info_pers: 'Info Personali', aggiungi_note: 'Aggiungi note', da_contattare: 'Da Contattare', + facilitatore: 'Facilitatore RISO', + togli_facilitatore: 'Togli: Facilitatore', togli_da_contattare: 'Togli: "Da Contattare"', annunci: 'Annunci', share_link: 'Copia Link', diff --git a/src/store/Modules/costanti.ts b/src/store/Modules/costanti.ts index 7bc43f6c..151779bf 100755 --- a/src/store/Modules/costanti.ts +++ b/src/store/Modules/costanti.ts @@ -130,6 +130,7 @@ export const costanti = { MAINCARDS: [ { visible: true, + annuncio: true, title: ' Beni ', subtitle: 'Autoproduzioni, artigianato, cibo, abbigliamento', strsingolo: 'Bene', @@ -146,6 +147,7 @@ export const costanti = { }, { visible: true, + annuncio: true, strsingolo: 'Servizio', title: 'Servizi', subtitle: 'Competenze, formazione, aiuti, benessere, casa', @@ -162,6 +164,7 @@ export const costanti = { }, { visible: true, + annuncio: true, title: 'Ospitalità', subtitle: 'Ospitare per brevi periodi, esplora altre città', strsingolo: 'Ospitalità', @@ -192,6 +195,7 @@ export const costanti = { // }, { visible: true, + annuncio: true, title: 'Eventi', strsingolo: 'Evento', subtitle: 'Mercatini, incontri, conferenze, corsi', diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index a9110302..84a1846f 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -4358,17 +4358,13 @@ export const tools = { SetBit(myval: any, bit: any) { - // tslint:disable-next-line:no-bitwise - let myvalout = myval - myvalout |= bit - return myvalout + // Utilizza l'operatore OR per abilitare il bit specificato + return myval | bit }, UnSetBit(myval: any, bit: any) { - // tslint:disable-next-line:no-bitwise - let myvalout = myval - myvalout &= ~bit - return myvalout + // Utilizza l'operatore AND con il complemento per disabilitare il bit specificato + return myval & ~bit }, getUnique(arr: any, comp: any) { @@ -9550,13 +9546,13 @@ export const tools = { try { // Crea un nuovo oggetto URL a partire dall'input const parsedUrl = new URL(url); - + // Estrae solo il protocollo, l'host e la porta const { protocol, host } = parsedUrl; - + // Ricostruisce il link principale const mainLink = `${host}`; - + return mainLink; } catch (error) { console.error('Errore durante l\'elaborazione dell\'URL:', error); diff --git a/src/views/ecommerce/catalogo/catalogo.ts b/src/views/ecommerce/catalogo/catalogo.ts index b02c79d1..1d805b9c 100755 --- a/src/views/ecommerce/catalogo/catalogo.ts +++ b/src/views/ecommerce/catalogo/catalogo.ts @@ -656,6 +656,7 @@ export default defineComponent({ searchList.value = [ { + visible: true, label: 'Ricerca', table: 'products', key: 'titolo', diff --git a/src/views/user/mycircuit/mycircuit.ts b/src/views/user/mycircuit/mycircuit.ts index 2630e55f..42fe54a0 100755 --- a/src/views/user/mycircuit/mycircuit.ts +++ b/src/views/user/mycircuit/mycircuit.ts @@ -11,6 +11,7 @@ import { CSendCoins } from '@/components/CSendCoins' import { CUserNonVerif } from '@/components/CUserNonVerif' import { CTitleSec } from '@/components/CTitleSec' import { CSkill } from '@/components/CSkill' +import { CFinder } from '@/components/CFinder' import { CDateTime } from '@/components/CDateTime' import { tools } from '@store/Modules/tools' import { computed, defineComponent, onMounted, ref, watch } from 'vue' @@ -34,7 +35,7 @@ export default defineComponent({ components: { CProfile, CTitleBanner, CMyFieldRec, CSkill, CTitleSec, CDateTime, CMyFriends, CGridTableRec, CMyUser, CCheckIfIsLogged, CCurrencyValue, CSaldo, CNotifAtTop, - CSendCoins, CUserNonVerif, + CSendCoins, CUserNonVerif, CFinder, }, props: {}, setup() { @@ -70,6 +71,8 @@ export default defineComponent({ const showPic = ref(false) const loadSaldo = ref(false) + const card = ref({}) + const circuit = ref({} as ICircuit | null) const account = ref(null) const mystatus = ref(0 as number) @@ -100,6 +103,10 @@ export default defineComponent({ const fidoConcesso = ref(0) const qtaMax = ref(0) + const mycards_annunci = computed(() => { + return costanti.MAINCARDS.filter((rec: any) => rec.table && rec.annuncio) + }) + watch(() => path.value, (to: any, from: any) => { if (circuitpath_loaded.value !== path.value) loadCircuit() @@ -348,6 +355,9 @@ export default defineComponent({ loadCircuit() + if (mycards_annunci.value) + card.value = mycards_annunci.value[0] + } function getImgCircuit() { @@ -502,6 +512,7 @@ export default defineComponent({ loadSaldo.value = false } + onMounted(mounted) return { @@ -571,6 +582,8 @@ export default defineComponent({ optionsmov, globalStore, saldo_pend, + mycards_annunci, + card, } } }) diff --git a/src/views/user/mycircuit/mycircuit.vue b/src/views/user/mycircuit/mycircuit.vue index f69672a5..ba2a7e21 100755 --- a/src/views/user/mycircuit/mycircuit.vue +++ b/src/views/user/mycircuit/mycircuit.vue @@ -74,7 +74,7 @@ userStore.my.username, circuit.name, true, - groupnameSel ? groupnameSel.groupname : '', + groupnameSel ? groupnameSel.groupname : '' ); " /> @@ -339,7 +339,11 @@ v-if="userStore.IsMyCircuitByName(circuit.name)" :label="t('circuit.movements_made')" @click="showMov = !showMov" - :icon="tools.getSymbolByCircuit(circuit) === 'RIS' ? 'img: images/1ris_rosso_100.png' : undefined" + :icon=" + tools.getSymbolByCircuit(circuit) === 'RIS' + ? 'img: images/1ris_rosso_100.png' + : undefined + " rounded color="primary" > @@ -394,7 +398,8 @@
-
+
+ + -
+
@@ -974,7 +989,9 @@ -
{{ t('circuit.regulation') }} {{ circuit.name }}:
+
+ {{ t('circuit.regulation') }} {{ circuit.name }}: +
@@ -1205,6 +1222,38 @@ : costanti.FIND_PEOPLE " > + +
+ + +
+
{{ card.title }}
+ +
+ +
+
+
+
{ + if (esito) { + tools.showPositiveNotif($q, t('db.recupdated')) + } else { + tools.showNegativeNotif($q, t('db.recfailed')) + } + }) + } return { @@ -270,6 +289,7 @@ export default defineComponent({ mostranota, salvaUserProv, saveDaContattare, + savePerm, } } }) diff --git a/src/views/user/myprofile/myprofile.vue b/src/views/user/myprofile/myprofile.vue index b5127a9f..7234c043 100755 --- a/src/views/user/myprofile/myprofile.vue +++ b/src/views/user/myprofile/myprofile.vue @@ -126,7 +126,7 @@ " class="col-12 text-h8 q-mt-sm" > - Note del Facilitatore:
+ Note:
{{ userStore.userprofile.profile.note }}
@@ -224,6 +224,7 @@
Da Contattare
+
+ + Facilitatore RISO + +
- + 1
@@ -663,7 +678,10 @@ - +
+