diff --git a/.env.development b/.env.development index 83d1928b..cca63202 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.75" +APP_VERSION="0.5.79" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index 3139730a..f1046f6a 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.75" +APP_VERSION="0.5.79" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.risosrv b/.env.test.risosrv index a3e2a8fe..666392cc 100755 --- a/.env.test.risosrv +++ b/.env.test.risosrv @@ -1,4 +1,4 @@ -APP_VERSION="0.5.75" +APP_VERSION="0.5.79" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index 83d1928b..cca63202 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.75" +APP_VERSION="0.5.79" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.production b/_ALL_SITES/riso.app/.env.production index 01572ca1..e4ac5999 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.75" +APP_VERSION="0.5.79" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/terradellavisione.app/.env.development b/_ALL_SITES/terradellavisione.app/.env.development index 9a5db40e..cdd31a47 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.75" +APP_VERSION="0.5.79" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL="newfreeplanet" diff --git a/package.json b/package.json index 4f9948a4..b3f7ec19 100755 --- a/package.json +++ b/package.json @@ -123,7 +123,17 @@ "crypto": false }, "browserslist": [ - "defaults" + "last 20 Chrome versions", + "last 20 Firefox versions", + "last 10 Edge versions", + "last 15 Safari versions", + "last 60 Android versions", + "last 180 ChromeAndroid versions", + "last 40 FirefoxAndroid versions", + "last 20 iOS versions", + "last 10 Opera versions", + "> 0.1%", + "not dead" ], "engines": { "node": ">= 16.14.0", diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index 0ad8f85e..624a9d22 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -66,6 +66,8 @@ export const shared_consts = { QUERYTYPE_REFUSED_USER_CIRCUIT: 12, QUERYTYPE_LIST_MOVEMENTS: 15, QUERYTYPE_LIST_ALLMOVEMENTS: 16, + QUERYTYPE_LIST_MOVEMENTS_GROUPNAME: 17, + QUERYTYPE_LIST_MOVEMENTS_CONTOCOM: 18, QUERYTYPE_GROUP_CIRCUIT: 20, QUERYTYPE_REFUSED_GROUP_CIRCUIT: 22, @@ -92,6 +94,7 @@ export const shared_consts = { FILTER_USER_NO_VERIFIED_APORTADOR: 2097152, FILTER_USER_SI_TELEGRAM_ID: 4194304, FILTER_USER_WITHOUT_USERNAME_TELEGRAM: 8388608, + FILTER_USER_PROVINCE: 16777216, OPTIONS_SEARCH_ONLY_FULL_WORDS: 1, OPTIONS_SEARCH_USER_ONLY_FULL_WORDS: 2, @@ -189,6 +192,9 @@ export const shared_consts = { TABLES_VISU_LISTA_USER: ['myskills', 'mybachecas', 'myhosps', 'mygoods', 'users'], + TABLES_ORDER_DATE_UPDATED: ['myskills', 'myhosps', 'mygoods'], + TABLES_ORDER_DESCR: ['mygroups'], + TABLES_VISU_IMG: ['myskills', 'mybachecas', 'myhosps', 'mygoods', 'mygroups'], TABLES_DIRECTORY_A_PARTE: ['mygroups'], TABLES_WITH_ADMINS: ['mygroups', 'circuits'], diff --git a/src/components/CFinder/CFinder.ts b/src/components/CFinder/CFinder.ts index 3b1adc0f..b6d6fd14 100755 --- a/src/components/CFinder/CFinder.ts +++ b/src/components/CFinder/CFinder.ts @@ -148,6 +148,10 @@ export default defineComponent({ return { sortBy: 'numMembers', descending: true, page: 1, rowsNumber: 20, rowsPerPage: 20 } else if (props.table === toolsext.TABUSER) return userStore.getMypaginationMembers() + else if (shared_consts.TABLES_ORDER_DATE_UPDATED.includes(props.table)) + return { sortBy: 'date_created', descending: true, page: 1, rowsNumber: 0, rowsPerPage: 10 } // date_updated + else if (shared_consts.TABLES_ORDER_DESCR.includes(props.table)) + return { sortBy: 'desc', descending: false, page: 1, rowsNumber: 0, rowsPerPage: 10 } return { sortBy: 'date_created', descending: true, page: 1, rowsNumber: 20, rowsPerPage: 20 } }) diff --git a/src/components/CFinder/CFinder.vue b/src/components/CFinder/CFinder.vue index 06c2b56a..a1dd163b 100755 --- a/src/components/CFinder/CFinder.vue +++ b/src/components/CFinder/CFinder.vue @@ -49,7 +49,7 @@ :nodataLabel="noMsgRecord" :prop_search="true" :finder="true" - labelElemFind="circuiti trovati" + labelElemFind="trovati" :choose_visutype="visuType" :butt_modif_new="true && !noButtAdd" noresultLabel="Il filtro selezionato non ha trovato nessun risultato" diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index 23c6711b..d63869c8 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -364,6 +364,7 @@ export default defineComponent({ const myvertical = ref(props.vertical) const ordinam = ref('') + const ordinam_desc = ref(false) const valoriopt = computed(() => (item: any, addall: boolean, addnone: boolean) => { @@ -429,8 +430,8 @@ export default defineComponent({ watch(() => ordinam.value, (to: any, from: any) => { if (pagination.value.sortBy !== ordinam.value) { tools.setCookie('s_ordinam_' + props.prop_mytable, ordinam.value) - pagination.value.sortBy = ordinam.value - refresh() + // pagination.value.sortBy = getObjSort(ordinam.value, ordinam_desc.value) + // refresh() } }) @@ -616,25 +617,33 @@ export default defineComponent({ return precorder ? precorder : 1; } - // emulate ajax call - // SELECT * FROM ... WHERE...LIMIT... - async function fetchFromServer(startRow: any, endRow: any, param_myfilter: any, param_myfilterand: any, sortBy: any, descending: any) { - // console.log('fetchFromServer') + function getObjSort(sortBy: any, descending: any) { let myobj: any = {} if (sortBy) { - let arrsort = sortBy.split(','); - let arrdescending = (descending && descending.length > 0) ? descending.split(',') : []; - if (arrsort) { + sortBy = sortBy + '' + descending = descending + '' + let arrsort = (sortBy && sortBy.indexOf(',') > 0) ? sortBy.split(',') : []; + let arrdescending = (descending && descending.lenght > 1 && descending.indexOf(',') > 0) ? descending.split(',') : []; + if (arrsort.length > 0) { for (let i = 0; i < arrsort.length; i++) { let field = arrsort[i].trim() - myobj[field] = (tools.isArray(arrdescending) && (arrdescending.length > [i])) ? parseInt(arrdescending[i].trim()) : 1; - myobj[field] = getOrderByField(field, myobj[field]) + let risdesc = (tools.isArray(arrdescending) && (arrdescending.length > i)) ? parseInt(arrdescending[i].trim()) : 1; + myobj[field] = getOrderByField(field, risdesc) } } else { myobj[sortBy] = getOrderByField(sortBy, descending ? -1 : 1) } } + console.log('myobj', myobj) + return myobj + } + + // emulate ajax call + // SELECT * FROM ... WHERE...LIMIT... + async function fetchFromServer(startRow: any, endRow: any, param_myfilter: any, param_myfilterand: any, sortBy: any, descending: any) { + // console.log('fetchFromServer') + let myobj = getObjSort(sortBy, descending) // console.log('sortBy', sortBy) const filtersearch: any[] = [] @@ -982,11 +991,12 @@ export default defineComponent({ // don't forfunction to update local pagination object pagination.value.page = page pagination.value.rowsPerPage = rowsPerPage - pagination.value.sortBy = sortBy + pagination.value.sortBy = getObjSort(sortBy, descending) ordinam.value = sortBy + ordinam_desc.value = descending pagination.value.descending = descending - console.log('pagination', pagination) + // console.log('pagination', pagination) // ...and turn of loading indicator loading.value = false @@ -1001,8 +1011,10 @@ export default defineComponent({ const myfilternow = myfilter.value const myfilterandnow = myfilterand.value - if (ordinam.value) + if (ordinam.value) { sortBy = ordinam.value + descending = ordinam_desc.value + } savefilter() @@ -1054,8 +1066,9 @@ export default defineComponent({ // don't forfunction to update local pagination object pagination.value.page = page pagination.value.rowsPerPage = rowsPerPage - pagination.value.sortBy = sortBy + pagination.value.sortBy = getObjSort(sortBy, descending) ordinam.value = sortBy + ordinam_desc.value = descending pagination.value.descending = descending // console.log('pagination', pagination) @@ -1436,7 +1449,6 @@ export default defineComponent({ tablesel.value = tools.getCookie('tablesel', tablesel.value) } - myfilterand.value = props.filterdef // myfiltercustom.value = props.filtercustom // console.log('tablesel', tablesel) @@ -1448,7 +1460,16 @@ export default defineComponent({ tablesel.value = mytable.value } - ordinam.value = tools.getCookie('s_ordinam_' + tablesel.value, null) + if (!shared_consts.TABLES_ORDER_DATE_UPDATED.includes(tablesel.value) && + !shared_consts.TABLES_ORDER_DESCR.includes(tablesel.value)) { + console.log('get cookie)') + let v1 = tools.getCookie('s_ordinam_' + tablesel.value, null) + if (v1) + ordinam.value = v1 + let v2 = tools.getCookie('s_ordinam_des_' + tablesel.value, null) + if (v2) + ordinam_desc.value = v2 + } // console.log('2) tablesel', tablesel.value) @@ -2239,6 +2260,7 @@ export default defineComponent({ userStore, doSort, ordinam, + ordinam_desc, } } }) diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.vue b/src/components/CMyPopupEdit/CMyPopupEdit.vue index 6c7a5a64..b92f3272 100755 --- a/src/components/CMyPopupEdit/CMyPopupEdit.vue +++ b/src/components/CMyPopupEdit/CMyPopupEdit.vue @@ -86,7 +86,7 @@ col.extrafield && (col.tipovisu !== costanti.TipoVisu.LINK || (col.tipovisu === costanti.TipoVisu.LINK && - userStore.getImgByProfile(row, true, col))) + myvalue)) " > {{ $t(col.extrafield) }} @@ -115,8 +115,7 @@ !col.extrafield || (col.extrafield && (col.tipovisu !== costanti.TipoVisu.LINK || - (col.tipovisu === costanti.TipoVisu.LINK && - userStore.getImgByProfile(row, true, col)))) + (col.tipovisu === costanti.TipoVisu.LINK && myvalue))) " class="q-ma-xs chip_shadow" > diff --git a/src/components/CMyProfileTutorial/CMyProfileTutorial.ts b/src/components/CMyProfileTutorial/CMyProfileTutorial.ts index ecb1bcba..27e72c39 100755 --- a/src/components/CMyProfileTutorial/CMyProfileTutorial.ts +++ b/src/components/CMyProfileTutorial/CMyProfileTutorial.ts @@ -21,6 +21,7 @@ import { useRoute, useRouter } from 'vue-router' import { useCircuitStore } from '@store/CircuitStore' const STEP_NAME_SURNAME = 2 +const STEP_FOTO = 5 export default defineComponent({ name: 'CMyProfileTutorial', @@ -103,6 +104,15 @@ export default defineComponent({ userStore.savenoNameSurname(true) } } + if (step.value === STEP_FOTO + 1) { + let index = step.value + if (userStore.my.profile.img) { + // foto esistente + userStore.savenoFoto(false) + } else { + userStore.savenoFoto(true) + } + } }) @@ -224,6 +234,8 @@ export default defineComponent({ if (contact.value) filtroutente.value = [{ userId: contact.value._id }] + userStore.my.profile.stepTutorial = getFirstStepToFill() + step.value = userStore.my.profile.stepTutorial ? userStore.my.profile.stepTutorial : 1 if (step.value > numstep.value) step.value = numstep.value @@ -234,7 +246,6 @@ export default defineComponent({ userStore.my.profile.stepTutorial = 1 } - userStore.my.profile.stepTutorial = getFirstStepToFill() } diff --git a/src/components/CMyProfileTutorial/CMyProfileTutorial.vue b/src/components/CMyProfileTutorial/CMyProfileTutorial.vue index 2a66952e..87532cc8 100755 --- a/src/components/CMyProfileTutorial/CMyProfileTutorial.vue +++ b/src/components/CMyProfileTutorial/CMyProfileTutorial.vue @@ -13,7 +13,6 @@ clcolor="text-white" myclass="myshad" :canopen="!completed()" - :header="step < numstep" > @@ -192,7 +191,7 @@ dense size="md" :label="$t('dialog.vai')" - @click="step = getFirstStepToFill()" + @click="step = 1" > diff --git a/src/components/CMyRecCard/CMyRecCard.scss b/src/components/CMyRecCard/CMyRecCard.scss index 8c313dec..ad8b1b95 100755 --- a/src/components/CMyRecCard/CMyRecCard.scss +++ b/src/components/CMyRecCard/CMyRecCard.scss @@ -27,4 +27,7 @@ .text_title{ color: blue; + @media (prefers-color-scheme: dark) { + color: white; + } } diff --git a/src/components/CMyRecGrpCard/CMyRecGrpCard.scss b/src/components/CMyRecGrpCard/CMyRecGrpCard.scss index 8c313dec..5663cf27 100755 --- a/src/components/CMyRecGrpCard/CMyRecGrpCard.scss +++ b/src/components/CMyRecGrpCard/CMyRecGrpCard.scss @@ -28,3 +28,6 @@ .text_title{ color: blue; } +.text_title_dark{ + color: white; +} diff --git a/src/components/CMyRecGrpCard/CMyRecGrpCard.vue b/src/components/CMyRecGrpCard/CMyRecGrpCard.vue index de8cbb08..77b8c206 100755 --- a/src/components/CMyRecGrpCard/CMyRecGrpCard.vue +++ b/src/components/CMyRecGrpCard/CMyRecGrpCard.vue @@ -26,7 +26,7 @@ - + {{ myrec.title }} {{ myrec.descr }} diff --git a/src/components/CSaldo/CSaldo.ts b/src/components/CSaldo/CSaldo.ts index 578265b1..0f1c3e5d 100755 --- a/src/components/CSaldo/CSaldo.ts +++ b/src/components/CSaldo/CSaldo.ts @@ -54,6 +54,7 @@ export default defineComponent({ const color_border = ref('red') const showingtooltip = ref(false) + const visuTransac = ref(false) function created() { // created @@ -68,6 +69,7 @@ export default defineComponent({ colTableNotifCoins, tools, color_border, + visuTransac, } }, }) diff --git a/src/components/CSaldo/CSaldo.vue b/src/components/CSaldo/CSaldo.vue index ec665c77..65022e2a 100755 --- a/src/components/CSaldo/CSaldo.vue +++ b/src/components/CSaldo/CSaldo.vue @@ -9,54 +9,106 @@ :label="t('account.saldo')" :paramTypeAccount="paramTypeAccount" :myrecparam="account" - > + > - + > + + - - - {{ t('movement.pendingtransaction') }} - - - - - - - - {{ index + 1 }}° - - - + + + + + {{ $t('movement.pendingtransaction') }} + + + + + + + + {{ t('movement.pendingtransaction') }} - - - - + + + + + {{ index + 1 }}° + + + + + + + + + +