diff --git a/.env.development b/.env.development
index 34e6a9e7..c479e351 100755
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.16"
+APP_VERSION="1.1.17"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet"
diff --git a/.env.example.production b/.env.example.production
index 16a1adfc..3b0c5f93 100755
--- a/.env.example.production
+++ b/.env.example.production
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.16"
+APP_VERSION="1.1.17"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet
diff --git a/.env.prod.gruppomacro b/.env.prod.gruppomacro
index 32657566..70bc881d 100644
--- a/.env.prod.gruppomacro
+++ b/.env.prod.gruppomacro
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.16"
+APP_VERSION="1.1.17"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="18"
DIRECTORY_LOCAL=newfreeplanet
diff --git a/.env.prod.pcb b/.env.prod.pcb
index 5240e00b..f06cd3e2 100644
--- a/.env.prod.pcb
+++ b/.env.prod.pcb
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.16"
+APP_VERSION="1.1.17"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="17"
DIRECTORY_LOCAL="newfreeplanet"
diff --git a/.env.prod.riso b/.env.prod.riso
index a0f22497..4a01a539 100644
--- a/.env.prod.riso
+++ b/.env.prod.riso
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.16"
+APP_VERSION="1.1.17"
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 8e361ebf..5e96d840 100755
--- a/.env.test.abitaregliiblei.it
+++ b/.env.test.abitaregliiblei.it
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.16"
+APP_VERSION="1.1.17"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="19"
DIRECTORY_LOCAL=newfreeplanet
diff --git a/.env.test.gruppomacro b/.env.test.gruppomacro
index a6d96256..5a13c062 100755
--- a/.env.test.gruppomacro
+++ b/.env.test.gruppomacro
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.16"
+APP_VERSION="1.1.17"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="18"
DIRECTORY_LOCAL=newfreeplanet
diff --git a/.env.test.pcb b/.env.test.pcb
index b48ffb79..d8ded309 100755
--- a/.env.test.pcb
+++ b/.env.test.pcb
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.16"
+APP_VERSION="1.1.17"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="17"
DIRECTORY_LOCAL="newfreeplanet"
diff --git a/.env.test.risosrv b/.env.test.risosrv
index 65de49e8..f1d13ce5 100755
--- a/.env.test.risosrv
+++ b/.env.test.risosrv
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.16"
+APP_VERSION="1.1.17"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet
diff --git a/.env.test2 b/.env.test2
index c509dd8a..faa04b4e 100755
--- a/.env.test2
+++ b/.env.test2
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.16"
+APP_VERSION="1.1.17"
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 503d48f0..a85e5529 100755
--- a/.env.test_riso.pcb
+++ b/.env.test_riso.pcb
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.16"
+APP_VERSION="1.1.17"
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 bf722e06..fe951863 100755
--- a/_ALL_SITES/abitaregliiblei.it/.env.development
+++ b/_ALL_SITES/abitaregliiblei.it/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.16"
+APP_VERSION="1.1.17"
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 895e3113..370580e8 100755
--- a/_ALL_SITES/abitaregliiblei.it/package.json
+++ b/_ALL_SITES/abitaregliiblei.it/package.json
@@ -1,6 +1,6 @@
{
"name": "abitaregliiblei",
- "version": "1.1.16",
+ "version": "1.1.17",
"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 34e6a9e7..c479e351 100755
--- a/_ALL_SITES/comunitanuovomondo.app/.env.development
+++ b/_ALL_SITES/comunitanuovomondo.app/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.16"
+APP_VERSION="1.1.17"
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 47d5b1b0..1c9bda28 100755
--- a/_ALL_SITES/comunitanuovomondo.app/.env.test
+++ b/_ALL_SITES/comunitanuovomondo.app/.env.test
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.16"
+APP_VERSION="1.1.17"
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 de61fb53..f09692d6 100755
--- a/_ALL_SITES/comunitanuovomondo.app/package.json
+++ b/_ALL_SITES/comunitanuovomondo.app/package.json
@@ -1,6 +1,6 @@
{
"name": "riso",
- "version": "1.1.16",
+ "version": "1.1.17",
"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 a40e1d04..40f8a1ac 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.16"
+APP_VERSION="1.1.17"
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 12027929..0393a0cd 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.16"
+APP_VERSION="1.1.17"
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 2720b16e..b30c8bfe 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.16",
+ "version": "1.1.17",
"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 a941b71e..51c58ded 100755
--- a/_ALL_SITES/gruppomacro.app/.env.development
+++ b/_ALL_SITES/gruppomacro.app/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.16"
+APP_VERSION="1.1.17"
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 a6d96256..5a13c062 100755
--- a/_ALL_SITES/gruppomacro.app/.env.test
+++ b/_ALL_SITES/gruppomacro.app/.env.test
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.16"
+APP_VERSION="1.1.17"
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 b2e765f7..2d225478 100755
--- a/_ALL_SITES/gruppomacro.app/package.json
+++ b/_ALL_SITES/gruppomacro.app/package.json
@@ -1,6 +1,6 @@
{
"name": "gruppomacro",
- "version": "1.1.16",
+ "version": "1.1.17",
"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 1b010421..655abfd1 100755
--- a/_ALL_SITES/piuchebuono.app/.env.development
+++ b/_ALL_SITES/piuchebuono.app/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.16"
+APP_VERSION="1.1.17"
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 b48ffb79..d8ded309 100755
--- a/_ALL_SITES/piuchebuono.app/.env.test
+++ b/_ALL_SITES/piuchebuono.app/.env.test
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.16"
+APP_VERSION="1.1.17"
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 9300950c..6e0d15d9 100755
--- a/_ALL_SITES/piuchebuono.app/package.json
+++ b/_ALL_SITES/piuchebuono.app/package.json
@@ -1,6 +1,6 @@
{
"name": "piuchebuono",
- "version": "1.1.16",
+ "version": "1.1.17",
"description": "PiuCheBuono",
"productName": "PiuCheBuono",
"author": "Paolo Arena",
diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development
index 34e6a9e7..c479e351 100755
--- a/_ALL_SITES/riso.app/.env.development
+++ b/_ALL_SITES/riso.app/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.16"
+APP_VERSION="1.1.17"
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 66c6f665..0f6df32e 100644
--- a/_ALL_SITES/riso.app/.env.production
+++ b/_ALL_SITES/riso.app/.env.production
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.16"
+APP_VERSION="1.1.17"
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 47d5b1b0..1c9bda28 100755
--- a/_ALL_SITES/riso.app/.env.test
+++ b/_ALL_SITES/riso.app/.env.test
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.16"
+APP_VERSION="1.1.17"
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 de61fb53..f09692d6 100755
--- a/_ALL_SITES/riso.app/package.json
+++ b/_ALL_SITES/riso.app/package.json
@@ -1,6 +1,6 @@
{
"name": "riso",
- "version": "1.1.16",
+ "version": "1.1.17",
"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 de61fb53..f09692d6 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "riso",
- "version": "1.1.16",
+ "version": "1.1.17",
"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 1a75c625..7ed5d285 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.16";
+const APP_VERSION = "1.1.17";
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 0a0f4e3f..600902c7 100755
--- a/src/common/shared_vuejs.ts
+++ b/src/common/shared_vuejs.ts
@@ -213,6 +213,7 @@ export const shared_consts = {
FILTER_USER_ONLINE_6_MESI: 268435456,
FILTER_NOTE: 536870912,
FILTER_SENZA_NOTE: 1073741824,
+ FILTER_DA_CONTATTARE: 2147483648,
OPTIONS_SEARCH_ONLY_FULL_WORDS: 1,
OPTIONS_SEARCH_USER_ONLY_FULL_WORDS: 2,
@@ -321,6 +322,10 @@ export const shared_consts = {
label: 'Con Provincia inserita',
value: 16777216, //FILTER_USER_PROVINCE:
},
+
+ ],
+
+ RECFILTRI_UTENTE_FACIL: [
{
label: 'Non ancora approvati dall\'invitante',
value: 2097152, // shared_consts.FILTER_USER_NO_VERIFIED_APORTADOR
@@ -345,7 +350,10 @@ export const shared_consts = {
label: 'Senza Note Facilitatore',
value: 1073741824, //shared_consts.FILTER_SENZA_NOTE
},
-
+ {
+ label: 'Da Contattare',
+ value: 2147483648, //shared_consts.FILTER_DA_CONTATTARE
+ },
],
MYTABS: [{ id: 0, table: 'none' },
@@ -2213,6 +2221,7 @@ export const shared_consts = {
adType: 1,
photos: 1,
note: 1,
+ da_contattare: 1,
descr: 1,
date_createzd: 1,
date_updated: 1,
@@ -2230,6 +2239,7 @@ export const shared_consts = {
'profile.mycircuits': 1,
'profile.qualifica': 1,
'profile.note': 1,
+ 'profile.da_contattare': 1,
'profile.resid_province': 1,
'profile.resid_card': 1,
'profile.username_telegram': 1,
diff --git a/src/components/CFindUsers/CFindUsers.ts b/src/components/CFindUsers/CFindUsers.ts
index 85be9371..fe6eb056 100755
--- a/src/components/CFindUsers/CFindUsers.ts
+++ b/src/components/CFindUsers/CFindUsers.ts
@@ -165,6 +165,7 @@ export default defineComponent({
'profile.mygroups': 1,
'profile.qualifica': 1,
'profile.note': 1,
+ 'profile.da_contattare': 1,
'profile.resid_province': 1,
'mycities.reg': 1,
}
diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts
index d3780c34..ab2ed095 100755
--- a/src/components/CGridTableRec/CGridTableRec.ts
+++ b/src/components/CGridTableRec/CGridTableRec.ts
@@ -967,6 +967,8 @@ export default defineComponent({
filtercustom.push({ 'profile.teleg_id_old': { $gt: 1 } });
} else if (myitemsingle === shared_consts.FILTER_NOTE) {
filtercustom.push({ 'profile.note': { $exists: true, $ne: '' } });
+ } else if (myitemsingle === shared_consts.FILTER_DA_CONTATTARE) {
+ filtercustom.push({ 'profile.da_contattare': { $exists: true, $ne: false } });
} else if (myitemsingle === shared_consts.FILTER_SENZA_NOTE) {
filtercustom.push({
$or: [
diff --git a/src/components/CMyUser/CMyUser.vue b/src/components/CMyUser/CMyUser.vue
index 90d991a0..5b9cf4fd 100755
--- a/src/components/CMyUser/CMyUser.vue
+++ b/src/components/CMyUser/CMyUser.vue
@@ -39,7 +39,8 @@
Note: {{ contact.profile.note }}
+
Note: {{ contact.profile.note }}
+
Da Contattare