surya/myprojplanet_vite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- nella lista circuiti ora si vedono tutti gli annunci del circuito stesso

Browse Source
This commit is contained in:
Surya Paolo
2025-01-15 15:39:58 +01:00
parent e2dbe08139
commit 7160eee734
20 changed files with 323 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/shared_vuejs.ts
View File

@@ -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)

3
src/components/CFindUsers/CFindUsers.ts
View File

@@ -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,
}
},

94
src/components/CFinder/CFinder.ts
View File

@@ -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: '',

40
src/components/CGridOriz/CGridOriz.ts
View File

@@ -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',

12
src/components/CGridTableRec/CGridTableRec.ts
View File

@@ -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: } } });
}
})

8
src/components/CGridTableRec/CGridTableRec.vue
View File

@@ -112,7 +112,10 @@
></q-btn>
</div>
<div v-if="!(item.filteradv && !showfilteradv)">
<div
v-if="!(item.filteradv && !showfilteradv)"
v-show="item.visible"
>
<CMySelect
:col="fieldsTable.getColByColumns(mycolumns, item.key)"
v-if="
@@ -777,6 +780,7 @@
item.type === costanti.FieldType.select ||
item.type === costanti.FieldType.select_by_server
"
v-show="item.visible"
:label="labelcombo(item)"
v-model:value="item.value"
@update:value="searchval(item.value, item.table)"
@@ -810,6 +814,7 @@
<CMySelect
v-if="item.type === costanti.FieldType.multiselect_by_server"
v-show="item.visible"
:col="fieldsTable.getColByColumns(mycolumns, item.key)"
:multiselect_by_server="true"
:label="labelcombo(item)"
@@ -836,6 +841,7 @@
<q-select
:behavior="$q.platform.is.ios === true ? 'dialog' : 'menu'"
v-if="item.type === costanti.FieldType.multiselect"
v-show="item.visible"
v-model="item.arrvalue"
label-color="primary"
:label="labelcombo(item)"

4
src/components/CMyActivities/CMyActivities.ts
View File

