From a831f370692ab58ef0cab61392699d609e2f0ec5 Mon Sep 17 00:00:00 2001
From: Surya Paolo <paolo.arena77@gmail.com>
Date: Mon, 27 Nov 2023 11:13:01 +0100
Subject: [PATCH] Circuito Italia, dettagli...

---
 src/components/CContactUser/CContactUser.vue  | 37 ++++++++++---------
 src/components/CMyCircuit/CMyCircuit.vue      | 10 +++--
 src/components/CMyElem/CMyElem.vue            |  4 +-
 src/components/CMyUser/CMyUser.vue            | 12 +++---
 src/components/CSendCoins/CSendCoins.ts       |  4 +-
 .../CUserInfoAccount/CUserInfoAccount.ts      |  1 +
 .../CUserInfoAccount/CUserInfoAccount.vue     | 12 ++++++
 src/store/Modules/tools.ts                    |  3 +-
 src/views/user/myprofile/myprofile.vue        |  4 +-
 9 files changed, 53 insertions(+), 34 deletions(-)

diff --git a/src/components/CContactUser/CContactUser.vue b/src/components/CContactUser/CContactUser.vue
index c701bae7..64241bae 100755
--- a/src/components/CContactUser/CContactUser.vue
+++ b/src/components/CContactUser/CContactUser.vue
@@ -1,9 +1,25 @@
 <template>
-
   <div class="row justify-evenly items-center q-pa-sm q-ma-sm">
+    <div >
+      <q-btn
+        v-if="
+          userStore.showButtonSendCoin(myuser) &&
+          (myuser.username !== userStore.my.username ||
+            userStore.hoContiCollettiviDaAmministrare() ||
+            userStore.hoContiComunitariDaAmministrare())
+        "
+        icon="fas fa-coins"
+        color="green"
+        size="md"
+        rounded
+        :label="$t('circuit.sendcoins')"
+        @click="clickOpenSendCoin"
+      >
+      </q-btn>
+    </div>
     <div
       v-if="showBtnActivities"
-      class="col-md-6 col-sm-6 q-ma-xs col-xs-12 text-center q-mb-md"
+      
     >
       <q-btn
         icon="fas fa-house-user"
@@ -14,7 +30,7 @@
       >
       </q-btn>
     </div>
-    <div class="q-ma-sx">
+    <div class="q-ma-sm">
       <q-btn
         v-if="getLinkUserTelegram()"
         icon="fab fa-telegram"
@@ -52,21 +68,6 @@
         </q-btn>
       </div>
     </div>
-    <div class="q-ma-sx">
-      <q-btn
-        v-if="
-            userStore.showButtonSendCoin(myuser) &&
-            ((myuser.username !== userStore.my.username) || userStore.hoContiCollettiviDaAmministrare() || userStore.hoContiComunitariDaAmministrare())
-        "
-        icon="fas fa-coins"
-        color="green"
-        size="md"
-        rounded
-        :label="$t('circuit.sendcoins')"
-        @click="clickOpenSendCoin"
-      >
-      </q-btn>
-    </div>
   </div>
   <div v-if="showsendCoinTo || sendRIS > 0">
     <CSendCoins
diff --git a/src/components/CMyCircuit/CMyCircuit.vue b/src/components/CMyCircuit/CMyCircuit.vue
index 448e3c20..1e31a005 100755
--- a/src/components/CMyCircuit/CMyCircuit.vue
+++ b/src/components/CMyCircuit/CMyCircuit.vue
@@ -1,5 +1,6 @@
 <template>
   <div v-if="tools.isUserOk() || noaut">
+
     <div v-if="circuit">
       <q-item
         :class="
@@ -34,21 +35,22 @@
 
         <q-item-section :class="$q.dark.isActive ? `text-white` : `text-black`">
           <q-item-label
+            class="text-center"
             @click="naviga(tools.getPathByTableAndRec(table, circuit))"
             ><strong>{{ circuit.name }}</strong>
             <span v-if="circuit.subname"> ({{ circuit.subname }})</span>
           </q-item-label>
