surya/salvato.newfreeplanet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Aggiornamento APP RISO:

Browse Source 
✅ Inviando i RIS, deve comparire prima il Circuito della Provincia, e poi quello Nazionale
✅ Risolto problema per vecchie registrazioni, la provincia compariva "undefined".
This commit is contained in:
Surya Paolo
2024-06-19 00:21:06 +02:00
parent 2d9c178c1f
commit 49d51712bd
155 changed files with 2510 additions and 5296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,6 +68,7 @@ export default defineComponent({
const searchList_MyCircuits = ref(<ISearchList[]>[])
const searchList_Events = ref(<ISearchList[]>[])
const searchList_Hosp = ref(<ISearchList[]>[])
const searchList_Attivita = ref(<ISearchList[]>[])
const search = ref('')
const myrecfiltertoggle = ref(tools.FILTER_ALL)
@@ -101,13 +102,13 @@ export default defineComponent({
function updatefilter(value: any) {
if (value === tools.FILTER_MYREC) {
if (props.table === toolsext.TABMYGROUPS) {
if (props.table === shared_consts.TABLES_MYGROUPS) {
filtercustom.value = [{
'admins': {
$elemMatch: { username: { $eq: userStore.my.username } }
},
}]
} else if (props.table === toolsext.TABCIRCUITS) {
} else if (props.table === shared_consts.TABLES_CIRCUITS) {
filtercustom.value = [{
'admins': {
$elemMatch: { username: { $eq: userStore.my.username } }
@@ -119,7 +120,7 @@ export default defineComponent({
}
} else if (value === tools.FILTER_MYFOLLOW) {
if (props.table === toolsext.TABMYGROUPS) {
if (props.table === shared_consts.TABLES_MYGROUPS) {
}
} else {
@@ -140,13 +141,13 @@ export default defineComponent({
)
const mypagination = computed(() => {
if (props.table === toolsext.TABMYBACHECAS)
if (props.table === shared_consts.TABLES_MYBACHECAS)
return { sortBy: 'dateTimeStart', descending: false, page: 1, rowsNumber: 0, rowsPerPage: 10 }
else if (props.table === toolsext.TABMYGROUPS)
else if (props.table === shared_consts.TABLES_MYGROUPS)
return { sortBy: 'date_created', descending: true, page: 1, rowsNumber: 0, rowsPerPage: 10 }
else if (props.table === toolsext.TABMOVEMENTS)
return { sortBy: 'transactionDate', descending: true, page: 1, rowsNumber: 0, rowsPerPage: 20 }
else if (props.table === toolsext.TABCIRCUITS)
else if (props.table === shared_consts.TABLES_CIRCUITS)
return { sortBy: 'numMembers', descending: true, page: 1, rowsNumber: 0, rowsPerPage: 20 }
else if (props.table === toolsext.TABUSER)
return userStore.getMypaginationMembers()
@@ -159,78 +160,75 @@ export default defineComponent({
})
const searchList = computed(() => {
if (props.table === toolsext.TABMYGOODS)
if (props.table === shared_consts.TABLES_MYGOODS)
return searchList_Beni.value
else if (props.table === toolsext.TABMYSKILLS)
else if (props.table === shared_consts.TABLES_MYSKILLS)
return searchList_Servizi.value
else if (props.table === toolsext.TABMYGROUPS)
else if (props.table === shared_consts.TABLES_MYGROUPS)
return searchList_MyGroups.value
else if (props.table === toolsext.TABCIRCUITS)
else if (props.table === shared_consts.TABLES_CIRCUITS)
return searchList_MyCircuits.value
else if (props.table === toolsext.TABMYBACHECAS)
else if (props.table === shared_consts.TABLES_MYBACHECAS)
return searchList_Events.value
else if (props.table === toolsext.TABMYHOSPS)
else if (props.table === shared_consts.TABLES_MYHOSPS)
return searchList_Hosp.value
else if (props.table === shared_consts.TABLES_ATTIVITAS)
return searchList_Attivita.value
return searchList_Servizi.value
})
const showType = computed(() => {
if (props.table === toolsext.TABMYGOODS)
return costanti.SHOW_MYCARD
else if (props.table === toolsext.TABMYSKILLS)
return costanti.SHOW_MYCARD
else if (props.table === toolsext.TABMYGROUPS)
return costanti.SHOW_MYCARD
else if (props.table === toolsext.TABCIRCUITS)
return costanti.SHOW_MYCARD
return costanti.SHOW_MYCARD
})
const hint = computed(() => {
if (props.table === toolsext.TABMYGOODS)
if (props.table === shared_consts.TABLES_MYGOODS)
return 'digita il nome del Bene o del settore'
else if (props.table === toolsext.TABMYSKILLS)
else if (props.table === shared_consts.TABLES_MYSKILLS)
return 'digita il nome del Servizio o del settore'
else if (props.table === toolsext.TABMYGROUPS)
else if (props.table === shared_consts.TABLES_MYGROUPS)
return 'digita il nome del Gruppo'
else if (props.table === toolsext.TABCIRCUITS)
else if (props.table === shared_consts.TABLES_CIRCUITS)
return 'digita il nome della provincia'
else if (props.table === toolsext.TABMYBACHECAS)
else if (props.table === shared_consts.TABLES_MYBACHECAS)
return 'digita il nome dell\'Evento'
else if (props.table === toolsext.TABMYHOSPS)
else if (props.table === shared_consts.TABLES_MYHOSPS)
return 'digita delle parole da cercare nella descrizione dell\'Ospitalità'
else if (props.table === shared_consts.TABLES_ATTIVITAS)
return 'digita un\'attività da cercare nella descrizione dell\'Ospitalità'
return 'digita una parola da cercare'
})
const visuType = computed(() => {
if (props.table === toolsext.TABMYGOODS)
if (props.table === shared_consts.TABLES_MYGOODS)
return false
else if (props.table === toolsext.TABMYSKILLS)
else if (props.table === shared_consts.TABLES_MYSKILLS)
return false
else if (props.table === toolsext.TABMYGROUPS)
else if (props.table === shared_consts.TABLES_MYGROUPS)
return false
else if (props.table === toolsext.TABMYBACHECAS)
else if (props.table === shared_consts.TABLES_MYBACHECAS)
return false
return false // $q.screen.gt.xs
})
const noMsgRecord = computed(() => {
if (props.table === toolsext.TABMYGOODS)
if (props.table === shared_consts.TABLES_MYGOODS)
return 'Nessun Bene trovato con i filtri selezionati'
else if (props.table === toolsext.TABMYSKILLS)
else if (props.table === shared_consts.TABLES_MYSKILLS)
return 'Nessun Servizio trovato con i filtri selezionati'
else if (props.table === toolsext.TABMYGROUPS)
else if (props.table === shared_consts.TABLES_MYGROUPS)
return 'Nessun Gruppo trovato con i filtri selezionati'
else if (props.table === toolsext.TABCIRCUITS)
else if (props.table === shared_consts.TABLES_CIRCUITS)
return 'Nessun Circuito trovato con i filtri selezionati'
else if (props.table === toolsext.TABMYBACHECAS)
else if (props.table === shared_consts.TABLES_MYBACHECAS)
return 'Nessun Evento trovato con i filtri selezionati'
else if (props.table === toolsext.TABMYHOSPS)
else if (props.table === shared_consts.TABLES_MYHOSPS)
return 'Nessuna Ospitalità trovata con i filtri selezionati'
else if (props.table === shared_consts.TABLES_ATTIVITAS)
return 'Nessuna Attività trovata con i filtri selezionati'
return 'Nessun dato trovato con i filtri selezionati'
})
@@ -251,14 +249,14 @@ export default defineComponent({
col_footer.value = obj.col_footer
col_tabfooter.value = obj.col_tabfooter
if (props.table === toolsext.TABMYGROUPS) {
if (props.table === shared_consts.TABLES_MYGROUPS) {
myoptions.value = [
{ label: '🌎 Tutti', value: tools.FILTER_ALL },
{ label: '👤 Gruppi che Gestisci', value: tools.FILTER_MYREC },
// {label: 'Seguo', value: tools.FILTER_MYFOLLOW},
]
} else if (props.table === toolsext.TABCIRCUITS) {
} else if (props.table === shared_consts.TABLES_CIRCUITS) {
myoptions.value = [
{ label: '🌎 Tutti', value: tools.FILTER_ALL },
{ label: '👤 Circuiti che Gestisci', value: tools.FILTER_MYREC },
@@ -913,6 +911,47 @@ export default defineComponent({
},
]
searchList_Attivita.value = [
{
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),
addall: true,
arrvalue: [],
filter: null,
useinput: false,
icon: 'fas fa-globe-europe'
},
{
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),
addall: true,
arrvalue: [],
filter: getFilterProvinceByRegion,
useinput: true,
icon: 'flag',
},
{
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),
addall: true,
arrvalue: [],
useinput: true,
filter: null,
// filter: getFilterCitiesByProvince,
// param1: shared_consts.PARAM_SHOW_PROVINCE,
tablesel: 'cities',
},
]
searchList_MyGroups.value = [
{
label: 'Regione',