From 1291ad319f6ff33d434ccc4a9c96fe5c989e8f51 Mon Sep 17 00:00:00 2001
From: Surya Paolo <paolo.arena77@gmail.com>
Date: Thu, 15 Dec 2022 18:09:50 +0100
Subject: [PATCH] fix Richieste e Rifiutati (Circuiti)

---
 .env.development                                  |  2 +-
 .env.example.production                           |  2 +-
 _ALL_SITES/riso.app/.env.development              |  2 +-
 _ALL_SITES/riso.app/.env.production               |  2 +-
 _ALL_SITES/terradellavisione.app/.env.development |  2 +-
 src/components/CMyUser/CMyUser.vue                |  4 +++-
 src/views/user/mycircuit/mycircuit.vue            |  7 +------
 src/views/user/myprofile/myprofile.ts             | 10 +++++-----
 src/views/user/myprofile/myprofile.vue            | 10 +++++-----
 9 files changed, 19 insertions(+), 22 deletions(-)

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 @@
 
       <q-item-section @click="naviga(`/my/` + contact.username)">
         <q-item-label v-if="labelextra && (labelextra !== contact.username)"><strong>{{ labelextra }}</strong></q-item-label>
-        <q-item-label><span class="username">{{ contact.username }}</span> <span v-if="contact.name">({{ contact.name }} {{ contact.surname }})</span>
+        <q-item-label v-if="contact.name"><span class="username">{{ contact.name }} <span v-if="contact.surname">{{ contact.surname }}</span></span>  ({{ contact.username }})
+        </q-item-label>
+        <q-item-label v-else><span class="username">{{ contact.username }}</span> <span v-if="contact.name">({{ contact.name }} {{ contact.surname }})</span>
         </q-item-label>
         <q-item-label v-if="contact.reported" caption lines="1"><em style="color: red; font-weight: bold">{{ $t('db.reporteduser', {date_report: tools.getstrDateTimeShort(contact.date_report)}) }}</em></q-item-label>
         <q-item-label v-if="contact.profile" caption lines="1"><em>{{ contact.profile.qualifica }}</em></q-item-label>
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 @@
                 </q-tab-panel>
                 <q-tab-panel name="refused">
                   <CGridTableRec
+                    v-if="!loading"
                     prop_mytable="circuits"
                     prop_mytitle=""
                     :prop_mycolumns="colmyUserPeople"
@@ -634,11 +631,9 @@
                     noresultLabel="Username non trovato"
                     :arrfilters="arrfilterand"
                     :filtercustom="filtercustom_rich"
-                    :filterextra="filterextra"
                     :filterextra2="filterextra2"
                     :prop_searchList="searchList"
                     :showType="costanti.SHOW_USERINFO"
-                    keyMain=""
                     :showCol="false"
                     :extraparams="extraparams_refused()"
                     :circuitname="circuit.name"
diff --git a/src/views/user/myprofile/myprofile.ts b/src/views/user/myprofile/myprofile.ts
index b1af03e4..fc36e024 100755
--- a/src/views/user/myprofile/myprofile.ts
+++ b/src/views/user/myprofile/myprofile.ts
@@ -153,13 +153,13 @@ export default defineComponent({
 
     function getLinkWebSite() {
       if (myuser.value) {
-        let site = myuser.value.profile.website!
-        if (site) {
-          if (!site.startsWith('http')) {
-            site = 'https://' + site
+        let mysite = myuser.value.profile.website!
+        if (mysite) {
+          if (!mysite.startsWith('http')) {
+            mysite = 'https://' + mysite
           }
         }
-        return site
+        return mysite
       } else {
         return ''
       }
diff --git a/src/views/user/myprofile/myprofile.vue b/src/views/user/myprofile/myprofile.vue
index 805ba2d9..cbdf677a 100755
--- a/src/views/user/myprofile/myprofile.vue
+++ b/src/views/user/myprofile/myprofile.vue
@@ -1,9 +1,9 @@
 <template>
   <div v-if="isDebugOn" class="bg-red text-white">
-    Logged: {{tools.isLogged()}}
-    UserOk: {{tools.isUserOk()}}
-    caricato: {{caricato}}
-    myuser: {{myuser.username}}
+    <div v-if="!!tools.isLogged()">Logged: {{tools.isLogged()}}</div>
+    <div v-if="!!tools.isUserOk()">UserOk: {{tools.isUserOk()}}</div>
+    <div v-if="caricato">caricato: {{caricato}}</div>
+    <div v-if="myuser">myuser: {{myuser.username}}</div>
   </div>
   <div v-if="!tools.isLogged()">
     <CCheckIfIsLogged></CCheckIfIsLogged>
@@ -73,7 +73,7 @@
             </CTitleBanner>
           </div>
 
-          <div v-if="site.confpages.showNameSurname">
+          <div v-if="site && site.confpages && site.confpages.showNameSurname">
             <div class="text-h6">
               <span v-if="checkifShow('name') && myuser.name"> {{ myuser.name }}</span>
               <span v-if="checkifShow('surname') && myuser.surname">{{ myuser.surname }}</span>