From 6a42df78613182edb580415a5a843ed2d38a4f61 Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Fri, 9 Dec 2022 03:09:16 +0100 Subject: [PATCH] Aggio App --- .env.development | 2 +- .env.example.production | 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 +- .../CGridTableRec/CGridTableRec.vue | 1398 ++++++++--------- src/components/CMyRecCard/CMyRecCard.ts | 5 + src/components/CMyRecCard/CMyRecCard.vue | 3 +- .../CMyRecGrpCard/CMyRecGrpCard.vue | 2 +- .../CRegistration/CRegistration.vue | 4 +- src/components/CSkill/CSkill.vue | 2 +- src/statics/lang/it.js | 3 +- src/store/Modules/fieldsTable.ts | 2 +- src/store/UserStore.ts | 27 +- src/views/user/myactivities/myactivities.vue | 2 +- 16 files changed, 736 insertions(+), 724 deletions(-) diff --git a/.env.development b/.env.development index caf1698e..97e95f1f 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.30" +APP_VERSION="0.5.31" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index 7504d346..e234f5ea 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.30" +APP_VERSION="0.5.31" 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 caf1698e..97e95f1f 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.30" +APP_VERSION="0.5.31" 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 94fac606..e6a42f80 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.30" +APP_VERSION="0.5.31" 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 5206755b..80400835 100755 --- a/_ALL_SITES/riso.app/.env.test +++ b/_ALL_SITES/riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="0.5.30" +APP_VERSION="0.5.31" SERVICE_WORKER_FILE="service-worker.js" APP_ID="16" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/terradellavisione.app/.env.development b/_ALL_SITES/terradellavisione.app/.env.development index 3023cb3c..4e84adaa 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.30" +APP_VERSION="0.5.31" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL="newfreeplanet" diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index 37b35a43..d0da150c 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -310,761 +310,740 @@ /> - - - +
+
-
-
- - {{ col.label }} - -
-
+ + {{ col.label }} + +
+
-
+
+
+
-
{{ + (actual = tools.getstrVeryShortDate(row.dateTimeStart)) + }} + {{ tools.getstrDateLong(row.dateTimeStart) }} -
- {{ - (actual = tools.getstrVeryShortDate(row.dateTimeStart)) - }} - {{ tools.getstrDateLong(row.dateTimeStart) }} -
-
- - - - - - - -
-
-
- - - - -
-
-
-
- -
-
-
-
- - - - {{ - tools.isEntrataByRecMov(row) - ? t('movement.movin') - : t('movement.movout') - }} - - - -
-
-
- - -
-
-
-
-
-
- - - + + + + + +
+
- - - - - + +
+ - - - + - - - - - + + + - Nuovo: @@ -1316,7 +1296,9 @@ - {{ rec.descr }} @@ -51,7 +50,7 @@ {{ myrec.descr }}
- {{ myrec.username }} - + {{ getNameToShow(myrec) }} - , {{ rec.comune }} ({{ rec.prov }}) diff --git a/src/components/CMyRecGrpCard/CMyRecGrpCard.vue b/src/components/CMyRecGrpCard/CMyRecGrpCard.vue index 3df6f035..32f5d157 100755 --- a/src/components/CMyRecGrpCard/CMyRecGrpCard.vue +++ b/src/components/CMyRecGrpCard/CMyRecGrpCard.vue @@ -41,7 +41,7 @@ - {{ myrec.username }} - + {{ getNameToShow(myrec) }} - , {{ rec.comune }}
diff --git a/src/components/CRegistration/CRegistration.vue b/src/components/CRegistration/CRegistration.vue index e51e38e3..562d7388 100755 --- a/src/components/CRegistration/CRegistration.vue +++ b/src/components/CRegistration/CRegistration.vue @@ -21,8 +21,8 @@ outline icon="fas fa-envelope" size="md" - color="black" - text-color="white" + :color="$q.dark.isActive ? `black` : `white`" + :text-color="$q.dark.isActive ? `white` : `black`" to="/signup" :label="$t('reg.byemail')" > diff --git a/src/components/CSkill/CSkill.vue b/src/components/CSkill/CSkill.vue index 741cadce..c027e59e 100755 --- a/src/components/CSkill/CSkill.vue +++ b/src/components/CSkill/CSkill.vue @@ -1,4 +1,4 @@ -