diff --git a/.env.development b/.env.development index 049804c3..8ba88cda 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.60" +APP_VERSION="1.0.61" SERVICE_WORKER_FILE="service-worker.js" APP_ID="19" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index 4e635c6f..6523d51a 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="1.0.60" +APP_VERSION="1.0.61" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.prod.gruppomacro b/.env.prod.gruppomacro index 38f53e00..8389d856 100644 --- a/.env.prod.gruppomacro +++ b/.env.prod.gruppomacro @@ -1,4 +1,4 @@ -APP_VERSION="1.0.60" +APP_VERSION="1.0.61" SERVICE_WORKER_FILE="service-worker.js" APP_ID="18" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.prod.pcb b/.env.prod.pcb index 684713f3..4b26cd32 100644 --- a/.env.prod.pcb +++ b/.env.prod.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.0.60" +APP_VERSION="1.0.61" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.abitaregliiblei.it b/.env.test.abitaregliiblei.it index 3e943947..1f09109c 100755 --- a/.env.test.abitaregliiblei.it +++ b/.env.test.abitaregliiblei.it @@ -1,4 +1,4 @@ -APP_VERSION="1.0.60" +APP_VERSION="1.0.61" SERVICE_WORKER_FILE="service-worker.js" APP_ID="19" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.gruppomacro b/.env.test.gruppomacro index 5e541d0d..182eccef 100755 --- a/.env.test.gruppomacro +++ b/.env.test.gruppomacro @@ -1,4 +1,4 @@ -APP_VERSION="1.0.60" +APP_VERSION="1.0.61" SERVICE_WORKER_FILE="service-worker.js" APP_ID="18" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.pcb b/.env.test.pcb index 9caebdb2..00bc8aa1 100755 --- a/.env.test.pcb +++ b/.env.test.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.0.60" +APP_VERSION="1.0.61" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.risosrv b/.env.test.risosrv index 538d07c2..6f5aff38 100755 --- a/.env.test.risosrv +++ b/.env.test.risosrv @@ -1,5 +1,5 @@ -APP_VERSION="1.0.60" -SERVICE_WORKER_FILE="service-worker_1.0.60.js" +APP_VERSION="1.0.61" +SERVICE_WORKER_FILE="service-worker_1.0.61.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet DIRECTORY_SERVER=/var/www/nodejs_test.riso_server diff --git a/.env.test2 b/.env.test2 index 36cf7593..e0a180ba 100755 --- a/.env.test2 +++ b/.env.test2 @@ -1,4 +1,4 @@ -APP_VERSION="1.0.60" +APP_VERSION="1.0.61" 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 56effc0f..1c29eb23 100755 --- a/.env.test_riso.pcb +++ b/.env.test_riso.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.0.60" +APP_VERSION="1.0.61" 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 049804c3..8ba88cda 100755 --- a/_ALL_SITES/abitaregliiblei.it/.env.development +++ b/_ALL_SITES/abitaregliiblei.it/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.60" +APP_VERSION="1.0.61" 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 605099bf..5ada2ae7 100755 --- a/_ALL_SITES/abitaregliiblei.it/package.json +++ b/_ALL_SITES/abitaregliiblei.it/package.json @@ -1,6 +1,6 @@ { "name": "abitaregliiblei", - "version": "1.0.60", + "version": "1.0.61", "description": "Abitare Gli Iblei", "productName": "AbitareGliIblei", "author": "Paolo Arena", diff --git a/_ALL_SITES/fioredellavita.riso.app/.env.development b/_ALL_SITES/fioredellavita.riso.app/.env.development index 5c994fe2..152957f3 100755 --- a/_ALL_SITES/fioredellavita.riso.app/.env.development +++ b/_ALL_SITES/fioredellavita.riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.60" +APP_VERSION="1.0.61" 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 0a31193a..32779b66 100755 --- a/_ALL_SITES/fioredellavita.riso.app/.env.test +++ b/_ALL_SITES/fioredellavita.riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.0.60" +APP_VERSION="1.0.61" 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 93c11f9f..049bbb1e 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.0.60", + "version": "1.0.61", "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 68c79c93..7c0ae433 100755 --- a/_ALL_SITES/gruppomacro.app/.env.development +++ b/_ALL_SITES/gruppomacro.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.60" +APP_VERSION="1.0.61" 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 6d58d486..bac8b14b 100755 --- a/_ALL_SITES/gruppomacro.app/.env.test +++ b/_ALL_SITES/gruppomacro.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.0.60" +APP_VERSION="1.0.61" SERVICE_WORKER_FILE="service-worker.js" APP_ID="16" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/gruppomacro.app/package.json b/_ALL_SITES/gruppomacro.app/package.json index ced3dbde..693bbf7f 100755 --- a/_ALL_SITES/gruppomacro.app/package.json +++ b/_ALL_SITES/gruppomacro.app/package.json @@ -1,6 +1,6 @@ { "name": "gruppomacro", - "version": "1.0.60", + "version": "1.0.61", "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 0af3f7c9..b3a69284 100755 --- a/_ALL_SITES/piuchebuono.app/.env.development +++ b/_ALL_SITES/piuchebuono.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.60" +APP_VERSION="1.0.61" 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 b3868cc7..de73f6f3 100755 --- a/_ALL_SITES/piuchebuono.app/.env.test +++ b/_ALL_SITES/piuchebuono.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.0.60" +APP_VERSION="1.0.61" 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 80277ba5..60dd1be2 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.60" +APP_VERSION="1.0.61" 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 c981ff3e..7cec6236 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="1.0.60" +APP_VERSION="1.0.61" 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 6d58d486..bac8b14b 100755 --- a/_ALL_SITES/riso.app/.env.test +++ b/_ALL_SITES/riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.0.60" +APP_VERSION="1.0.61" 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 9a3123c8..78643b6c 100755 --- a/_ALL_SITES/riso.app/package.json +++ b/_ALL_SITES/riso.app/package.json @@ -1,6 +1,6 @@ { "name": "riso", - "version": "1.0.60", + "version": "1.0.61", "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 605099bf..5ada2ae7 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "abitaregliiblei", - "version": "1.0.60", + "version": "1.0.61", "description": "Abitare Gli Iblei", "productName": "AbitareGliIblei", "author": "Paolo Arena", diff --git a/src-pwa/custom-service-worker.js b/src-pwa/custom-service-worker.js index 5f0153cb..b3de0797 100755 --- a/src-pwa/custom-service-worker.js +++ b/src-pwa/custom-service-worker.js @@ -34,7 +34,7 @@ self.addEventListener('activate', (event) => { }); -const VersioneApp = "1.0.60"; +const VersioneApp = "1.0.61"; console.log(' [ VER-' + VersioneApp + ' ] _---------________------ PAO: this is my custom service worker'); diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index fec1b112..b61ad37c 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -1448,8 +1448,8 @@ export default defineComponent({ } - function showandsel(row: any, col: any, newval: any, valinitial: any) { - console.log('showandsel CGridTable', row, col, newval) + function showandsave(row: any, col: any, newval: any, valinitial: any) { + console.log('showandsave CGridTable', row, col, newval) rowsel.value = row colsel.value = col idsel = row._id @@ -2542,7 +2542,7 @@ export default defineComponent({ return { selItem, SaveValdb, - showandsel, + showandsave, annulla, SaveValue, updatedcol, diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index 6ae196c6..fcc50073 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -549,7 +549,7 @@ minuteinterval="1" @save="SaveValue" @show="selItem(row, col)" - @showandsave="showandsel" + @showandsave="showandsave" > @@ -953,7 +953,7 @@ minuteinterval="1" @save="SaveValue" @show="selItem(props.row, col)" - @showandsave="showandsel" + @showandsave="showandsave" > @@ -1103,7 +1103,7 @@ minuteinterval="1" @save="SaveValue" @show="selItem(props.row, col)" - @showandsave="showandsel" + @showandsave="showandsave" > @@ -1296,7 +1296,7 @@ :subfield="mycol.subfield" @save="SaveValdb" @show="selItem(rowclicksel, mycol)" - @showandsave="showandsel" + @showandsave="showandsave" @annulla="annulla" @update_col="update_col" > @@ -1356,7 +1356,7 @@ :insertMode="true" @save="SaveValue" @show="selItem(newRecord, col)" - @showandsave="showandsel" + @showandsave="showandsave" @update_col="update_col" > @@ -1431,7 +1431,7 @@ :insertMode="true" @save="SaveValue" @show="selItem(newRecord, col)" - @showandsave="showandsel" + @showandsave="showandsave" > @@ -1495,7 +1495,7 @@ minuteinterval="1" @save="SaveValue" @show="selItem(recModif, col, true)" - @showandsave="showandsel" + @showandsave="showandsave" @update_col="update_col" > diff --git a/src/components/CGridTableUser/CGridTableUser.ts b/src/components/CGridTableUser/CGridTableUser.ts index 49943a4d..0e1b69dd 100755 --- a/src/components/CGridTableUser/CGridTableUser.ts +++ b/src/components/CGridTableUser/CGridTableUser.ts @@ -1317,8 +1317,8 @@ export default defineComponent({ } - function showandsel(row: any, col: any, newval: any, valinitial: any) { - console.log('showandsel CGridTable', row, col, newval) + function showandsave(row: any, col: any, newval: any, valinitial: any) { + console.log('showandsave CGridTable', row, col, newval) rowsel.value = row colsel.value = col idsel = row._id @@ -2262,7 +2262,7 @@ export default defineComponent({ return { selItem, SaveValdb, - showandsel, + showandsave, annulla, SaveValue, updatedcol, diff --git a/src/components/CGridTableUser/CGridTableUser.vue b/src/components/CGridTableUser/CGridTableUser.vue index e4cdb79e..01a67863 100755 --- a/src/components/CGridTableUser/CGridTableUser.vue +++ b/src/components/CGridTableUser/CGridTableUser.vue @@ -198,7 +198,7 @@ minuteinterval="1" @save="SaveValue" @show="selItem(row, col)" - @showandsave="showandsel" + @showandsave="showandsave" > @@ -276,7 +276,7 @@ :subfield="mycol.subfield" @save="SaveValdb" @show="selItem(rowclicksel, mycol)" - @showandsave="showandsel" + @showandsave="showandsave" @annulla="annulla" @update_col="update_col" > @@ -336,7 +336,7 @@ :insertMode="true" @save="SaveValue" @show="selItem(newRecord, col)" - @showandsave="showandsel" + @showandsave="showandsave" @update_col="update_col" > @@ -411,7 +411,7 @@ :insertMode="true" @save="SaveValue" @show="selItem(newRecord, col)" - @showandsave="showandsel" + @showandsave="showandsave" > @@ -475,7 +475,7 @@ minuteinterval="1" @save="SaveValue" @show="selItem(recModif, col, true)" - @showandsave="showandsel" + @showandsave="showandsave" @update_col="update_col" > diff --git a/src/components/CMyCardService/CMyCardService.vue b/src/components/CMyCardService/CMyCardService.vue index 03c513de..f5d14b4c 100644 --- a/src/components/CMyCardService/CMyCardService.vue +++ b/src/components/CMyCardService/CMyCardService.vue @@ -652,7 +652,13 @@ }} - + @@ -669,6 +675,7 @@
-
- +
-
- +
-
diff --git a/src/components/CMyFieldRec/CMyFieldRec.ts b/src/components/CMyFieldRec/CMyFieldRec.ts index f99b2444..d89d9e18 100755 --- a/src/components/CMyFieldRec/CMyFieldRec.ts +++ b/src/components/CMyFieldRec/CMyFieldRec.ts @@ -177,8 +177,8 @@ export default defineComponent({ } - function showandsel(row: any, col: any, newval: any, valinitial: any) { - console.log('showandsel CMyFieldDb', row, col, newval) + function showandsave(row: any, col: any, newval: any, valinitial: any) { + console.log('showandsave CMyFieldDb', row, col, newval) emit('save', props.rec, newval) if (props.nosaveToDb) @@ -246,7 +246,7 @@ export default defineComponent({ recordCol, pickup, jointable, - showandsel, + showandsave, mykey, mysubkey, mysubsubkey, diff --git a/src/components/CMyFieldRec/CMyFieldRec.vue b/src/components/CMyFieldRec/CMyFieldRec.vue index c48c3b14..3420a3cf 100755 --- a/src/components/CMyFieldRec/CMyFieldRec.vue +++ b/src/components/CMyFieldRec/CMyFieldRec.vue @@ -1,25 +1,45 @@