From 686dc585e652bc79317cc5cad5b915a27c330132 Mon Sep 17 00:00:00 2001
From: Surya Paolo <paolo.arena77@gmail.com>
Date: Sat, 3 Dec 2022 03:14:19 +0100
Subject: [PATCH] =?UTF-8?q?Attivare=20gli=20scambi=20RIS=20solo=20se=20si?=
 =?UTF-8?q?=20=C3=A8=20aggiunto=20almeno=201=20bene=20o=201=20servizio.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CMyUser/CMyUser.vue           |  5 ++-
 src/components/CSaldo/CSaldo.vue             |  1 -
 src/components/MyHeader/MyHeader.vue         | 37 ++++++++++------
 src/model/UserStore.ts                       |  5 +++
 src/statics/lang/it.js                       |  1 +
 src/store/UserStore.ts                       |  2 +
 src/views/user/myactivities/myactivities.vue | 45 ++++++++++----------
 src/views/user/mycircuit/mycircuit.vue       | 20 ++++++++-
 src/views/user/myprofile/myprofile.vue       |  4 +-
 9 files changed, 79 insertions(+), 41 deletions(-)

diff --git a/src/components/CMyUser/CMyUser.vue b/src/components/CMyUser/CMyUser.vue
index 5484085c..7637991c 100755
--- a/src/components/CMyUser/CMyUser.vue
+++ b/src/components/CMyUser/CMyUser.vue
@@ -31,11 +31,11 @@
 
 
         <q-btn
-          v-if="userStore.IsMyCircuitByUser(contact).length > 0 && contact.username !== userStore.my.username"
+          v-if="userStore.IsMyCircuitByUser(contact).length > 0 && contact.username !== userStore.my.username && userStore.my.profile.calc.numGoodsAndServices > 0"
           icon="fas fa-coins"
           color="green"
           size="md"
-          rounded
+          dense
           @click="showsendCoinTo = true"
         >
         </q-btn>
@@ -271,6 +271,7 @@
         <q-item-label>
 
           <q-btn v-if="contact.username !== userStore.my.username" rounded
+                 dense
                  :icon="userStore.IsMyFriendByUsername(contact.username) ? `fas fa-ellipsis-h` : `fas fa-user`">
             <q-menu>
               <q-list style="min-width: 200px">
diff --git a/src/components/CSaldo/CSaldo.vue b/src/components/CSaldo/CSaldo.vue
index 43bb1f3e..b1daf633 100755
--- a/src/components/CSaldo/CSaldo.vue
+++ b/src/components/CSaldo/CSaldo.vue
@@ -1,5 +1,4 @@
 <template>
-symbol: {{symbol}}
   <CCurrencyValue
     v-if="small"
     :small="true"
diff --git a/src/components/MyHeader/MyHeader.vue b/src/components/MyHeader/MyHeader.vue
index c8813c6c..17b5cf87 100755
--- a/src/components/MyHeader/MyHeader.vue
+++ b/src/components/MyHeader/MyHeader.vue
@@ -68,14 +68,14 @@
                         </div>
         -->
 
-        <div v-if="site.confpages && site.confpages.show_darkopt" class="text-h7">
+        <div
+          v-if="site.confpages && site.confpages.show_darkopt"
+          class="text-h7"
+        >
           <q-toggle :icon="'fas fa-moon'" v-model="dark"> </q-toggle>
         </div>
         <q-btn
-          v-if="
-            !isonline() &&
-            site.confpages && site.confpages.showConnected
-          "
+          v-if="!isonline() && site.confpages && site.confpages.showConnected"
           flat
           dense
           round
@@ -129,7 +129,9 @@
 
         <q-btn
           class="q-mx-xs"
-          v-if="site.confpages && site.confpages.enableEcommerce && tools.isLogged()"
+          v-if="
+            site.confpages && site.confpages.enableEcommerce && tools.isLogged()
+          "
           round
           dense
           flat
@@ -149,7 +151,8 @@
         <q-btn
           class="q-mx-xs"
           v-if="
