From 2b1fc9b09083aa7be07d78a81d5c9c41ea7f77fa Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Sat, 11 Jan 2025 12:08:03 +0100 Subject: [PATCH] - varie sistemazioni: filtri iscritti, profilo, ecc... --- .env.development | 2 +- .env.example.production | 2 +- .env.prod.gruppomacro | 2 +- .env.prod.pcb | 2 +- .env.prod.riso | 2 +- .env.test.abitaregliiblei.it | 2 +- .env.test.gruppomacro | 2 +- .env.test.pcb | 2 +- .env.test.risosrv | 2 +- .env.test2 | 2 +- .env.test_riso.pcb | 2 +- .../abitaregliiblei.it/.env.development | 2 +- _ALL_SITES/abitaregliiblei.it/package.json | 2 +- .../comunitanuovomondo.app/.env.development | 2 +- _ALL_SITES/comunitanuovomondo.app/.env.test | 2 +- .../comunitanuovomondo.app/package.json | 2 +- .../fioredellavita.riso.app/.env.development | 2 +- _ALL_SITES/fioredellavita.riso.app/.env.test | 2 +- .../fioredellavita.riso.app/package.json | 2 +- _ALL_SITES/gruppomacro.app/.env.development | 2 +- _ALL_SITES/gruppomacro.app/.env.test | 2 +- _ALL_SITES/gruppomacro.app/package.json | 2 +- _ALL_SITES/piuchebuono.app/.env.development | 2 +- _ALL_SITES/piuchebuono.app/.env.test | 2 +- _ALL_SITES/piuchebuono.app/package.json | 2 +- _ALL_SITES/riso.app/.env.development | 2 +- _ALL_SITES/riso.app/.env.production | 2 +- _ALL_SITES/riso.app/.env.test | 2 +- _ALL_SITES/riso.app/package.json | 2 +- package.json | 2 +- src-pwa/custom-service-worker.js | 2 +- src/common/shared_vuejs.ts | 45 + src/components/CGridTableRec/CGridTableRec.ts | 34 + .../CGridTableRec/CGridTableRec.vue | 2 +- src/components/CMyActivities/CMyActivities.ts | 4 +- .../CMyActivities/CMyActivities.vue | 2 +- .../CMyCardService/CMyCardService.vue | 2 +- .../CMyRecCircuitCard/CMyRecCircuitCard.vue | 7 +- src/css/app.scss | 6 +- src/index.template.html | 2 +- src/statics/lang/it.js | 5 +- src/store/Modules/costanti.ts | 180 ++-- src/store/Modules/fieldsTable.ts | 7 + src/store/Modules/tools.ts | 18 + src/store/UserStore.ts | 1 + src/store/globalStore.ts | 4 +- src/views/admin/dbop/dbop.ts | 3 + src/views/admin/dbop/dbop.vue | 22 + src/views/user/mycircuit/mycircuit.vue | 1 - src/views/user/myfriends/myfriends.ts | 13 + src/views/user/myfriends/myfriends.vue | 20 +- src/views/user/myprofile/myprofile.vue | 920 +++++++++--------- 52 files changed, 734 insertions(+), 626 deletions(-) diff --git a/.env.development b/.env.development index 210d60d1..34e6a9e7 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.15" +APP_VERSION="1.1.16" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index 603129f1..16a1adfc 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="1.1.15" +APP_VERSION="1.1.16" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.prod.gruppomacro b/.env.prod.gruppomacro index 73e2a0c1..32657566 100644 --- a/.env.prod.gruppomacro +++ b/.env.prod.gruppomacro @@ -1,4 +1,4 @@ -APP_VERSION="1.1.15" +APP_VERSION="1.1.16" SERVICE_WORKER_FILE="service-worker.js" APP_ID="18" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.prod.pcb b/.env.prod.pcb index 6b4df327..5240e00b 100644 --- a/.env.prod.pcb +++ b/.env.prod.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.1.15" +APP_VERSION="1.1.16" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.prod.riso b/.env.prod.riso index 45a9d9fb..a0f22497 100644 --- a/.env.prod.riso +++ b/.env.prod.riso @@ -1,4 +1,4 @@ -APP_VERSION="1.1.15" +APP_VERSION="1.1.16" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.abitaregliiblei.it b/.env.test.abitaregliiblei.it index 6d1620c7..8e361ebf 100755 --- a/.env.test.abitaregliiblei.it +++ b/.env.test.abitaregliiblei.it @@ -1,4 +1,4 @@ -APP_VERSION="1.1.15" +APP_VERSION="1.1.16" SERVICE_WORKER_FILE="service-worker.js" APP_ID="19" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.gruppomacro b/.env.test.gruppomacro index 034dc3eb..a6d96256 100755 --- a/.env.test.gruppomacro +++ b/.env.test.gruppomacro @@ -1,4 +1,4 @@ -APP_VERSION="1.1.15" +APP_VERSION="1.1.16" SERVICE_WORKER_FILE="service-worker.js" APP_ID="18" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.pcb b/.env.test.pcb index b47a0317..b48ffb79 100755 --- a/.env.test.pcb +++ b/.env.test.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.1.15" +APP_VERSION="1.1.16" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.test.risosrv b/.env.test.risosrv index 1d51de83..65de49e8 100755 --- a/.env.test.risosrv +++ b/.env.test.risosrv @@ -1,4 +1,4 @@ -APP_VERSION="1.1.15" +APP_VERSION="1.1.16" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test2 b/.env.test2 index 29445b88..c509dd8a 100755 --- a/.env.test2 +++ b/.env.test2 @@ -1,4 +1,4 @@ -APP_VERSION="1.1.15" +APP_VERSION="1.1.16" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test_riso.pcb b/.env.test_riso.pcb index 81e49b46..503d48f0 100755 --- a/.env.test_riso.pcb +++ b/.env.test_riso.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.1.15" +APP_VERSION="1.1.16" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/abitaregliiblei.it/.env.development b/_ALL_SITES/abitaregliiblei.it/.env.development index 415e8692..bf722e06 100755 --- a/_ALL_SITES/abitaregliiblei.it/.env.development +++ b/_ALL_SITES/abitaregliiblei.it/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.15" +APP_VERSION="1.1.16" SERVICE_WORKER_FILE="service-worker.js" APP_ID="19" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/abitaregliiblei.it/package.json b/_ALL_SITES/abitaregliiblei.it/package.json index ce2f713d..895e3113 100755 --- a/_ALL_SITES/abitaregliiblei.it/package.json +++ b/_ALL_SITES/abitaregliiblei.it/package.json @@ -1,6 +1,6 @@ { "name": "abitaregliiblei", - "version": "1.1.15", + "version": "1.1.16", "description": "Abitare Gli Iblei", "productName": "AbitareGliIblei", "author": "Paolo Arena", diff --git a/_ALL_SITES/comunitanuovomondo.app/.env.development b/_ALL_SITES/comunitanuovomondo.app/.env.development index 210d60d1..34e6a9e7 100755 --- a/_ALL_SITES/comunitanuovomondo.app/.env.development +++ b/_ALL_SITES/comunitanuovomondo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.15" +APP_VERSION="1.1.16" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/comunitanuovomondo.app/.env.test b/_ALL_SITES/comunitanuovomondo.app/.env.test index 854828ea..47d5b1b0 100755 --- a/_ALL_SITES/comunitanuovomondo.app/.env.test +++ b/_ALL_SITES/comunitanuovomondo.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.1.15" +APP_VERSION="1.1.16" SERVICE_WORKER_FILE="service-worker.js" APP_ID="16" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/comunitanuovomondo.app/package.json b/_ALL_SITES/comunitanuovomondo.app/package.json index 3839d900..de61fb53 100755 --- a/_ALL_SITES/comunitanuovomondo.app/package.json +++ b/_ALL_SITES/comunitanuovomondo.app/package.json @@ -1,6 +1,6 @@ { "name": "riso", - "version": "1.1.15", + "version": "1.1.16", "description": "Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.", "productName": "Riso", "author": "Paolo Arena", diff --git a/_ALL_SITES/fioredellavita.riso.app/.env.development b/_ALL_SITES/fioredellavita.riso.app/.env.development index 204c9325..a40e1d04 100755 --- a/_ALL_SITES/fioredellavita.riso.app/.env.development +++ b/_ALL_SITES/fioredellavita.riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.15" +APP_VERSION="1.1.16" SERVICE_WORKER_FILE="service-worker.js" APP_ID="15" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/fioredellavita.riso.app/.env.test b/_ALL_SITES/fioredellavita.riso.app/.env.test index 31100f16..12027929 100755 --- a/_ALL_SITES/fioredellavita.riso.app/.env.test +++ b/_ALL_SITES/fioredellavita.riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.1.15" +APP_VERSION="1.1.16" SERVICE_WORKER_FILE="service-worker.js" APP_ID="15" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/fioredellavita.riso.app/package.json b/_ALL_SITES/fioredellavita.riso.app/package.json index 495b97d2..2720b16e 100755 --- a/_ALL_SITES/fioredellavita.riso.app/package.json +++ b/_ALL_SITES/fioredellavita.riso.app/package.json @@ -1,6 +1,6 @@ { "name": "fioredellavita", - "version": "1.1.15", + "version": "1.1.16", "description": "Fiore Della Vita", "productName": "Fiore Della Vita", "author": "Paolo Arena", diff --git a/_ALL_SITES/gruppomacro.app/.env.development b/_ALL_SITES/gruppomacro.app/.env.development index a4109283..a941b71e 100755 --- a/_ALL_SITES/gruppomacro.app/.env.development +++ b/_ALL_SITES/gruppomacro.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.15" +APP_VERSION="1.1.16" SERVICE_WORKER_FILE="service-worker.js" APP_ID="18" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/gruppomacro.app/.env.test b/_ALL_SITES/gruppomacro.app/.env.test index 034dc3eb..a6d96256 100755 --- a/_ALL_SITES/gruppomacro.app/.env.test +++ b/_ALL_SITES/gruppomacro.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.1.15" +APP_VERSION="1.1.16" SERVICE_WORKER_FILE="service-worker.js" APP_ID="18" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/gruppomacro.app/package.json b/_ALL_SITES/gruppomacro.app/package.json index d9a1ac35..b2e765f7 100755 --- a/_ALL_SITES/gruppomacro.app/package.json +++ b/_ALL_SITES/gruppomacro.app/package.json @@ -1,6 +1,6 @@ { "name": "gruppomacro", - "version": "1.1.15", + "version": "1.1.16", "description": "GruppoMacro", "productName": "Gruppo Macro", "author": "Paolo Arena", diff --git a/_ALL_SITES/piuchebuono.app/.env.development b/_ALL_SITES/piuchebuono.app/.env.development index 7ff3a0bf..1b010421 100755 --- a/_ALL_SITES/piuchebuono.app/.env.development +++ b/_ALL_SITES/piuchebuono.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.15" +APP_VERSION="1.1.16" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/piuchebuono.app/.env.test b/_ALL_SITES/piuchebuono.app/.env.test index b47a0317..b48ffb79 100755 --- a/_ALL_SITES/piuchebuono.app/.env.test +++ b/_ALL_SITES/piuchebuono.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.1.15" +APP_VERSION="1.1.16" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/piuchebuono.app/package.json b/_ALL_SITES/piuchebuono.app/package.json index e2805a6d..9300950c 100755 --- a/_ALL_SITES/piuchebuono.app/package.json +++ b/_ALL_SITES/piuchebuono.app/package.json @@ -1,6 +1,6 @@ { "name": "piuchebuono", - "version": "1.1.15", + "version": "1.1.16", "description": "PiuCheBuono", "productName": "PiuCheBuono", "author": "Paolo Arena", diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index 210d60d1..34e6a9e7 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.15" +APP_VERSION="1.1.16" 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 d614f0f6..66c6f665 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="1.1.15" +APP_VERSION="1.1.16" 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 854828ea..47d5b1b0 100755 --- a/_ALL_SITES/riso.app/.env.test +++ b/_ALL_SITES/riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.1.15" +APP_VERSION="1.1.16" SERVICE_WORKER_FILE="service-worker.js" APP_ID="16" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/riso.app/package.json b/_ALL_SITES/riso.app/package.json index 3839d900..de61fb53 100755 --- a/_ALL_SITES/riso.app/package.json +++ b/_ALL_SITES/riso.app/package.json @@ -1,6 +1,6 @@ { "name": "riso", - "version": "1.1.15", + "version": "1.1.16", "description": "Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.", "productName": "Riso", "author": "Paolo Arena", diff --git a/package.json b/package.json index 3839d900..de61fb53 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "riso", - "version": "1.1.15", + "version": "1.1.16", "description": "Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.", "productName": "Riso", "author": "Paolo Arena", diff --git a/src-pwa/custom-service-worker.js b/src-pwa/custom-service-worker.js index 24304d2c..1a75c625 100755 --- a/src-pwa/custom-service-worker.js +++ b/src-pwa/custom-service-worker.js @@ -34,7 +34,7 @@ self.addEventListener('activate', (event) => { }); -const APP_VERSION = "1.1.15"; +const APP_VERSION = "1.1.16"; console.log(' [ VER-' + APP_VERSION + ' ] _---------________------ PAO: this is my custom service worker'); diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index caeed348..a9c400c9 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -208,6 +208,8 @@ export const shared_consts = { FILTER_USER_WITHOUT_USERNAME_TELEGRAM: 8388608, FILTER_USER_PROVINCE: 16777216, FILTER_USER_SENZA_PROVINCE: 33554432, + FILTER_USER_SENZA_CIRCUITO: 67108864, + FILTER_USER_CON_CIRCUITO: 134217728, OPTIONS_SEARCH_ONLY_FULL_WORDS: 1, OPTIONS_SEARCH_USER_ONLY_FULL_WORDS: 2, @@ -289,6 +291,49 @@ export const shared_consts = { TABLES_MYGROUPS: 'mygroups', TABLES_ATTIVITAS: 'attivitas', + TABFILTRI_UTENTE: 'filtriutente', + + RECFILTRI_UTENTE: [ + { + label: '[Tutti]', + value: 0 + }, + { + label: 'Senza Provincia', + value: 33554432, // FILTER_USER_SENZA_PROVINCE + }, + { + label: 'Dentro ad un Circuito RIS', + value: 134217728, //FILTER_USER_CON_CIRCUITO: + }, + { + label: 'Senza Circuito RIS', + value: 67108864, // FILTER_USER_SENZA_CIRCUITO + }, + { + label: 'Con Provincia inserita', + value: 16777216, //FILTER_USER_PROVINCE: + }, + { + label: 'Non ancora approvati dall\'invitante', + value: 2097152, // shared_consts.FILTER_USER_NO_VERIFIED_APORTADOR + }, + { + label: 'Senza Telegram BOT', + value: 32, //shared_consts.FILTER_USER_NO_TELEGRAM_ID + }, + { + label: 'Senza username Telegram', + value: 8388608, // shared_consts.FILTER_USER_WITHOUT_USERNAME_TELEGRAM + }, + { + label: 'Telegram BOT Rimosso', + value: 1024, //shared_consts.FILTER_USER_TELEGRAM_BLOCKED + }, + + + ], + MYTABS: [{ id: 0, table: 'none' }, { id: 1, table: 'myskills' }, { id: 2, table: 'mybachecas' }, diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index 12ead09d..2c738cde 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -938,6 +938,40 @@ export default defineComponent({ arrfilter_cities.push({ key: 'prov', value: idProvince }) } + } else if (item.table === shared_consts.TABFILTRI_UTENTE) { + if (item.value === shared_consts.FILTER_USER_SENZA_PROVINCE) { + filtercustom.push({ 'profile.resid_province': { $exists: false } }); + } else if (item.value === shared_consts.FILTER_USER_CON_CIRCUITO) { + filtercustom.push({ + 'profile.mycircuits': { $exists: true, $ne: [] } + }); + } else if (item.value === shared_consts.FILTER_USER_SENZA_CIRCUITO) { + filtercustom.push({ + $or: [ + { 'profile.mycircuits': { $exists: false } }, + { 'profile.mycircuits': { $eq: [] } } + ] + }); + } else if (item.value === shared_consts.FILTER_USER_PROVINCE) { + filtercustom.push({ 'profile.resid_province': { $exists: true, $ne: '' } }); + } else if (item.value === shared_consts.FILTER_USER_TELEGRAM_BLOCKED) { + filtercustom.push({ 'profile.teleg_id_old': { $gt: 1 } }); + } else if (item.value === shared_consts.FILTER_USER_WITHOUT_USERNAME_TELEGRAM) { + filtercustom.push({ + $or: [ + { 'profile.username_telegram': { $exists: false } }, + { 'profile.username_telegram': { $exists: true, $eq: '' } }], + + }); + + } else if (item.value === shared_consts.FILTER_USER_NO_VERIFIED_APORTADOR) { + filtercustom.push({ + verified_by_aportador: { $exists: false }, + }); + } else if (item.value === shared_consts.FILTER_USER_NO_TELEGRAM_ID) { + filtercustom.push({ 'profile.teleg_id': { $lt: 1 } }); + + } } else if (item.table === 'cities') { if (item.value && item.value.hasOwnProperty('_id')) { diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index 9c0ce49f..ba976a5b 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -1384,7 +1384,7 @@ @hide="hidewindow" class="dialog_class" :persistent="true" - :maximized="false" + :maximized="$q.screen.lt.sm" > diff --git a/src/components/CMyActivities/CMyActivities.ts b/src/components/CMyActivities/CMyActivities.ts index b0954ae6..d4bf8085 100755 --- a/src/components/CMyActivities/CMyActivities.ts +++ b/src/components/CMyActivities/CMyActivities.ts @@ -79,7 +79,7 @@ export default defineComponent({ const notifStore = useNotifStore() const mycards = computed(() => { - return costanti.MAINCARDS.filter((rec: any) => rec.table && rec.visible) + return costanti.MAINCARDS.filter((rec: any) => rec.table && rec.showinprofile) }) const optionsMainCards = ref({}) @@ -105,7 +105,7 @@ export default defineComponent({ // Carica il profilo di quest'utente if (username.value) { await userStore.loadUserActivities({ username: username.value, idnotif: idnotif.value }).then((ris) => { - // console.log('loadUserProfile = ', ris) + // console.log('loadUserActivities = ', ris) myuser.value = ris if (myuser.value) { // filtro_eventi.value = [{ userId: myuser.value._id }, { dateTimeStart: { $gte: today } }] diff --git a/src/components/CMyActivities/CMyActivities.vue b/src/components/CMyActivities/CMyActivities.vue index edfdf956..c0666b21 100755 --- a/src/components/CMyActivities/CMyActivities.vue +++ b/src/components/CMyActivities/CMyActivities.vue @@ -128,7 +128,7 @@ -
+
{{ card.title }}
diff --git a/src/components/CMyRecCircuitCard/CMyRecCircuitCard.vue b/src/components/CMyRecCircuitCard/CMyRecCircuitCard.vue index b69be0b2..7020453a 100755 --- a/src/components/CMyRecCircuitCard/CMyRecCircuitCard.vue +++ b/src/components/CMyRecCircuitCard/CMyRecCircuitCard.vue @@ -36,7 +36,7 @@ circuit.numMembers }} - + {{ circuit.longdescr }} + > +
- + diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index b639d1db..c5053cef 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -45,6 +45,9 @@ const msg_it = { data_choose: 'Scegli la Data', }, profile: { + info_pers: 'Info Personali', + annunci: 'Annunci', + share_link: 'Copia Link', info_msg: 'Puoi compilare facoltativamente questi tuoi dati personali.', info: 'Informazioni su di te', chisei: 'Chi Sei? Raccontaci di te:', @@ -1185,7 +1188,7 @@ const msg_it = { sector_goods_select: 'Scegli i Settori Preferiti dei Beni', }, services: { - visit_website: 'Visita il Sito Web', + visit_website: 'Visita il Sito Web "{link}"', email: 'Email:', whatsapp: 'Whatsapp', createdBy: 'Creato da', diff --git a/src/store/Modules/costanti.ts b/src/store/Modules/costanti.ts index 3d460e8e..7bc43f6c 100755 --- a/src/store/Modules/costanti.ts +++ b/src/store/Modules/costanti.ts @@ -142,6 +142,7 @@ export const costanti = { small: false, showfavorite: true, showinoptions: true, + showinprofile: true, }, { visible: true, @@ -157,6 +158,7 @@ export const costanti = { small: false, showfavorite: true, showinoptions: true, + showinprofile: true, }, { visible: true, @@ -174,48 +176,20 @@ export const costanti = { visuonstat: true, showfavorite: true, showinoptions: true, + showinprofile: true, }, - { - visible: false, - title: 'Scuola', - strsingolo: 'Scuola', - to: '/school', - icon: 'fas fa-book-open', - color: 'orange-6', - hint: '', - disable: true, - small: false, - table: '', - }, - { - visible: false, - title: 'Circuiti RIS', - strsingolo: 'Circuito', - subtitle: 'Strumento di scambio alternativa alle monete', - to: '/circuits', - table: 'circuits', - icon: 'fas fa-coins', - image: 'images/1ris_rosso_100.png', - color: 'orange-6', - hint: '', - disable: true, - small: true, - visuonstat: true, - }, - { - visible: false, - title: 'Gruppi', - strsingolo: 'Gruppo', - subtitle: 'Associazioni, progetti, comunità, negozi', - to: '/groups', - table: 'mygroups', - icon: 'fas fa-users', - color: 'blue-6', - hint: '', - disable: true, - small: true, - visuonstat: true, - }, + // { + // visible: false, + // title: 'Scuola', + // strsingolo: 'Scuola', + // to: '/school', + // icon: 'fas fa-book-open', + // color: 'orange-6', + // hint: '', + // disable: true, + // small: false, + // table: '', + // }, { visible: true, title: 'Eventi', @@ -231,32 +205,64 @@ export const costanti = { small: false, showfavorite: true, showinoptions: true, + showinprofile: true, }, { visible: false, - strsingolo: 'Luogo', - title: 'Luoghi', - to: '/places', - icon: 'fas fa-map-marker-alt', - color: 'blue-6', - hint: '', - disable: true, - small: false, - table: '', - }, - { - visible: false, - strsingolo: 'Idea', - title: 'Tue Idee', - to: '/ideas', - icon: 'fas fa-lightbulb', - color: 'red-6', - textcolor: '', + title: 'Circuiti RIS', + strsingolo: 'Circuito', + subtitle: 'Strumento di scambio alternativa alle monete', + to: '/circuits', + table: 'circuits', + icon: 'fas fa-coins', + image: 'images/1ris_rosso_100.png', + color: 'orange-6', hint: '', disable: true, small: true, - table: '', + visuonstat: true, + showinprofile: true, }, + { + visible: false, + title: 'Gruppi', + strsingolo: 'Gruppo', + subtitle: 'Associazioni, progetti, comunità, negozi', + to: '/groups', + table: 'mygroups', + icon: 'fas fa-users', + color: 'blue-6', + hint: '', + disable: true, + small: true, + visuonstat: true, + showinprofile: true, + }, + // { + // visible: false, + // strsingolo: 'Luogo', + // title: 'Luoghi', + // to: '/places', + // icon: 'fas fa-map-marker-alt', + // color: 'blue-6', + // hint: '', + // disable: true, + // small: false, + // table: '', + // }, + // { + // visible: false, + // strsingolo: 'Idea', + // title: 'Tue Idee', + // to: '/ideas', + // icon: 'fas fa-lightbulb', + // color: 'red-6', + // textcolor: '', + // hint: '', + // disable: true, + // small: true, + // table: '', + // }, /*{ visible: false, title: 'Sostieni il Progetto️', @@ -281,33 +287,33 @@ export const costanti = { link: true, table: '', },*/ - { - visible: false, - title: 'Social', - to: '/socialising', - icon: 'fas fa-users', - color: 'blue-6', - hint: '', - disable: true, - small: true, - table: '', - }, - { - visible: false, - title: ' Attività ', - subtitle: 'Artigiani, Aziende, Società, Negozi', - strsingolo: 'Attivita', - to: '/activities', - icon: 'fas fa-tshirt', - color: 'indigo-6', - hint: '', - table: 'attivitas', - visuonstat: true, - small: false, - showfavorite: true, - forgroup: true, - showinoptions: false, - }, + // { + // visible: false, + // title: 'Social', + // to: '/socialising', + // icon: 'fas fa-users', + // color: 'blue-6', + // hint: '', + // disable: true, + // small: true, + // table: '', + // }, + // { + // visible: false, + // title: ' Attività ', + // subtitle: 'Artigiani, Aziende, Società, Negozi', + // strsingolo: 'Attivita', + // to: '/activities', + // icon: 'fas fa-tshirt', + // color: 'indigo-6', + // hint: '', + // table: 'attivitas', + // visuonstat: true, + // small: false, + // showfavorite: true, + // forgroup: true, + // showinoptions: false, + // }, ], GROUPCARDS: [ diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts index 8c4c8a8c..cdae3bec 100755 --- a/src/store/Modules/fieldsTable.ts +++ b/src/store/Modules/fieldsTable.ts @@ -4757,6 +4757,13 @@ export const fieldsTable = { colkey: 'value', collabel: 'label', }, + { + value: shared_consts.TABFILTRI_UTENTE, + label: 'Tipi di Filtro', + columns: colTableGeneric, + colkey: 'value', + collabel: 'label', + }, { value: 'otherfilters', label: 'Altri Filtri', diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index 35287a27..83a152da 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -9511,6 +9511,24 @@ export const tools = { return optcatalogo.areadistampa!.scale }, + getMainLink(url: string) { + try { + // Crea un nuovo oggetto URL a partire dall'input + const parsedUrl = new URL(url); + + // Estrae solo il protocollo, l'host e la porta + const { protocol, host } = parsedUrl; + + // Ricostruisce il link principale + const mainLink = `${host}`; + + return mainLink; + } catch (error) { + console.error('Errore durante l\'elaborazione dell\'URL:', error); + return ''; + } + } + // FINE ! // getLocale() { diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts index 86553e7c..bb34cfea 100755 --- a/src/store/UserStore.ts +++ b/src/store/UserStore.ts @@ -52,6 +52,7 @@ export const CMD_REACTION = { SET_ATTEND: 4, } + export const DefaultUser: IUserFields = { _id: '', email: '', diff --git a/src/store/globalStore.ts b/src/store/globalStore.ts index ab4436d4..427ad3c4 100644 --- a/src/store/globalStore.ts +++ b/src/store/globalStore.ts @@ -373,6 +373,8 @@ export const useGlobalStore = defineStore('GlobalStore', { return calendarStore.wheres else if (table === 'contribtypes') return calendarStore.contribtype + else if (table === shared_consts.TABFILTRI_UTENTE) + return shared_consts.RECFILTRI_UTENTE else if (table === 'disciplines') ris = state.disciplines else if (table === toolsext.TABNEWSLETTER) ris = state.newstosent else if (table === toolsext.TABGALLERY) ris = state.gallery @@ -445,7 +447,7 @@ export const useGlobalStore = defineStore('GlobalStore', { else if (table === 'catgrps') return state.catgrps else if (table === 'provinces') - return state.provinces.filter((prov: IProvince) => (!prov.card)) + return state.provinces.filter((rec: IProvince) => (!rec.card) && (rec.prov !== 'ITA') && (rec.prov !== 'EST')) else if (table === 'cards') { const arrprov: any[] = state.provinces.filter((prov: IProvince) => prov.prov === value2 && (!!prov.card)) if (arrprov) { diff --git a/src/views/admin/dbop/dbop.ts b/src/views/admin/dbop/dbop.ts index b30e3d0e..745bc620 100755 --- a/src/views/admin/dbop/dbop.ts +++ b/src/views/admin/dbop/dbop.ts @@ -35,6 +35,7 @@ export default defineComponent({ const defpersmin = ref(100) const defpersmax = ref(200) const search_username = ref('') + const search = ref('') const replace_username = ref('') const risultato = ref('') const incaricamento = ref(false) @@ -62,6 +63,7 @@ export default defineComponent({ numpersone: numpersone, search_username, replace_username, + search: search.value, valmin: tools.convstrToNum(valmin), valmax: tools.convstrToNum(valmax), circuitId, @@ -105,6 +107,7 @@ export default defineComponent({ incaricamento, ris, risultato, + search, } }, }) diff --git a/src/views/admin/dbop/dbop.vue b/src/views/admin/dbop/dbop.vue index cb244288..c2434a91 100755 --- a/src/views/admin/dbop/dbop.vue +++ b/src/views/admin/dbop/dbop.vue @@ -341,6 +341,13 @@ EseguiFunz('ReplaceUsername', search_username, replace_username) " > +
+
+ + +
+
- diff --git a/src/views/user/myprofile/myprofile.vue b/src/views/user/myprofile/myprofile.vue index d919209f..fd02fa87 100755 --- a/src/views/user/myprofile/myprofile.vue +++ b/src/views/user/myprofile/myprofile.vue @@ -96,37 +96,12 @@
{{ userStore.userprofile.username }}
-
- - - - - {{ userStore.userprofile.profile.born_city_str }} - ({{ userStore.userprofile.profile.nationality }}) -
-
+
@@ -135,7 +110,12 @@ >
-
+
{{ userStore.userprofile.profile.biografia }}
@@ -214,36 +194,6 @@
{{ userStore.userprofile.username }}
-
- - - - - {{ userStore.userprofile.profile.born_city_str }} - ({{ userStore.userprofile.profile.nationality }}) -
+
+
+ + + + +
+
+ +   + {{ + $t('db.both_fiducia', { + username: userStore.userprofile.username, + }) + }} + + + +   + {{ + $t('db.handshake_him', { + username: userStore.userprofile.username, + }) + }} + + + +   + {{ + $t('db.handshake_you', { + username: userStore.userprofile.username, + }) + }} + + +
+ + +
+
+ + +
+
+
+ +
+
+
+ + +
+
+ +
+
+ +
+ + + + + + + + {{ + $t('handshake.remove_from_myhandshake') + }} + + + + + + {{ + $t('friends.remove_from_myfriends') + }} + + + + + + {{ + $t('friends.block_user') + }} + + + + + + {{ + $t('friends.report_user') + }} + + + + + + +
+
+ - - + + @@ -292,386 +626,9 @@ class="col-12 text-h8 q-mt-sm" > {{ userStore.userprofile.profile.biografia }} +
-
-
- - - - -
-
- -   - {{ - $t('db.both_fiducia', { - username: userStore.userprofile.username, - }) - }} - - - -   - {{ - $t('db.handshake_him', { - username: userStore.userprofile.username, - }) - }} - - - -   - {{ - $t('db.handshake_you', { - username: userStore.userprofile.username, - }) - }} - - -
- - -
-
- - -
-
-
- -
-
-
- - -
-
- -
-
- -
- - - - - - - - {{ - $t('handshake.remove_from_myhandshake') - }} - - - - - - {{ - $t('friends.remove_from_myfriends') - }} - - - - - - {{ - $t('friends.block_user') - }} - - - - - - {{ - $t('friends.report_user') - }} - - - - - - -
-
--> +
+ + + + +
-
- - - - -
- -
- - -
+ + + + + + @@ -789,7 +764,7 @@ >
--> - - - -