From a071d174105c96dda5852cd26fcb9ca88c60ddcb Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Fri, 3 Nov 2023 12:49:17 +0100 Subject: [PATCH] ver 1.0.19 --- .env.development | 2 +- .env.example.production | 2 +- .env.test.risosrv | 2 +- .../fioredellavita.riso.app/.env.development | 2 +- _ALL_SITES/fioredellavita.riso.app/.env.test | 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 +- config/webpack.config.base.js | 1 + package.json | 17 ++--- src/common/shared_vuejs.ts | 2 +- .../CCheckAppRunning/CCheckAppRunning.vue | 2 +- src/components/CFinder/CFinder.ts | 2 +- src/components/CGridTableRec/CGridTableRec.ts | 23 ++++++ .../CGridTableRec/CGridTableRec.vue | 42 ++--------- .../CMyCardCircuitPopup.ts | 4 +- .../CMyCardCircuitPopup.vue | 4 +- .../CMyProfileTutorial/CMyProfileTutorial.ts | 31 ++++---- .../CMyProfileTutorial/CMyProfileTutorial.vue | 68 ++++++++++++------ src/components/CMyRecCard/CMyRecCard.ts | 6 +- src/components/CSignUp/CSignUp.ts | 1 + src/model/UserStore.ts | 1 + src/statics/lang/it.js | 4 +- src/store/Modules/costanti.ts | 8 +-- src/store/UserStore.ts | 13 +++- .../ris_italia/Italy-Flag-PNG-Image.png | Bin 0 -> 37655 bytes .../myskills/Italy-Flag-PNG-Image.png | Bin 0 -> 37655 bytes 28 files changed, 144 insertions(+), 103 deletions(-) create mode 100644 upload/circuits/ris_italia/Italy-Flag-PNG-Image.png create mode 100644 upload/profile/paoloar77/myskills/Italy-Flag-PNG-Image.png diff --git a/.env.development b/.env.development index 9390b91c..481e89e4 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.17" +APP_VERSION="1.0.19" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index 23fafeb1..e789e2ea 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="1.0.17" +APP_VERSION="1.0.19" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.risosrv b/.env.test.risosrv index 4f59d703..9702f080 100755 --- a/.env.test.risosrv +++ b/.env.test.risosrv @@ -1,4 +1,4 @@ -APP_VERSION="1.0.17" +APP_VERSION="1.0.19" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/fioredellavita.riso.app/.env.development b/_ALL_SITES/fioredellavita.riso.app/.env.development index 95d74d47..12e47bef 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.17" +APP_VERSION="1.0.19" 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 6202ea44..7775cb9b 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.17" +APP_VERSION="1.0.19" SERVICE_WORKER_FILE="service-worker.js" APP_ID="15" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index 9390b91c..481e89e4 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.17" +APP_VERSION="1.0.19" 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 f4cc2e8d..17a0619d 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="1.0.17" +APP_VERSION="1.0.19" 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 2b1f2c77..4cafcdb7 100755 --- a/_ALL_SITES/riso.app/.env.test +++ b/_ALL_SITES/riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.0.17" +APP_VERSION="1.0.19" 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 4dca6183..1bde6b62 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.17" +APP_VERSION="1.0.19" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL="newfreeplanet" diff --git a/config/webpack.config.base.js b/config/webpack.config.base.js index a9d66350..77c2885a 100755 --- a/config/webpack.config.base.js +++ b/config/webpack.config.base.js @@ -15,6 +15,7 @@ const baseConfig = { filename: '[nametranslate].js', publicPath: '/', path: path.resolve(__dirname, 'dist'), + chunkFormat: 'commonjs' // or 'module' as needed }, resolve: { extensions: [ diff --git a/package.json b/package.json index e760c1ab..b7f2b887 100755 --- a/package.json +++ b/package.json @@ -123,17 +123,18 @@ "crypto": false }, "browserslist": [ - "last 100 Chrome versions", + "last 80 Chrome versions", "last 40 Firefox versions", - "last 20 Edge versions", - "last 55 Safari versions", - "last 90 Android versions", - "last 250 ChromeAndroid versions", - "last 60 FirefoxAndroid versions", - "last 35 iOS versions", + "last 10 Edge versions", + "last 45 Safari versions", + "last 80 Android versions", + "last 120 ChromeAndroid versions", + "last 30 FirefoxAndroid versions", + "last 20 iOS versions", "last 10 Opera versions", "> 0.03%", - "not dead" + "not dead", + "fully supports es6-module" ], "engines": { "node": ">= 16.14.0", diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index cb87ce8b..10d49af4 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -192,7 +192,7 @@ export const shared_consts = { TABLES_WITH_FILTER_FIELD: ['caldate'], TABLES_WITH_SPECIAL_FILTER: ['pub_to_share'], COL_WITH_FILTER_GTE: ['numMaxPeopleHosp'], - TABLES_WITH_DATE: ['mybachecas', 'myhosps'], + TABLES_WITH_DATE: ['mybachecas', 'myhosps'], // 'mybachecas' TABLES_WITH_SORTING: ['mybachecas', 'myhosps'], TABLES_REC_ID: ['skills', 'goods', 'subskills', 'myskills', 'mybachecas', 'myhosps', 'mygoods'], TABLES_FAVORITE_BOOKMARK: ['myskills', 'mygoods', 'mybachecas', 'myhosps'], diff --git a/src/components/CCheckAppRunning/CCheckAppRunning.vue b/src/components/CCheckAppRunning/CCheckAppRunning.vue index 48f58f53..fa314188 100755 --- a/src/components/CCheckAppRunning/CCheckAppRunning.vue +++ b/src/components/CCheckAppRunning/CCheckAppRunning.vue @@ -5,7 +5,7 @@ homescreen: {{ homescreen }}
-
+
shared_consts.TABLES_WITH_DATE.includes(tablesel.value)) + const withdate = ref(false) + const loading = ref(false) const alreadymounting = ref(false) const editOn = computed({ @@ -2274,6 +2279,21 @@ export default defineComponent({ } } + function setShowMonth(row: any, index: number) { + if (actmonth.value !== tools.getstrMonth(row.dateTimeStart)) { + actmonth.value = tools.getstrMonth(row.dateTimeStart) + drawmonth.value = true + } else { + drawmonth.value = false + } + + return drawmonth.value + } + + function ifShowMonth() { + return drawmonth.value + } + /*function showNotification() { $router.push('/notifs') } */ @@ -2386,6 +2406,9 @@ export default defineComponent({ getNumRecFromQuery, actmonth, alreadymounting, + withdate, + setShowMonth, + ifShowMonth, } } }) diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index 6383daac..f860b4e7 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -385,7 +385,7 @@
-
+
-
-
- {{ - (actmonth = tools.getstrMonth(row.dateTimeStart)) - }} -
-
+
+
+
+
{{ tools.getstrMonth(row.dateTimeStart) }}
@@ -415,25 +406,6 @@
- -
- {{ - (actual = tools.getstrVeryShortDate(row.dateTimeStart)) - }} - {{ tools.getstrDateLong(row.dateTimeStart) }} -
- - + --> $route.query.idnotif ? $route.query.idnotif.toString() : '') - const myrec = ref({}) + const myrec = ref({}) const col = ref({}) function profile() { diff --git a/src/components/CMyCardCircuitPopup/CMyCardCircuitPopup.vue b/src/components/CMyCardCircuitPopup/CMyCardCircuitPopup.vue index 12a48960..cfdb902f 100644 --- a/src/components/CMyCardCircuitPopup/CMyCardCircuitPopup.vue +++ b/src/components/CMyCardCircuitPopup/CMyCardCircuitPopup.vue @@ -22,7 +22,7 @@
@@ -59,7 +59,7 @@ {{ tools.getValue(myrec, mycol.field, mycol.subfield) }}
-
+
null) - const filtroutente = ref([]) const stepTut = computed(() => userStore.my.profile.stepTutorial) @@ -134,7 +134,7 @@ export default defineComponent({ icon: 'house', required: true, }, - { + /*{ step: STEP_NAME_SURNAME, // 2 title: t('tutorial.step_nomecognome_title'), extratitle: function () { return ': ' + (contact.value ? tools.getNomeUtenteEUsernameByRecUser(contact.value) : '') }, @@ -143,7 +143,7 @@ export default defineComponent({ checkOkReal: function () { return ((contact.value ? !!contact.value.name : false)) }, icon: 'user', required: false, - }, + },*/ { step: STEP_CIRCUIT, title: t('tutorial.step_circuito_title'), @@ -167,8 +167,8 @@ export default defineComponent({ icon: 'img: images/1ris_rosso_100.png', required: false, }, - { - step: 4, + /*{ + step: 3, title: t('tutorial.step_beniservizi_title'), extratitle: function () { return ': (' + userStore.my.profile.calc.numGoodsAndServices + ')' }, label: t('tutorial.step_beniservizi'), @@ -178,21 +178,21 @@ export default defineComponent({ checkOkReal: function () { return this.checkOk() }, icon: 'fas fa-tshirt', required: false, - }, - { + },*/ + /*{ step: STEP_FOTO, - title: t('tutorial.step_foto_title'), + title: t('tutorial.step_profilo_title'), extratitle: function () { return ': (' + (userStore.my.profile.img ? t('dialog.yes') : t('dialog.no')) + ')' }, - label: t('tutorial.step_foto'), + label: t('tutorial.step_profilo'), checkOk: function () { return !!userStore.my.profile.img }, checkOkReal: function () { return this.checkOk() }, icon: 'fas fa-tshirt', required: false, - }, + },*/ { - step: 6, + step: 3, title: t('tutorial.step_fine_title'), extratitle: function () { return '' }, label: t('tutorial.step_fine'), @@ -382,7 +382,7 @@ export default defineComponent({ } function getColorDone(step: number) { - return arrStep[step - 1].checkOkReal() ? 'positive' : 'negative' + return arrStep[step].checkOkReal() ? 'positive' : 'negative' } onMounted(mounted) @@ -419,6 +419,7 @@ export default defineComponent({ isSalta, askToConfirmSkip, getColorDone, + nascondiavviso, } }, }) diff --git a/src/components/CMyProfileTutorial/CMyProfileTutorial.vue b/src/components/CMyProfileTutorial/CMyProfileTutorial.vue index 47e1e6cb..3bd89ee4 100755 --- a/src/components/CMyProfileTutorial/CMyProfileTutorial.vue +++ b/src/components/CMyProfileTutorial/CMyProfileTutorial.vue @@ -1,14 +1,20 @@