-            site.confpages && site.confpages.enableEcommerce &&
+            site.confpages &&
+            site.confpages.enableEcommerce &&
             tools.isLogged() &&
             getnumOrdersCart() > 0
           "
@@ -171,7 +174,9 @@
 
         <q-btn
           class="q-mx-xs"
-          v-if="site.confpages && site.confpages.showUserMenu && !tools.isLogged()"
+          v-if="
+            site.confpages && site.confpages.showUserMenu && !tools.isLogged()
+          "
           dense
           flat
           round
@@ -181,7 +186,8 @@
         </q-btn>
         <q-avatar
           v-else-if="
-            site.confpages && site.confpages.showUserMenu &&
+            site.confpages &&
+            site.confpages.showUserMenu &&
             tools.isLogged() &&
             getMyImg()
           "
@@ -209,7 +215,6 @@
           :color="getcolormenu()"
         >
         </q-btn>
-
       </q-toolbar>
     </q-header>
 
@@ -372,8 +377,16 @@
               color="primary"
               icon="person"
               :to="`/my/` + getMyUsername()"
-              >{{ t('pages.profile') }}</q-btn
-            >
+              >{{ t('pages.profile') }}
+            </q-btn>
+            <q-btn
+              v-if="site.confpages && site.confpages.showCompetenze"
+              rounded
+              color="orange"
+              icon="house"
+              :to="`/skills/` + getMyUsername()"
+              > &nbsp;{{ t('otherpages.myactivities') }}
+            </q-btn>
             <!--<q-btn round color="warning" icon="lock"></q-btn>-->
             <q-btn
               rounded
