Riso: Ris Italia, altre modifiche grafiche

Lista Utenti da Verificare

src/components/CSendRISTo/CSendRISTo.ts

@@ -4,6 +4,7 @@ import { ICalcStat, IOperators } from '../../model'
 import { useUserStore } from '../../store/UserStore'
 import { useRouter } from 'vue-router'
 import { useGlobalStore } from '../../store/globalStore'
+import { useCircuitStore } from '../../store/CircuitStore'
 import { useI18n } from '../../boot/i18n'
 
 import { shared_consts } from '@src/common/shared_vuejs'
@@ -23,6 +24,7 @@ export default defineComponent({
 
     const userStore = useUserStore()
     const globalStore = useGlobalStore()
+    const circuitStore = useCircuitStore()
     const { t } = useI18n()
     const $q = useQuasar()
     const $router = useRouter()
@@ -34,7 +36,10 @@ export default defineComponent({
 
     const tipoConto = ref(costanti.AccountType.USER)
     const loading = ref(false)
-    const circuitpath = computed(() => userStore.my.profile.last_circuitpath)
+    const circuitpath = computed(() => {
+      const circ = circuitStore.getCircuitByProvinceAndCard(userStore.my.profile.resid_province, userStore.my.profile.resid_card)
+      return circ && circ.path ? circ.path : ''
+    })
 
     const contact = computed(() => userStore.my)
 

src/components/CSendRISTo/CSendRISTo.vue

@@ -1,15 +1,9 @@
 <template>
   <div class="row text-center justify-evenly items-center">
-      <CUserInfoAccount
-        :user="contact"
-        :circuitpath="circuitpath"
-        :admin="false"
-        :onlysaldo="true"
-      />
     <div class="q-mb-sm">
       <q-btn
         icon="fas fa-upload"
-        color="primary"
+        color="positive"
         size="md"
         rounded
         :label="$t('circuit.sendcoins_toso')"
@@ -19,13 +13,21 @@
       &nbsp;
       <q-btn
         icon="fas fa-download"
-        color="primary"
+        color="accent"
         size="md"
         rounded
         :label="$t('circuit.receive_coins')"
         @click="tools.receiveRis($q, $t)"
       >
       </q-btn>
+      <div class="q-mb-sm"></div>
+
+      <CUserInfoAccount
+        :user="contact"
+        :circuitpath="circuitpath"
+        :admin="false"
+        :onlysaldo="true"
+      />
     </div>
   </div>
   <q-dialog v-model="usersList.show">
@@ -83,7 +85,6 @@
           <div
             v-else-if="tipoConto === costanti.AccountType.COLLECTIVE_ACCOUNT"
           >
-
             <div v-for="(grp, i) in usersList.listgroup" :key="i">
               <CMyGroup :mygrp="grp" :visu="costanti.USER_GROUPS" :noaut="true">
               </CMyGroup>