-          <q-item-label
+          <!---<q-item-label
             @click="naviga(tools.getPathByTableAndRec(table, circuit))"
             v-if="circuit.longdescr && circuit.longdescr !== circuit.name"
             caption
             lines="3"
             ><em>{{ circuit.longdescr }}</em>
-          </q-item-label>
+          </q-item-label>-->
           <q-item-label v-if="visu === costanti.ENTER_TO_THE_CIRCUIT" caption>
             <span> Membri: {{ circuit.numMembers }}</span>
           </q-item-label>
-          <q-item-label caption lines="3">
+          <!--<q-item-label caption lines="3">
             <q-chip
               v-if="circuit.status !== undefined && circuit.status !== 0"
               :color="circuitStore.getColorCircuitClass(circuit)"
@@ -85,7 +87,7 @@
                 }}</q-tooltip>
               </q-btn>
             </q-chip>
-          </q-item-label>
+          </q-item-label>-->
           <q-item-label
             v-if="
               !circuit.transactionsEnabled &&
diff --git a/src/components/CMyElem/CMyElem.vue b/src/components/CMyElem/CMyElem.vue
index df88fa0e..babba51c 100755
--- a/src/components/CMyElem/CMyElem.vue
+++ b/src/components/CMyElem/CMyElem.vue
@@ -498,8 +498,8 @@
       <div v-else-if="myel.type === shared_consts.ELEMTYPE.BOTT_CONDIVIDI">
         <div class="row justify-evenly items-center q-pa-sm q-ma-sm">
           <q-btn
-            icon="fas fa-link"
-            color="blue"
+            icon="fas fa-share"
+            text-color="blue"
             type="a"
             size="md"
             :class="
diff --git a/src/components/CMyUser/CMyUser.vue b/src/components/CMyUser/CMyUser.vue
index 2e2fd752..dbe1d26d 100755
--- a/src/components/CMyUser/CMyUser.vue
+++ b/src/components/CMyUser/CMyUser.vue
@@ -401,7 +401,7 @@
                   </q-item-section>
                   <q-item-section>{{ $t('shared.profile') }}</q-item-section>
                 </q-item>
