diff --git a/.env.development b/.env.development index a70f66fd..406fec36 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.6" +APP_VERSION="0.5.8" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index 1484f36e..23b5da26 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.6" +APP_VERSION="0.5.8" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/insiemesipuo.app/.env.development b/_ALL_SITES/insiemesipuo.app/.env.development index 4b67e68e..139be229 100755 --- a/_ALL_SITES/insiemesipuo.app/.env.development +++ b/_ALL_SITES/insiemesipuo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.6" +APP_VERSION="0.5.8" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/popolodelnuovomondo.app/.env.development b/_ALL_SITES/popolodelnuovomondo.app/.env.development index 6640ed75..e3a87b54 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/.env.development +++ b/_ALL_SITES/popolodelnuovomondo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.6" +APP_VERSION="0.5.8" SERVICE_WORKER_FILE="service-worker.js" APP_ID="12" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index 24723fb6..1e2d2424 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.6" +APP_VERSION="0.5.8" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.test b/_ALL_SITES/riso.app/.env.test index 7de8f829..e3ccdbd3 100755 --- a/_ALL_SITES/riso.app/.env.test +++ b/_ALL_SITES/riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="0.5.6" +APP_VERSION="0.5.8" 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 dfe7cf0d..1b7f2395 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.6" +APP_VERSION="0.5.8" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/terradellavisione.app/.env.test b/_ALL_SITES/terradellavisione.app/.env.test index dd872d27..3cdc42fa 100755 --- a/_ALL_SITES/terradellavisione.app/.env.test +++ b/_ALL_SITES/terradellavisione.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="0.5.6" +APP_VERSION="0.5.8" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL=newfreeplanet diff --git a/query_gruppi.js b/query_gruppi.js index f4eb1c15..99417239 100644 --- a/query_gruppi.js +++ b/query_gruppi.js @@ -111,7 +111,7 @@ db.getCollection('movements').aggregate( "amount": 1, "causal": 1, "userfrom.username": 1, - "userfrom.profile.img": 1 + "userfrom.profile.img": 1, "userto.username": 1, "userto.profile.img": 1 } diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index 2f09b1f6..745e1980 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -21,6 +21,7 @@ export const shared_consts = { QUERYTYPE_CIRCUIT: 10, QUERYTYPE_REFUSED_USER_CIRCUIT: 12, QUERYTYPE_LIST_MOVEMENTS: 15, + QUERYTYPE_LIST_ALLMOVEMENTS: 16, FILTER_EXTRALIST_NOT_REGISTERED: 1, FILTER_EXTRALIST_NOT_CONTACTED: 2, diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index 1bb6b3a3..eed18584 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -326,6 +326,21 @@ export default defineComponent({ refresh() } }) + watch(() => props.prop_mycolumns, (to: any, from: any) => { + // console.log('watch searchlist', to) + if (mycolumns.value !== props.prop_mycolumns) { + mycolumns.value = props.prop_mycolumns + refresh() + } + }) + + watch(() => props.prop_mycolumns, (to: any, from: any) => { + // console.log('watch searchlist', to) + if (myvertical.value != props.vertical) { + myvertical.value = props.vertical + refresh() + } + }) watch(() => showfilter.value, (newval: any, from: any) => { tools.setCookie('s_adv', newval ? '1' : '0') @@ -339,6 +354,13 @@ export default defineComponent({ } }) + watch(() => props.extraparams, (to: any, from: any) => { + // console.log('filtercustom', to) + if (to != from) { + refresh() + } + }) + $router.beforeResolve((to: any) => { // console.log('beforeResolve', visupagedialog.value, 'to', to) @@ -963,7 +985,7 @@ export default defineComponent({ serverData.value = [] numRecLoaded.value = 0 - + pagination.value.page = 0 search.value = search.value.trim() // console.log('refresh') diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index 988796c1..cdddc0a8 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -197,9 +197,18 @@
{{ pagination.rowsNumber }} elemento trovato
{{ pagination.rowsNumber }} elementi trovati
+ +
+ + + +
- - - {{ pagination.rowsNumber }} elemento trovato
{{ pagination.rowsNumber }} elementi trovati
-
+