@@ -41,7 +41,7 @@ export default defineComponent({
CTimeAgo, CContactUser
},
props: {
username: {
username_prop: {
type: String,
required: true,
default : '',
@@ -169,7 +169,7 @@ export default defineComponent({
})
function mounted() {
username.value = props.username || userStore.my.username
username.value = props.username_prop || userStore.my.username
loadProfile()
}

1
src/components/CMyUser/CMyUser.vue
View File

@@ -41,6 +41,7 @@
<em>{{ contact.profile.qualifica }}</em>
<span v-if="tools.isFacil() && contact.profile.note"><span v-if="contact.profile.qualifica"><br></span><em style="color: blue;">Note: {{ contact.profile.note }}</em></span>
<span v-if="tools.isFacil() && contact.profile.da_contattare"><br><em style="color: red;">Da Contattare</em></span>
<span v-if="tools.isBitActive(contact.perm, shared_consts.Permissions.Facilitatore.value)"><br><em style="color: blue;">⭐️ Facilitatore RISO</em></span>
</q-item-label
>
<q-item-label caption lines="1"></q-item-label>

5
src/css/app.scss
View File

@@ -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;
}

1
src/model/GlobalStore.ts
View File

@@ -1026,6 +1026,7 @@ export interface ISearchList {
icon?: string
filteradv?: boolean
filter_extra?: object
visible: boolean
}
export interface IFilter {

1
src/rootgen/admin/userPanel/userPanel.vue
View File

@@ -171,6 +171,7 @@
<CKeyAndValue mykey="Biografia:" :myvalue="myuser.profile.biografia"></CKeyAndValue>
<CKeyAndValue mykey="Note:" :myvalue="myuser.profile.note"></CKeyAndValue>
<CKeyAndValue mykey="Da Contattare:" :myvalue="myuser.profile.da_contattare"></CKeyAndValue>
<CKeyAndValue mykey="Facilitatore:" :myvalue="tools.isBitActive(myuser.perm, shared_consts.Permissions.Facilitatore.value)"></CKeyAndValue>
<CKeyAndValue mykey="qualifica:" :myvalue="myuser.profile.qualifica"></CKeyAndValue>
</div>

2
src/statics/lang/it.js
View File

@@ -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',

4
src/store/Modules/costanti.ts
View File

@@ -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',

18
src/store/Modules/tools.ts
View File

@@ -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);

1
src/views/ecommerce/catalogo/catalogo.ts
View File

@@ -656,6 +656,7 @@ export default defineComponent({
searchList.value = [
{
visible: true,
label: 'Ricerca',
table: 'products',
key: 'titolo',

15
src/views/user/mycircuit/mycircuit.ts
View File

@@ -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(<any>{})
const circuit = ref({} as ICircuit | null)
const account = ref(<IAccount | null>null)
const mystatus = ref(0 as number)
@@ -100,6 +103,10 @@ export default defineComponent({
const fidoConcesso = ref(<any>0)
const qtaMax = ref(<any>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,
}
}
})

65
src/views/user/mycircuit/mycircuit.vue
View File

@@ -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"
></q-btn>
@@ -394,7 +398,8 @@
<br />
</q-banner>
<q-banner
v-if="false &&
v-if="
false &&
userStore.my.profile &&
userStore.my.profile.calc &&
!circuit.circuitoIndipendente &&
@@ -420,8 +425,8 @@
globalStore.site.confpages.showRIS &&
!circuit.circuitoIndipendente &&
userStore.my.profile.calc &&
userStore.my.profile.calc.numGoodsAndServices <= 0
&& false
userStore.my.profile.calc.numGoodsAndServices <= 0 &&
false
"
rounded
class="bg-deep-purple text-white"
@@ -442,8 +447,9 @@
<br />
</q-banner>
<div class="centermydiv q-mt-md">
<div class="centermydiv">
<q-btn
class="q-mt-md"
v-if="
!userStore.IsMyCircuitByName(circuit.name) &&
!userStore.IsAskedCircuitByName(circuit.name) &&
@@ -511,6 +517,11 @@
name="gruppicollettivi"
icon="fas fa-users"
></q-tab>
<q-tab
:label="t('profile.annunci')"
name="annunci"
icon="fas fa-pencil-alt"
></q-tab>
<q-tab
:label="t('circuit.comunitario')"
name="comunitario"
@@ -525,6 +536,7 @@
</q-tabs>
<q-tab-panels v-model="tabcircuit" animated keep-alive>
<q-tab-panel name="annunci" style="max-width: 500px"> </q-tab-panel>
<q-tab-panel
name="gruppicollettivi"
style="max-width: 500px"
@@ -753,7 +765,10 @@
<q-separator />
<q-card-section>
<div v-if="tools.getSymbolByCircuit(circuit) === 'RIS'" class="text-h8 q-mb-sm">
<div
v-if="tools.getSymbolByCircuit(circuit) === 'RIS'"
class="text-h8 q-mb-sm"
>
<div v-html="$t('circuit.aggiuntive')"></div>
</div>
<q-card-section>
@@ -974,7 +989,9 @@
<q-card v-if="circuit.name">
<q-card-section>
<div class="text-h8">{{ t('circuit.regulation') }} {{ circuit.name }}: </div>
<div class="text-h8">
{{ t('circuit.regulation') }} {{ circuit.name }}:
</div>
</q-card-section>
<q-separator />
@@ -1205,6 +1222,38 @@
: costanti.FIND_PEOPLE
"
></CGridTableRec>
<div v-if="tabcircuit === 'annunci'">
<q-select
v-model="card"
map-options
option-label="title"
filled
icon="fas fa-pencil-alt"
label="Tipo di Annuncio"
:options="mycards_annunci"
></q-select>
<q-card class="q-my-md">
<div v-if="card">
<div class="row text-h6 text-bold">{{ card.title }}</div>
<div
v-for="(cardrec, ind) of mycards_annunci"
:key="ind"
:name="cardrec.table"
>
<CFinder
v-show="cardrec.table === card.table"
:ind="tools.getIndMainCardsByTable(cardrec.table)"
:table="cardrec.table"
:filtrocircuito="circuit.name"
:showBarSelection="false"
:noButtAdd="true"
/>
</div>
</div>
</q-card>
</div>
</div>
</div>
<div

8
src/views/user/myfriends/myfriends.ts
View File

@@ -31,19 +31,21 @@ export default defineComponent({
searchList.value = [
{
visible: true,
label: 'Filtra per',
table: shared_consts.TABFILTRI_UTENTE,
key: '',
type: costanti.FieldType.multiselect,
value: 0,
keycookie: '_fu',
keycookie: '_filu',
addall: false,
arrvalue: tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + 'users' + costanti.FILTER_SEP + shared_consts.TABFILTRI_UTENTE + '_fu', []),
arrvalue: tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + 'users' + costanti.FILTER_SEP + shared_consts.TABFILTRI_UTENTE + '_filu', []),
filter: null,
useinput: false,
icon: 'fas fa-filter'
},
{
visible: true,
label: 'Regione',
table: 'regions',
key: 'idReg',
@@ -57,6 +59,7 @@ export default defineComponent({
icon: 'fas fa-globe-europe'
},
{
visible: true,
label: 'Provincia',
table: 'provinces',
key: 'profile.resid_province',
@@ -101,6 +104,7 @@ export default defineComponent({
username: 1,
name: 1,
surname: 1,
perm: 1,
verified_by_aportador: 1,
'profile.handshake': 1,
'profile.img': 1,

20
src/views/user/myprofile/myprofile.ts
View File

@@ -222,6 +222,25 @@ export default defineComponent({
}
})
}
function savePerm() {
const globalStore = useGlobalStore()
const { t } = useI18n()
const mydatatosave = {
id: userStore.userprofile._id,
table: 'users',
fieldsvalue: { 'perm': userStore.userprofile.perm }
}
globalStore.saveFieldValue(mydatatosave).then((esito) => {
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,
}
}
})

68
src/views/user/myprofile/myprofile.vue
View File

@@ -126,7 +126,7 @@
"
class="col-12 text-h8 q-mt-sm"
>
Note del Facilitatore:<br />
Note:<br />
{{ userStore.userprofile.profile.note }}
</div>
</div>
@@ -224,6 +224,7 @@
<div
v-if="
userStore.userprofile &&
userStore.userprofile.profile &&
userStore.userprofile.profile.da_contattare &&
(userStore.isFacilitatore || userStore.isAdmin)
"
@@ -231,6 +232,24 @@
>
<q-icon name="fas fa-comment"></q-icon> Da Contattare
</div>
<div
v-if="
userStore.userprofile &&
tools.isBitActive(
userStore.userprofile.perm,
shared_consts.Permissions.Facilitatore.value
)
"
>
<q-chip
class="glossy"
color="orange"
text-color="white"
icon-right="star"
>
Facilitatore RISO
</q-chip>
</div>
<div
v-if="
userStore.userprofile &&
@@ -240,11 +259,7 @@
class="col-12 text-h8 q-mt-sm"
>
<div v-if="!mostranota" class="text-center">
<q-btn
label="Note del Facilitatore"
@click="mostranota = true"
color="green"
>
<q-btn label="Note" @click="mostranota = true" color="green">
<q-badge color="red" floating>1</q-badge>
</q-btn>
</div>
@@ -663,7 +678,10 @@
<q-tab-panels v-model="tab" animated keep-alive>
<q-tab-panel name="attivita">
<CMyActivities :introUser="false"></CMyActivities>
<CMyActivities
:username_prop="userStore.userprofile.username"
:introUser="false"
></CMyActivities>
</q-tab-panel>
<q-tab-panel name="info">
<div
@@ -824,6 +842,42 @@
saveDaContattare();
"
/>
<q-fab-action
label-position="right"
v-if="userStore.isFacilitatore || userStore.isAdmin"
color="orange"
:icon="
tools.isBitActive(
userStore.userprofile.perm,
shared_consts.Permissions.Facilitatore.value
)
? 'fas fa-user-slash'
: 'fas fa-star'
"
:label="
tools.isBitActive(
userStore.userprofile.perm,
shared_consts.Permissions.Facilitatore.value
)
? $t('profile.togli_facilitatore')
: $t('profile.facilitatore')
"
@click="
!tools.isBitActive(
userStore.userprofile.perm,
shared_consts.Permissions.Facilitatore.value
)
? (userStore.userprofile.perm = tools.SetBit(
userStore.userprofile.perm,
shared_consts.Permissions.Facilitatore.value
))
: (userStore.userprofile.perm = tools.UnSetBit(
userStore.userprofile.perm,
shared_consts.Permissions.Facilitatore.value
));
savePerm();
"
/>
</q-fab>
</q-page-sticky>
<q-dialog v-model="showPic" full-height full-width>