-                <!--<q-item
+                <q-item
                   v-if="
                     userStore.showButtonSendCoin(contact) &&
                     (contact.username !== userStore.my.username ||
@@ -411,13 +411,13 @@
                   clickable
                   v-close-popup
                   dense
-                  @click="showsendCoin(true)"
+                  @click="naviga(`/my/` + contact.username + '?sendris=1')"
                 >
                   <q-item-section avatar>
                     <q-icon color="positive" name="fas fa-coins" />
                   </q-item-section>
                   <q-item-section>{{ $t('circuit.sendcoins') }}</q-item-section>
-                </q-item>-->
+                </q-item>
                 <q-item
                   clickable
                   v-close-popup
@@ -787,7 +787,7 @@
           >
             <q-menu>
               <q-list style="min-width: 200px">
-                <!--<q-item
+                <q-item
                   v-if="
                     userStore.showButtonSendCoin(contact) &&
                     (contact.username !== userStore.my.username ||
@@ -797,13 +797,13 @@
                   clickable
                   v-close-popup
                   dense
-                  @click="showsendCoin(true)"
+                  @click="naviga(`/my/` + contact.username + '?sendris=1')"
                 >
                   <q-item-section avatar>
                     <q-icon color="positive" name="fas fa-coins" />
                   </q-item-section>
                   <q-item-section>{{ $t('circuit.sendcoins') }}</q-item-section>
-                </q-item>-->
+                </q-item>
                                 <q-item
                   clickable
                   v-close-popup
diff --git a/src/components/CSendCoins/CSendCoins.ts b/src/components/CSendCoins/CSendCoins.ts
index 7c153a40..72e5898f 100755
--- a/src/components/CSendCoins/CSendCoins.ts
+++ b/src/components/CSendCoins/CSendCoins.ts
@@ -11,6 +11,7 @@ import { CMyUserOnlyView } from '@/components/CMyUserOnlyView'
 import { CMyGroupOnlyView } from '@/components/CMyGroupOnlyView'
 import { CCheckCircuitsEnabled } from '@/components/CCheckCircuitsEnabled'
 import { costanti } from '@costanti'
+import { useRouter } from 'vue-router'
 
 export default defineComponent({
   name: 'CSendCoins',
@@ -63,6 +64,7 @@ export default defineComponent({
     const showpage = ref(false)
     const userStore = useUserStore()
     const circuitStore = useCircuitStore()
+    const $router = useRouter()
 
     const from_username = ref(userStore.my.username)
     const from_groupname = ref('')
@@ -346,7 +348,7 @@ export default defineComponent({
 
 
         if (myrecsendcoin) {
-          tools.sendCoinsByCircuit($q, circuitloaded.value, myrecsendcoin)
+          tools.sendCoinsByCircuit($q, $router, circuitloaded.value, myrecsendcoin)
             .then((ris: any) => {
               if (ris) {
                 showpage.value = false
diff --git a/src/components/CUserInfoAccount/CUserInfoAccount.ts b/src/components/CUserInfoAccount/CUserInfoAccount.ts
index aa5932f7..f7632922 100755
--- a/src/components/CUserInfoAccount/CUserInfoAccount.ts
+++ b/src/components/CUserInfoAccount/CUserInfoAccount.ts
@@ -137,6 +137,7 @@ export default defineComponent({
       t,
       myaccount,
       save,
+      toolsext,
     }
   },
 })
diff --git a/src/components/CUserInfoAccount/CUserInfoAccount.vue b/src/components/CUserInfoAccount/CUserInfoAccount.vue
index 6ca1c91b..27210b3e 100755
--- a/src/components/CUserInfoAccount/CUserInfoAccount.vue
+++ b/src/components/CUserInfoAccount/CUserInfoAccount.vue
@@ -6,6 +6,18 @@
 
     <q-separator />
 
+    <q-btn
+      text-color="blue"
+      color="white"
+      class="shadow-5 q-mb-xs"
+      dense
+      flat
+      rounded
+      size="md"
+      @click="naviga(tools.getPathByTableAndRec(toolsext.TABCIRCUITS, circuit))"
+    >
+      {{ circuit.name }}
+    </q-btn>
 
     <CSaldo
       v-if="tools.isUserOk() && myaccount"
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index fc9e7eaf..f4f840d8 100644
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -6401,7 +6401,7 @@ export const tools = {
     return extrarec.grouporig ? extrarec.grouporig : (extrarec.contoComOrig ? extrarec.contoComOrig : extrarec.sender)
   },
 
-  async sendCoinsByCircuit($q: any, circuit: ICircuit, sendcoinrec: ISendCoin) {
+  async sendCoinsByCircuit($q: any, $router: any, circuit: ICircuit, sendcoinrec: ISendCoin) {
 
     const userStore = useUserStore()
     const notifStore = useNotifStore()
@@ -6437,6 +6437,7 @@ export const tools = {
             if (res.useraccounts && res.useraccounts.length > 0) {
               userStore.my.profile.useraccounts = res.useraccounts
             }
+            $router.push('/circuit')
             tools.showPositiveNotif($q, t('circuit.coins_sendrequest_sent'))
           } else {
             tools.showNegativeNotif($q, res.errormsg)
diff --git a/src/views/user/myprofile/myprofile.vue b/src/views/user/myprofile/myprofile.vue
index 2168e1b4..81a9ebb3 100755
--- a/src/views/user/myprofile/myprofile.vue
+++ b/src/views/user/myprofile/myprofile.vue
@@ -254,7 +254,7 @@
               >({{ userStore.userprofile.profile.nationality }})</span
             >
           </div>
-          <div v-if="userStore.userprofile._id" class="col-12 text-h8 q-mt-sm">
+          <div v-if="userStore.userprofile.profile.qualifica && userStore.userprofile._id" class="col-12 text-h8 q-mt-sm">
             <span v-if="userStore.userprofile.profile.qualifica">
               <em
                 ><span class="qualifica">{{
@@ -263,7 +263,7 @@
               >
             </span>
           </div>
-          <div v-if="userStore.userprofile._id" class="col-12 text-h8 q-mt-sm">
+          <div v-if="userStore.userprofile._id && userStore.userprofile.profile.biografia" class="col-12 text-h8 q-mt-sm">
             {{ userStore.userprofile.profile.biografia }}
           </div>
           <div>