diff --git a/src/model/UserStore.ts b/src/model/UserStore.ts
index 169dd685..09608700 100755
--- a/src/model/UserStore.ts
+++ b/src/model/UserStore.ts
@@ -106,6 +106,11 @@ export interface IUserProfile {
   refused_circuits: any[]
   manage_mycircuits: ICircuit[]
   useraccounts: IAccount[]
+  calc?: ICalc
+}
+
+export interface ICalc{
+  numGoodsAndServices?: number
 }
 
 export interface IPaymentType {
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index c4c00032..c27d3a1c 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -217,6 +217,7 @@ const msg_it = {
       refusedgroup: 'Rifiutato a {username} la richiesta di entrare nel Gruppo',
       youarerefusedgroup: 'Ti è stato rifiutata la richiesta di entrare in questo Gruppo (per info chiedi all\'amministratore del gruppo)',
       youarerefusedcircuit: 'Ti è stato rifiutata la richiesta di entrare in questo Circuito (per info chiedi all\'amministratore del gruppo)',
+      insertgoodorservices_to_start_circuit: 'Per poter inviare monete è necessario aggiungere almeno un Bene o Servizio, con la voglia di proporsi ed accettare i RIS come scambio.',
       deletedgroup: 'Gruppo Eliminato',
       domanda_addtofriend: 'Aggiungere agli amici {username}?',
       domanda_addtogroup: 'Aggiungi {username} al gruppo {groupname}?',
diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts
index 356e9cff..e9391a25 100755
--- a/src/store/UserStore.ts
+++ b/src/store/UserStore.ts
@@ -81,6 +81,7 @@ export const DefaultUser: IUserFields = {
     refused_circuits: [],
     manage_mycircuits: [],
     useraccounts: [],
+    calc: { numGoodsAndServices: 0 },
   },
   cart: {
     userId: '',
@@ -139,6 +140,7 @@ export const DefaultProfile: IUserProfile = {
   refused_circuits: [],
   manage_mycircuits: [],
   useraccounts: [],
+  calc: { numGoodsAndServices: 0 },
 }
 
 export const useUserStore = defineStore('UserStore', {
diff --git a/src/views/user/myactivities/myactivities.vue b/src/views/user/myactivities/myactivities.vue
index d2963e8e..8b8462f1 100755
--- a/src/views/user/myactivities/myactivities.vue
+++ b/src/views/user/myactivities/myactivities.vue
@@ -31,29 +31,6 @@
           v-if="myuser && myuser.date_reg"
           class="fit column no-wrap justify-evenly items-center content-start"
         >
-          <div class="">
-            <q-avatar size="140px">
-              <q-img
-                :src="getImgUser()"
-                :alt="username"
-                img-class="imgprofile"
-                height="140px"
-                @click="showPic = true"
-              />
-            </q-avatar>
-          </div>
-          <div v-if="site.confpages.showNameSurname">
-            <div class="text-h6">
-              <span v-if="checkifShow('name')"> {{ myuser.name }}</span> <span v-if="checkifShow('surname')">{{
-                myuser.surname
-              }}</span>
-            </div>
-          </div>
-          <div class="col-12 text-h7 text-blue text-shadow-2">
-            {{ myuser.username }}
-          </div>
-
-
           <CTitleBanner
             v-if="site.confpages.showCompetenze"
             class=""
@@ -63,6 +40,28 @@
             myclass="myshad"
             :canopen="true"
           >
+            <div
+              class="
+                fit
+                column
+                no-wrap
+                justify-evenly
+                items-center
+                content-start
+              "
+            >
+              <div v-if="site.confpages.showNameSurname">
+                <div class="text-h6">
+                  <span v-if="checkifShow('name')"> {{ myuser.name }}</span>
+                  <span v-if="checkifShow('surname')">{{
+                    myuser.surname
+                  }}</span>
+                </div>
+              </div>
+              <div class="col-12 text-h7 text-blue text-shadow-2">
+                {{ myuser.username }}
+              </div>
+            </div>
             <q-select
               v-model="actualcard"
               :options="optionsMainCards"
diff --git a/src/views/user/mycircuit/mycircuit.vue b/src/views/user/mycircuit/mycircuit.vue
index e54be0e6..a8bc161d 100755
--- a/src/views/user/mycircuit/mycircuit.vue
+++ b/src/views/user/mycircuit/mycircuit.vue
@@ -1,6 +1,5 @@
 <template>
   <CNotifAtTop/>
-  circuit: {{circuit}}
   <div class="q-gutter-sm q-pa-sm q-pb-md">
     <div v-if="!circuit && !loading">
       <div v-if="mystatus === 403">
@@ -46,6 +45,25 @@
             <em style="font-weight: bold">{{ $t('db.youarerefusedcircuit') }}</em><br>
           </q-banner>
 
+
+          <q-banner
+            v-if="userStore.my.profile.calc.numGoodsAndServices <= 0"
+            rounded
+            class="bg-orange text-white"
+            style="text-align: center;"
+          >
+                    <template v-slot:avatar>
+            <q-icon
+              name="fas fa-exclamation-triangle"
+              color="yellow"
+              size="xs"
+            />
+          </template>
+
+            <em style="font-weight: bold">{{ $t('db.insertgoodorservices_to_start_circuit') }}</em><br>
+          </q-banner>
+          <br>
+
           <CSaldo
             :symbol="circuit.symbol"
             :account="account"
diff --git a/src/views/user/myprofile/myprofile.vue b/src/views/user/myprofile/myprofile.vue
index f25780eb..400ea66f 100755
--- a/src/views/user/myprofile/myprofile.vue
+++ b/src/views/user/myprofile/myprofile.vue
@@ -158,7 +158,7 @@
               <q-btn
                 icon="fas fa-house-user"
                 size="md"
-                color="red"
+                color="orange"
                 :label="$t('profile.myactivities')"
                 :to="`/skills/` + myusername()"
                 >
@@ -167,7 +167,7 @@
             </div>
             <div class="col-md-6 col-sm-6 q-ma-xs col-xs-12">
               <q-btn
-                v-if="userStore.IsMyCircuitByUser(myuser).length > 0 && myuser.username !== myusername()"
+                v-if="userStore.IsMyCircuitByUser(myuser).length > 0 && myuser.username !== myusername() && userStore.my.profile.calc.numGoodsAndServices > 0"
                 icon="fas fa-coins"
                 color="green"
                 size="md"