diff --git a/.env.development b/.env.development index f0d8c69d..2b1cd38b 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.36" +APP_VERSION="0.5.39" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index 32632558..ccfd0be7 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.36" +APP_VERSION="0.5.39" 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 f0d8c69d..2b1cd38b 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.36" +APP_VERSION="0.5.39" 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 250c0392..7944ac8b 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.36" +APP_VERSION="0.5.39" 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 b4f28a02..4429a14f 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.36" +APP_VERSION="0.5.39" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL="newfreeplanet" diff --git a/src/components/CMyUser/CMyUser.vue b/src/components/CMyUser/CMyUser.vue index 7637991c..5a3e5561 100755 --- a/src/components/CMyUser/CMyUser.vue +++ b/src/components/CMyUser/CMyUser.vue @@ -9,7 +9,9 @@ {{ labelextra }} - {{ contact.username }} ({{ contact.name }} {{ contact.surname }}) + {{ contact.name }} {{ contact.surname }} ({{ contact.username }}) + + {{ contact.username }} ({{ contact.name }} {{ contact.surname }}) {{ $t('db.reporteduser', {date_report: tools.getstrDateTimeShort(contact.date_report)}) }} {{ contact.profile.qualifica }} diff --git a/src/views/user/mycircuit/mycircuit.vue b/src/views/user/mycircuit/mycircuit.vue index 900169d5..44b7cc31 100755 --- a/src/views/user/mycircuit/mycircuit.vue +++ b/src/views/user/mycircuit/mycircuit.vue @@ -262,7 +262,6 @@ rowsPerPage: 20, }" :showType="costanti.SHOW_MOVEMENTS" - keyMain="" :showCol="true" :showHeaderCol="true" :extraparams="extraparams_movs()" @@ -299,7 +298,6 @@ rowsPerPage: 20, }" :showType="costanti.SHOW_MOVEMENTS" - keyMain="" :showCol="false" :showHeaderCol="false" :extraparams="extraparams_movs()" @@ -602,12 +600,10 @@ :butt_modif_new="false" noresultLabel="Username non trovato" :arrfilters="arrfilterand" - :filterextra="filterextra" :filterextra2="filterextra2" :filtercustom="filtercustom_rich" :prop_searchList="searchList" :showType="costanti.SHOW_USERINFO" - keyMain="" :showCol="false" :extraparams="extraparams_rich()" :circuitname="circuit.name" @@ -617,6 +613,7 @@
- Logged: {{tools.isLogged()}} - UserOk: {{tools.isUserOk()}} - caricato: {{caricato}} - myuser: {{myuser.username}} +
Logged: {{tools.isLogged()}}
+
UserOk: {{tools.isUserOk()}}
+
caricato: {{caricato}}
+
myuser: {{myuser.username}}
@@ -73,7 +73,7 @@
-
+
{{ myuser.name }} {{ myuser.surname }}