From c28c6c4d8b8a1351f146ce24ee4e4b0e83aa3e9c Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Thu, 23 Mar 2023 00:09:59 +0100 Subject: [PATCH] - Cerca Amici persone: filtro per Regione o Provincia --- .env.development | 2 +- .env.example.production | 2 +- .env.test.risosrv | 2 +- _ALL_SITES/riso.app/.env.development | 2 +- _ALL_SITES/riso.app/.env.production | 2 +- .../terradellavisione.app/.env.development | 2 +- src/components/CGridTableRec/CGridTableRec.ts | 29 ++++++++++++++++++- .../CGridTableRec/CGridTableRec.vue | 10 ++++--- src/components/CMyUser/CMyUser.vue | 6 ++-- src/views/user/myfriends/myfriends.ts | 1 + src/views/user/myfriends/myfriends.vue | 6 ++-- 11 files changed, 48 insertions(+), 16 deletions(-) diff --git a/.env.development b/.env.development index 4928b157..889a30bc 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.81" +APP_VERSION="0.5.82" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index e9184d30..75185c5d 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.81" +APP_VERSION="0.5.82" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.risosrv b/.env.test.risosrv index 8b1baf49..c2e5c0fb 100755 --- a/.env.test.risosrv +++ b/.env.test.risosrv @@ -1,4 +1,4 @@ -APP_VERSION="0.5.81" +APP_VERSION="0.5.82" 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 4928b157..889a30bc 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.81" +APP_VERSION="0.5.82" 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 cc30ee89..5791bc28 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.81" +APP_VERSION="0.5.82" 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 9fef69cb..5d3a8ca9 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.81" +APP_VERSION="0.5.82" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL="newfreeplanet" diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index 7605f183..45e6ef60 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -62,6 +62,11 @@ export default defineComponent({ required: false, default: '', }, + prop_showfilter: { + type: Boolean, + required: false, + default: false, + }, hint: { type: String, required: false, @@ -102,6 +107,11 @@ export default defineComponent({ required: false, default: false, }, + finder_noNullFilters: { + type: Boolean, + required: false, + default: false, + }, vertical: { type: Number, required: false, @@ -640,6 +650,22 @@ export default defineComponent({ return myobj } + function getNumFilterSelected(): number { + let numfilter = 0 + + + for (const item of searchList.value) { + if (!item.notinsearch) { + if (item.value && item.value !== -100) { + console.log(item.label, item.value) + numfilter++ + } + } + } + + return numfilter + } + // emulate ajax call // SELECT * FROM ... WHERE...LIMIT... async function fetchFromServer(startRow: any, endRow: any, param_myfilter: any, param_myfilterand: any, sortBy: any, descending: any) { @@ -883,7 +909,7 @@ export default defineComponent({ }*/ } // if ((false && nosearch && props.finder) || (props.finder_noNull && nosearch)) { - if (props.finder_noNull && nosearch) { + if ((props.finder_noNull || (props.finder_noNullFilters && filtersearch3and.values.length === 0)) && nosearch) { returnedData.value = [] returnedCount = 0 return true @@ -2278,6 +2304,7 @@ export default defineComponent({ doSort, ordinam, ordinam_desc, + getNumFilterSelected, } } }) diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index 33f579bd..885949dc 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -78,7 +78,7 @@ --> -
+
+ > {{ getNumFilterSelected() }} + +
- {{ pagination.rowsNumber }} {{labelElemFind}} + {{ pagination.rowsNumber }} {{ labelElemFind }}
diff --git a/src/components/CMyUser/CMyUser.vue b/src/components/CMyUser/CMyUser.vue index 08d2c4e5..23dddc4a 100755 --- a/src/components/CMyUser/CMyUser.vue +++ b/src/components/CMyUser/CMyUser.vue @@ -263,7 +263,7 @@ {{ $t('groups.accept_group') }} - + @@ -427,7 +427,7 @@ {{ $t('circuit.accept') }} - + @@ -854,7 +854,7 @@ $t('handshake.remove_from_myhandshake') }} - + diff --git a/src/views/user/myfriends/myfriends.ts b/src/views/user/myfriends/myfriends.ts index ca9c833d..1e700b24 100755 --- a/src/views/user/myfriends/myfriends.ts +++ b/src/views/user/myfriends/myfriends.ts @@ -85,6 +85,7 @@ export default defineComponent({ username: 1, name: 1, surname: 1, + 'profile.handshake': 1, 'profile.img': 1, 'profile.mygroups': 1, 'profile.qualifica': 1, diff --git a/src/views/user/myfriends/myfriends.vue b/src/views/user/myfriends/myfriends.vue index 902be0b7..f04335d7 100755 --- a/src/views/user/myfriends/myfriends.vue +++ b/src/views/user/myfriends/myfriends.vue @@ -24,13 +24,15 @@ :vertical="costanti.VISUTABLE_LISTA" nodataLabel=" " :prop_search="true" + :prop_showfilter="true" hint="Username o nome da trovare" :finder="true" :choose_visutype="true" - :finder_noNull="true" + :finder_noNull="false" + :finder_noNullFilters="false" :options="shared_consts.OPTIONS_SEARCH_USER_ALL_WORDS" :butt_modif_new="false" - noresultLabel="Username non trovato" + noresultLabel="Username o nome non trovato" :arrfilters="arrfilterand" :filtercustom="filtercustom" :prop_searchList="searchList"