From f8b9209770831cb86f536d8b17f8011ada52f2b8 Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Wed, 30 Nov 2022 21:26:17 +0100 Subject: [PATCH] =?UTF-8?q?fixed:=20La=20modalit=C3=A0=20Tabella=20non=20f?= =?UTF-8?q?unziona=20pi=C3=B9=20!=20(non=20si=20vede=20la=20lista=20dei=20?= =?UTF-8?q?movimenti)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.example.production | 2 +- _ALL_SITES/riso.app/.env.development | 2 +- _ALL_SITES/riso.app/.env.production | 2 +- _ALL_SITES/riso.app/.env.test | 2 +- .../terradellavisione.app/.env.development | 2 +- package.json | 16 ++++++++-------- src/components/CGridTableRec/CGridTableRec.ts | 10 ++++++++++ src/components/CShareWithUs/CShareWithUs.ts | 1 + src/model/GlobalStore.ts | 2 ++ src/rootgen/admin/importdata/importdata.ts | 2 ++ src/store/globalStore.ts | 1 + src/views/user/mycircuit/mycircuit.ts | 6 ++++++ src/views/user/mycircuit/mycircuit.vue | 8 ++++++-- 14 files changed, 42 insertions(+), 16 deletions(-) diff --git a/.env.development b/.env.development index c3a222af..5197c629 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.28" +APP_VERSION="0.5.29" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index 6236468f..efd78cfc 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.28" +APP_VERSION="0.5.29" 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 c3a222af..5197c629 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.28" +APP_VERSION="0.5.29" 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 12cf5900..eff08700 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.28" +APP_VERSION="0.5.29" 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 39998fb2..1f27c72b 100755 --- a/_ALL_SITES/riso.app/.env.test +++ b/_ALL_SITES/riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="0.5.28" +APP_VERSION="0.5.29" SERVICE_WORKER_FILE="service-worker.js" APP_ID="16" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/terradellavisione.app/.env.development b/_ALL_SITES/terradellavisione.app/.env.development index 1a8494ae..1baf18f9 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.28" +APP_VERSION="0.5.29" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL="newfreeplanet" diff --git a/package.json b/package.json index 21434ca1..3578c711 100755 --- a/package.json +++ b/package.json @@ -121,15 +121,15 @@ "crypto": false }, "browserslist": [ - "last 16 Chrome versions", - "last 16 Firefox versions", + "last 30 Chrome versions", + "last 30 Firefox versions", "last 4 Edge versions", - "last 13 Safari versions", - "last 16 Android versions", - "last 16 ChromeAndroid versions", - "last 16 FirefoxAndroid versions", - "last 12 iOS versions", - "last 7 Opera versions" + "last 30 Safari versions", + "last 30 Android versions", + "last 30 ChromeAndroid versions", + "last 30 FirefoxAndroid versions", + "last 18 iOS versions", + "last 11 Opera versions" ], "engines": { "node": ">= 16.14.0", diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index 3e42d24c..4ea28e56 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -175,6 +175,13 @@ export default defineComponent({ return [] } }, + filterextra2: { + type: Array, + required: false, + default: () => { + return [] + } + }, extraparams: { required: false, default: {}, @@ -757,6 +764,7 @@ export default defineComponent({ let params: IParamsQuery = { table: mytable.value, + newvers: true, startRow, endRow, filter: param_myfilter, @@ -772,6 +780,8 @@ export default defineComponent({ // @ts-ignore filterextra: props.filterextra, // @ts-ignore + filterextra2: props.filterextra2, + // @ts-ignore filter_gte, sortBy: myobj, descending, diff --git a/src/components/CShareWithUs/CShareWithUs.ts b/src/components/CShareWithUs/CShareWithUs.ts index a17a39ee..1b78b8ed 100755 --- a/src/components/CShareWithUs/CShareWithUs.ts +++ b/src/components/CShareWithUs/CShareWithUs.ts @@ -71,6 +71,7 @@ export default defineComponent({ filter_gte: '', sortBy: myobj, descending, + newvers: true, userId: userStore.my._id } diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts index c5a20df5..7d1a7a18 100755 --- a/src/model/GlobalStore.ts +++ b/src/model/GlobalStore.ts @@ -639,6 +639,7 @@ export interface IParamsPickup { filter: string } export interface IParamsQuery { + newvers: boolean table: string startRow: number endRow: number @@ -652,6 +653,7 @@ export interface IParamsQuery { filtersearch2: string filtercustom: string filterextra?: string + filterextra2?: string filter_gte: string lookup1?: IParLookup lookup2?: IParLookup diff --git a/src/rootgen/admin/importdata/importdata.ts b/src/rootgen/admin/importdata/importdata.ts index 9324884d..e51286d6 100755 --- a/src/rootgen/admin/importdata/importdata.ts +++ b/src/rootgen/admin/importdata/importdata.ts @@ -85,6 +85,7 @@ export default defineComponent({ myobj[sortBy] = 1 const params: IParamsQuery = { + newvers: true, table: '', startRow: 0, endRow: 10000, @@ -94,6 +95,7 @@ export default defineComponent({ filtersearch2: '', filtercustom: '', filterextra: '', + filterextra2: '', filter_gte: '', sortBy: myobj, descending, diff --git a/src/store/globalStore.ts b/src/store/globalStore.ts index a8baee19..52aea75e 100644 --- a/src/store/globalStore.ts +++ b/src/store/globalStore.ts @@ -961,6 +961,7 @@ export const useGlobalStore = defineStore('GlobalStore', { myobj[sortBy] = 1 const params: IParamsQuery = { + newvers: true, table: '', startRow: 0, endRow: 10000, diff --git a/src/views/user/mycircuit/mycircuit.ts b/src/views/user/mycircuit/mycircuit.ts index d8273f7e..718fc2c6 100755 --- a/src/views/user/mycircuit/mycircuit.ts +++ b/src/views/user/mycircuit/mycircuit.ts @@ -70,6 +70,7 @@ export default defineComponent({ const arrfilterand: any = ref([]) const filterextra: any = ref([]) + const filterextra2: any = ref([]) const filtercustom: any = ref([]) const filtercustom_rich: any = ref([]) const searchList = ref([] as ISearchList[]) @@ -106,6 +107,10 @@ export default defineComponent({ searchList.value = [] if (circuit.value) { + let addquerysingle = [ + + ]; + filterextra.value = [ /*{ 'profile.mycircuits': @@ -299,6 +304,7 @@ export default defineComponent({ animation, arrfilterand, filterextra, + filterextra2, filtercustom, filtercustom_rich, searchList, diff --git a/src/views/user/mycircuit/mycircuit.vue b/src/views/user/mycircuit/mycircuit.vue index 877a350f..1491076a 100755 --- a/src/views/user/mycircuit/mycircuit.vue +++ b/src/views/user/mycircuit/mycircuit.vue @@ -123,7 +123,7 @@ nodataLabel="Nessun Movimento effettuato" :prop_search="true" :enableExport="true" - hint="nota da trovare" + hint="nota da trovare (tabella)" :finder="false" :choose_visutype="false" :finder_noNull="false" @@ -132,7 +132,8 @@ noresultLabel="movimenti non trovati con questa ricerca" :arrfilters="arrfilterand" :filtercustom="filtercustom_rich" - :filterextra="filterextra" + filterextra="" + :filterextra2="filterextra2" :prop_searchList="searchList" :prop_pagination="{ sortBy: 'transactionDate', descending: true, page: 1, rowsNumber: 20, rowsPerPage: 20 }" :showType="costanti.SHOW_MOVEMENTS" @@ -375,6 +376,7 @@ :arrfilters="arrfilterand" :filtercustom="filtercustom" :filterextra="filterextra" + :filterextra2="filterextra2" :prop_searchList="searchList" :showType="costanti.SHOW_USERINFO" :showCol="false" @@ -406,6 +408,7 @@ noresultLabel="Username non trovato" :arrfilters="arrfilterand" :filterextra="filterextra" + :filterextra2="filterextra2" :filtercustom="filtercustom_rich" :prop_searchList="searchList" :showType="costanti.SHOW_USERINFO" @@ -439,6 +442,7 @@ :arrfilters="arrfilterand" :filtercustom="filtercustom_rich" :filterextra="filterextra" + :filterextra2="filterextra2" :prop_searchList="searchList" :showType="costanti.SHOW_USERINFO" keyMain=""