compare il msg che per uscire dal circuito occorre comprare o vendere RIS.

.env.development

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.35"
+APP_VERSION="1.0.36"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"

.env.example.production

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.35"
+APP_VERSION="1.0.36"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

.env.prod.pcb

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.35"
+APP_VERSION="1.0.36"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="17"
 DIRECTORY_LOCAL=newfreeplanet

.env.test.pcb

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.35"
+APP_VERSION="1.0.36"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="17"
 DIRECTORY_LOCAL=newfreeplanet

.env.test.risosrv

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.35"
+APP_VERSION="1.0.36"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

.env.test_riso.pcb

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.35"
+APP_VERSION="1.0.36"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/fioredellavita.riso.app/.env.development

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.35"
+APP_VERSION="1.0.36"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="15"
 DIRECTORY_LOCAL="newfreeplanet"

_ALL_SITES/fioredellavita.riso.app/.env.test

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.35"
+APP_VERSION="1.0.36"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="15"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/gruppomacro.app/.env.test

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.35"
+APP_VERSION="1.0.36"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/piuchebuono.app/.env.development

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.35"
+APP_VERSION="1.0.36"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="17"
 DIRECTORY_LOCAL="newfreeplanet"

_ALL_SITES/piuchebuono.app/.env.test

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.35"
+APP_VERSION="1.0.36"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/riso.app/.env.development

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.35"
+APP_VERSION="1.0.36"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"

_ALL_SITES/riso.app/.env.production

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.35"
+APP_VERSION="1.0.36"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/riso.app/.env.test

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.35"
+APP_VERSION="1.0.36"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="16"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/terradellavisione.app/.env.development

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.35"
+APP_VERSION="1.0.36"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="14"
 DIRECTORY_LOCAL="newfreeplanet"

deploy_on_production.sh

@@ -19,7 +19,7 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
   echo "Sincronizzazione in remoto..."
 
   echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..."
-  sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
+  sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ suryapaolo@servereng:/var/www/$SERVERDIR_WEBSITE/
   echo "Finito $SERVERDIR_WEBSITE "
 
 fi

send_pwa_to_production.sh

@@ -9,6 +9,6 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
 
 
   echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..."
-  sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -avv --exclude 'upload' dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
+  sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -avv --exclude 'upload' dist/pwa/ suryapaolo@servereng:/var/www/$SERVERDIR_WEBSITE/
   echo "Finito $SERVERDIR_WEBSITE "
 fi

src/components/CMyCircuit/CMyCircuit.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="tools.isUserOk() || noaut">
+  <div v-if="tools.isUserOk() || noaut">  
     <div v-if="circuit">
       <q-item
         :class="
@@ -239,7 +239,7 @@
                   </q-item>
                 </q-list>
                 <q-list
-                  v-else-if="userStore.IsMyCircuitByName(circuit.name)"
+                  v-else-if="userStore.IsMyCircuitByName(circuit.name) && (saldo === 0 || !saldo)"
                   style="min-width: 200px"
                 >
                   <q-item
@@ -259,7 +259,7 @@
                   </q-item>
                 </q-list>
                 <q-list
-                  v-if="tools.iAmAdminCircuit(circuit.name)"
+                  v-if="userStore.isAdmin"
                   style="min-width: 200px"
                 >
                   <q-item
@@ -396,9 +396,10 @@
               <q-item
                 clickable
                 v-close-popup
-                v-if="saldo === 0 || !saldo"
+                v-if="true"
-                @click="
+                @click="(saldo !== 0) ?
-                  tools.removeFromMyCircuits(
+                    tools.showPositiveNotif($q, t('circuit.per_uscire_dal_circuito_occorre_essere_a_zero'), 30000) :
+                    tools.removeFromMyCircuits(
                     $q,
                     userStore.my.username,
                     circuit.name,
@@ -418,7 +419,7 @@
               </q-item>
 
               <q-list
-                v-if="tools.iAmAdminCircuit(circuit.name)"
+                v-if="userStore.isAdmin"
                 style="min-width: 200px"
               >
                 <q-item

src/views/user/mycircuit/mycircuit.vue

@@ -4,9 +4,8 @@
     <div v-if="!circuit && !loading">
       <div v-if="mystatus === 403">
         <h3>
-          Non hai i permessi per accedere al Circuito.<br />
+          Non hai i permessi per accedere al Circuito.
-
+          <br />Occorre prima registrarsi ed accedere alla App
-          Occorre prima registrarsi ed accedere alla App
         </h3>
       </div>
       <div v-else-if="tools.isLogged() && path">
@@ -38,9 +37,7 @@
             <!--:style="tools.displayStyles(myevent) + ` min-width: `+ tools.myheight_dialog() + `px;`">-->
             <q-toolbar-title>
               {{ circuit.name }}
-              <div v-if="groupnameSel">
+              <div v-if="groupnameSel">Gruppo: {{ groupnameSel.groupname }}</div>
-                Gruppo: {{ groupnameSel.groupname }}
-              </div>
             </q-toolbar-title>
             <q-btn flat round color="white" icon="close" v-close-popup></q-btn>
           </q-toolbar>
@@ -48,15 +45,9 @@
             <div v-html="t('circuit.disclaimer')"></div>
           </q-card-section>
           <q-card-section class="inset-shadow">
-            <div style="font-weight: bold; font-size: 1.25rem">
+            <div style="font-weight: bold; font-size: 1.25rem">Regolamento:</div>
-              Regolamento:
+            <q-btn label="vedi Regolamento" @click="showrules = !showrules"></q-btn>
-            </div>
+            <div v-if="showrules && circuit" v-html="getRegulation(circuit.regulation)"></div>
-            <q-btn label="vedi Regolamento" @click="showrules = !showrules">
-            </q-btn>
-            <div
-              v-if="showrules && circuit"
-              v-html="getRegulation(circuit.regulation)"
-            ></div>
           </q-card-section>
           <q-card-actions align="center">
             <q-btn
@@ -65,22 +56,17 @@
               color="positive"
               :label="$t('circuit.acceptregulation')"
               @click="
-                requestToEnterCircuit = false;
+  requestToEnterCircuit = false;
-                tools.setRequestCircuit(
+tools.setRequestCircuit(
-                  $q,
+  $q,
-                  userStore.my.username,
+  userStore.my.username,
-                  circuit.name,
+  circuit.name,
-                  true,
+  true,
-                  groupnameSel ? groupnameSel.groupname : ''
+  groupnameSel ? groupnameSel.groupname : ''
-                );
+);
               "
             />
-            <q-btn
+            <q-btn outline :label="$t('dialog.cancel')" icon="close" v-close-popup></q-btn>
-              outline
-              :label="$t('dialog.cancel')"
-              icon="close"
-              v-close-popup
-            ></q-btn>
           </q-card-actions>
         </q-card>
       </q-dialog>
@@ -89,15 +75,11 @@
           :showprop="showsendCoinTo"
           :circuitname="circuit.name"
           :to_contocom="circuit.path"
-        >
+        ></CSendCoins>
-        </CSendCoins>
       </div>
     </div>
     <div v-if="circuit">
-      <div
+      <div class="absolute-top-right q-mr-sm q-my-md" style="margin-top: 50px !important">
-        class="absolute-top-right q-mr-sm q-my-md"
-        style="margin-top: 50px !important"
-      >
         <div class="column">
           <q-btn
             v-if="userStore.IsMyCircuitByName(circuit.name)"
@@ -106,13 +88,15 @@
             icon="fas fa-ellipsis-h"
             style="z-index: 1"
           >
+          
             <q-menu>
               <q-list v-if="true" style="min-width: 150px">
                 <q-item
                   clickable
                   v-close-popup
-                  v-if="saldo === 0 || !saldo"
+                  v-if="true"
-                  @click="
+                  @click="(saldo !== 0) ?
+                    tools.showPositiveNotif($q, t('circuit.per_uscire_dal_circuito_occorre_essere_a_zero'), 30000) :
                     tools.removeFromMyCircuits(
                       $q,
                       userStore.my.username,
@@ -127,15 +111,14 @@
                   <q-item-section avatar>
                     <q-icon color="negative" name="fas fa-user-minus" />
                   </q-item-section>
-                  <q-item-section>{{
+                  <q-item-section>
-                    $t('circuit.exit_circuit')
+                    {{
-                  }}</q-item-section>
+                      $t('circuit.exit_circuit')
+                    }}
+                  </q-item-section>
                 </q-item>
 
-                <q-list
+                <q-list v-if="userStore.isAdmin" style="min-width: 200px">
-                  v-if="tools.iAmAdminCircuit(circuit.name)"
-                  style="min-width: 200px"
-                >
                   <q-item
                     clickable
                     v-close-popup
@@ -165,23 +148,14 @@
             icon="share"
             style="z-index: 1"
             @click.stop="tools.copyToClip($q, tools.getFullCurrentUrl(), true)"
-          >
+          ></q-btn>
-          </q-btn>
         </div>
       </div>
 
       <div style="align-self: center; vertical-align: middle">
-        <q-btn
+        <q-btn label="Lista Circuiti" to="/circuits" rounded icon="fas fa-arrow-circle-left" />
-          label="Lista Circuiti"
-          to="/circuits"
-          rounded
-          icon="fas fa-arrow-circle-left"
-        />
       </div>
-      <div
+      <div v-if="circuit.name" class="fit column no-wrap justify-evenly items-center content-start">
-        v-if="circuit.name"
-        class="fit column no-wrap justify-evenly items-center content-start"
-      >
         <div class="row justify-center">
           <q-avatar v-if="getImgCircuit()" size="70px">
             <q-img
@@ -193,7 +167,7 @@
             />
           </q-avatar>
           <div class="q-mx-xs text-h6" style="align-self: center">
-            <span v-if="checkifShow('name')"> {{ circuit.name }}</span>
+            <span v-if="checkifShow('name')">{{ circuit.name }}</span>
           </div>
           <div>
             <CSaldo
@@ -204,8 +178,7 @@
               :saldo="saldo_pend"
               :qtarem="account ? qtarem : 0"
               :valueextra="saldo_pend != saldo ? `* ` : ''"
-            >
+            ></CSaldo>
-            </CSaldo>
           </div>
 
           <q-dialog v-model="showMov" :maximized="$q.screen.lt.sm" permanent>
@@ -213,29 +186,16 @@
               <q-bar dense class="bg-primary text-white">
                 {{ t('circuit.movements') }}:
                 <q-space />
-                <q-btn
+                <q-btn flat round color="white" icon="close" v-close-popup></q-btn>
-                  flat
-                  round
-                  color="white"
-                  icon="close"
-                  v-close-popup
-                ></q-btn>
               </q-bar>
               <q-card-section class="q-px-xs inset-shadow">
-                <q-option-group
+                <q-option-group v-model="showwhommov" :options="optionsmov" color="primary" />
-                  v-model="showwhommov"
+                <q-toggle v-model="tabellare" label="Formato Tabella"></q-toggle>
-                  :options="optionsmov"
-                  color="primary"
-                />
-                <q-toggle
-                  v-model="tabellare"
-                  label="Formato Tabella"
-                ></q-toggle>
 
                 <CGridTableRec
                   v-if="tabellare && !loading"
                   prop_mytable="movements"
-                  prop_mytitle=""
+                  prop_mytitle
                   :prop_mycolumns="colmyMovementTable"
                   prop_colkey="_id"
                   col_title="Lista Movimenti"
@@ -252,7 +212,7 @@
                   noresultLabel="movimenti non trovati con questa ricerca"
                   :arrfilters="arrfilterand"
                   :filtercustom="filtercustom_rich"
-                  filterextra=""
+                  filterextra
                   :filterextra2="filterextra2"
                   :prop_searchList="searchList"
                   :prop_pagination="{
@@ -266,14 +226,13 @@
                   :showCol="true"
                   :showHeaderCol="true"
                   :extraparams="extraparams_movs()"
-                  extrafield=""
+                  extrafield
                   :visufind="costanti.FRIENDS"
-                >
+                ></CGridTableRec>
-                </CGridTableRec>
                 <CGridTableRec
                   v-else-if="!loading"
                   prop_mytable="movements"
-                  prop_mytitle=""
+                  prop_mytitle
                   :prop_mycolumns="colmyMovement"
                   prop_colkey="_id"
                   col_title="Lista Movimenti"
@@ -302,21 +261,15 @@
                   :showCol="false"
                   :showHeaderCol="false"
                   :extraparams="extraparams_movs()"
-                  extrafield=""
+                  extrafield
                   :visufind="costanti.FRIENDS"
-                >
+                ></CGridTableRec>
-                </CGridTableRec>
               </q-card-section>
             </q-card>
           </q-dialog>
         </div>
         <div class="text-center">
-          <q-spinner
+          <q-spinner v-if="loadSaldo" color="primary" size="3em" :thickness="2" />
-            v-if="loadSaldo"
-            color="primary"
-            size="3em"
-            :thickness="2"
-          />
         </div>
         <q-btn
           v-if="account && !loadSaldo"
@@ -327,8 +280,7 @@
           icon="fas fa-redo"
           :label="t('movement.updatewallet')"
           @click="aggiornaSaldo()"
-        >
+        ></q-btn>
-        </q-btn>
 
         <div class="q-ma-sm text-center">
           <q-btn
@@ -347,8 +299,8 @@
           class="bg-red text-white"
           style="text-align: center"
         >
-          <em style="font-weight: bold">{{ $t('db.youarerefusedcircuit') }}</em
+          <em style="font-weight: bold">{{ $t('db.youarerefusedcircuit') }}</em>
-          ><br />
+          <br />
         </q-banner>
 
         <br />
@@ -365,9 +317,7 @@
             <template v-slot:avatar>
               <q-icon name="fas fa-info" color="red" size="sm" />
             </template>
-            <span
+            <span v-html="$t('circuit.entra_italia_solo_dopo_aver_fido')"></span>
-              v-html="$t('circuit.entra_italia_solo_dopo_aver_fido')"
-            ></span>
           </q-banner>
           <q-banner
             v-if="circuitStore.IsNationalAndNotEnterInLocal(circuit.name)"
@@ -376,18 +326,15 @@
             style="text-align: center"
           >
             <template v-slot:avatar>
-              <q-icon
+              <q-icon class="vertical-align center" name="fas fa-info" color="white" size="sm" />
-                class="vertical-align center"
-                name="fas fa-info"
-                color="white"
-                size="sm"
-              />
             </template>
 
-            <em style="font-weight: bold">{{
+            <em style="font-weight: bold">
-              $t('circuit.beforeentertolocalcircuit')
+              {{
-            }}</em
+                $t('circuit.beforeentertolocalcircuit')
-            ><br />
+              }}
+            </em>
+            <br />
           </q-banner>
           <q-banner
             v-if="
@@ -404,10 +351,12 @@
               <q-icon name="fas fa-info" color="white" size="sm" />
             </template>
 
-            <em style="font-weight: bold">{{
+            <em style="font-weight: bold">
-              $t('db.insertgoodorservices_to_enter_circuit')
+              {{
-            }}</em
+                $t('db.insertgoodorservices_to_enter_circuit')
-            ><br />
+              }}
+            </em>
+            <br />
           </q-banner>
           <q-banner
             v-else-if="
@@ -419,18 +368,15 @@
             style="text-align: center"
           >
             <template v-slot:avatar>
-              <q-icon
+              <q-icon class="vertical-align center" name="fas fa-info" color="red" size="sm" />
-                class="vertical-align center"
-                name="fas fa-info"
-                color="red"
-                size="sm"
-              />
             </template>
 
-            <em style="font-weight: bold">{{
+            <em style="font-weight: bold">
-              $t('db.insertgoodorservices_to_enter_circuit')
+              {{
-            }}</em
+                $t('db.insertgoodorservices_to_enter_circuit')
-            ><br />
+              }}
+            </em>
+            <br />
           </q-banner>
 
           <div class="centermydiv q-mt-md">
@@ -448,8 +394,8 @@
               color="primary"
               :label="$t('circuit.ask')"
               @click="
-                requestToEnterCircuit = true;
+  requestToEnterCircuit = true;
-                groupnameSel = null;
+groupnameSel = null;
               "
             />
 
@@ -469,17 +415,9 @@
           </div>
         </div>
       </div>
-      <div
+      <div v-if="circuit.name" class="no-wrap justify-evenly items-center content-start">
-        v-if="circuit.name"
-        class="no-wrap justify-evenly items-center content-start"
-      >
         <q-tabs v-model="tabcircuit" class="text-blue" no-caps>
-          <q-tab
+          <q-tab :label="t('shared.info1')" name="info" icon="fas fa-info" @click="loadCircuit()"></q-tab>
-            :label="t('shared.info1')"
-            name="info"
-            icon="fas fa-info"
-            @click="loadCircuit()"
-          ></q-tab>
           <q-tab
             v-if="
               tools.iCanShowCircuitsMember(circuit) ||
@@ -545,12 +483,8 @@
                 <div class="row justify-center">
                   <q-btn rounded icon="fas fa-user-plus" class="text-center">
                     <q-menu>
-                      <q-item> Chiedi di Entrare nei Circuiti: </q-item>
+                      <q-item>Chiedi di Entrare nei Circuiti:</q-item>
-                      <q-list
+                      <q-list v-for="(group, ind) of groupsListAdmin" :key="ind" class="q-pa-sm">
-                        v-for="(group, ind) of groupsListAdmin"
-                        :key="ind"
-                        class="q-pa-sm"
-                      >
                         <q-item
                           v-if="
                             !userStore.IsMyCircuitByNameAndGroup(
@@ -577,8 +511,8 @@
                               color="primary"
                               :label="group.groupname"
                               @click="
-                                requestToEnterCircuit = true;
+  requestToEnterCircuit = true;
-                                groupnameSel = group;
+groupnameSel = group;
                               "
                             />
                             <q-btn
@@ -623,8 +557,7 @@
                               grp.groupname
                             )
                           "
-                        >
+                        ></q-item>
-                        </q-item>
                       </q-list>
                     </q-menu>
                   </q-btn>
@@ -636,7 +569,7 @@
                   v-if="!loading"
                   ref="tabGroups"
                   prop_mytable="mygroups"
-                  prop_mytitle=""
+                  prop_mytitle
                   :prop_mycolumns="
                     showsaldi ? colmyUserPeopleSaldi : colmyUserPeople
                   "
@@ -660,24 +593,23 @@
                   :showType="costanti.SHOW_GROUPINFO"
                   :showCol="false"
                   :circuitname="circuit.name"
-                  extraparams=""
+                  extraparams
                   :visufind="
                     tools.iAmAdminCircuit(circuit.name)
                       ? costanti.REQ_ADD_USER_TO_CIRCUIT
                       : costanti.FIND_GROUP
                   "
-                >
+                ></CGridTableRec>
-                </CGridTableRec>
               </q-tab-panel>
               <q-tab-panel name="rich">
                 {{ $t('circuit.richieste_title') }}
                 <CGridTableRec
                   v-if="!loading"
                   prop_mytable="circuits"
-                  prop_mytitle=""
+                  prop_mytitle
                   :prop_mycolumns="colmyUserGroup"
                   prop_colkey="_id"
-                  col_title=""
+                  col_title
                   :vertical="costanti.VISUTABLE_GROUP_CIRCUIT"
                   nodataLabel="Nessuna Richiesta Collettiva in sospeso"
                   :prop_search="false"
@@ -697,17 +629,16 @@
                   :extraparams="extraparams_rich_groups()"
                   :circuitname="circuit.name"
                   :visufind="costanti.REQ_ADD_GROUP_TO_CIRCUIT"
-                >
+                ></CGridTableRec>
-                </CGridTableRec>
               </q-tab-panel>
               <q-tab-panel name="refused">
                 <CGridTableRec
                   v-if="!loading"
                   prop_mytable="circuits"
-                  prop_mytitle=""
+                  prop_mytitle
                   :prop_mycolumns="colmyUserGroup"
                   prop_colkey="_id"
-                  col_title=""
+                  col_title
                   :vertical="costanti.VISUTABLE_GROUP_CIRCUIT"
                   nodataLabel="Nessun Conto di Gruppo Rifiutato"
                   :prop_search="false"
@@ -727,8 +658,7 @@
                   :extraparams="extraparams_refused_groups()"
                   :circuitname="circuit.name"
                   :visufind="costanti.REQ_ADD_GROUP_TO_CIRCUIT"
-                >
+                ></CGridTableRec>
-                </CGridTableRec>
               </q-tab-panel>
             </q-tab-panels>
           </q-tab-panel>
@@ -752,10 +682,7 @@
 
                   <q-card-section>
                     <div class="col-12 text-h8">
-                      <span
+                      <span v-if="checkifShow('descr')" v-html="circuit.longdescr"></span>
-                        v-if="checkifShow('descr')"
-                        v-html="circuit.longdescr"
-                      ></span>
                     </div>
                   </q-card-section>
 
@@ -777,11 +704,7 @@
                         })
                       }}:
                       <div class="row justify-center">
-                        <q-icon
+                        <q-icon name="fas fa-hand-point-right" class="iconcirc" size="lg"></q-icon>
-                          name="fas fa-hand-point-right"
-                          class="iconcirc"
-                          size="lg"
-                        ></q-icon>
 
                         <q-btn
                           v-if="circuit.link_group"
@@ -795,8 +718,7 @@
                           "
                           :href="circuit.link_group"
                           target="__blank"
-                        >
+                        ></q-btn>
-                        </q-btn>
                       </div>
                     </span>
                   </div>
@@ -808,12 +730,7 @@
                     }}
                   </div>
                   <div v-for="(user, index) of circuit.admins" :key="index">
-                    <CMyUser
+                    <CMyUser :mycontact="user" :visu="costanti.FIND_PEOPLE" @setCmd="tools.setCmd"></CMyUser>
-                      :mycontact="user"
-                      :visu="costanti.FIND_PEOPLE"
-                      @setCmd="tools.setCmd"
-                    >
-                    </CMyUser>
                   </div>
                   <div class="sezioni">
                     <q-icon name="fas fa-coins" class="iconcirc"></q-icon>
@@ -825,8 +742,7 @@
                           `background-color: ` +
                           tools.getColorByCircuit(circuit)
                         "
-                        >{{ tools.getSymbolByCircuit(circuit) }}</em
+                      >{{ tools.getSymbolByCircuit(circuit) }}</em>
-                      >
                     </span>
                   </div>
                   <div :class="$q.screen.lt.sm ? '' : 'row'">
@@ -839,8 +755,7 @@
                         icon="fas fa-battery-quarter"
                         :label="t('circuit.fido_scoperto_default')"
                         :tips="t('circuit.fido_scoperto_default_tips')"
-                      >
+                      ></CCurrencyValue>
-                      </CCurrencyValue>
                     </div>
                     <div class="sezioni">
                       <CCurrencyValue
@@ -851,8 +766,7 @@
                         icon="fas fa-battery-quarter"
                         :label="t('circuit.qta_max_default')"
                         :tips="t('circuit.qta_max_default_tips')"
-                      >
+                      ></CCurrencyValue>
-                      </CCurrencyValue>
                     </div>
                     <!--<div v-if="circuit.qta_max_default_grp" class="sezioni">
                         <CCurrencyValue
@@ -878,11 +792,12 @@
                         >
                         </CCurrencyValue>
                       </div>
-                      -->
+                    -->
                   </div>
                   <div class="sezioni">
                     <q-icon name="fas fa-stats" class="iconcirc"></q-icon>
-                    {{ t('circuit.stats') }}:<br />
+                    {{ t('circuit.stats') }}:
+                    <br />
                   </div>
                   <div :class="$q.screen.lt.sm ? '' : 'row'">
                     <div v-if="circuit.totTransato" class="sezioni">
@@ -894,8 +809,7 @@
                         icon="fas fa-battery-quarter"
                         :label="t('circuit.totTransato')"
                         :tips="t('circuit.totTransato_tips')"
-                      >
+                      ></CCurrencyValue>
-                      </CCurrencyValue>
                     </div>
                     <div v-if="circuit.totCircolante" class="sezioni">
                       <CCurrencyValue
@@ -906,21 +820,21 @@
                         icon="fas fa-battery-quarter"
                         :label="t('circuit.totCircolante')"
                         :tips="t('circuit.totCircolante_tips')"
-                      >
+                      ></CCurrencyValue>
-                      </CCurrencyValue>
                     </div>
                   </div>
                   <div class="sezioni">
                     <q-icon name="fas fa-toggle-on" class="iconcirc"></q-icon>
                     {{ t('circuit.transactionsEnabled') }}:
-                    <span class="text-section"
+                    <span class="text-section">
-                      >{{
+                      {{
                         circuit.transactionsEnabled
                           ? t('dialog.yes')
                           : t('dialog.no')
                       }}
                       {{
-                    }}</span>
+                      }}
+                    </span>
                   </div>
                   <!--<div
                       class="sezioni"
@@ -937,7 +851,7 @@
                         }}
                         {{
                       }}</span>
-                    </div>-->
+                  </div>-->
                 </q-card-section>
               </q-card>
 
@@ -952,11 +866,7 @@
 
               <q-card-section>
                 <div class="centermydiv">
-                  <q-btn
+                  <q-btn label="vedi Regolamento" @click="showrules = !showrules"></q-btn>
-                    label="vedi Regolamento"
-                    @click="showrules = !showrules"
-                  >
-                  </q-btn>
                 </div>
                 <div class="col-12 text-h8">
                   <span
@@ -977,16 +887,18 @@
                 v-if="
                   !!circuit.date_updated &&
                   tools.getstrDate(circuit.date_updated) !==
-                    tools.getstrDate(circuit.date_created)
+                  tools.getstrDate(circuit.date_created)
                 "
                 class="container text-h8"
               >
                 <q-icon name="fas fa-pencil-alt" class="iconcirc"></q-icon>
-                <span class="element text-h8">{{
+                <span class="element text-h8">
-                  $t('shared.lastmodify', {
+                  {{
-                    date: tools.getstrDateYY(circuit.date_updated),
+                    $t('shared.lastmodify', {
-                  })
+                      date: tools.getstrDateYY(circuit.date_updated),
-                }}</span>
+                    })
+                  }}
+                </span>
                 <br />
               </div>
               <br />
@@ -1002,10 +914,7 @@
             </div>
           </q-tab-panel>
 
-          <q-tab-panel
+          <q-tab-panel name="members" v-if="tools.iCanShowCircuitsMember(circuit)">
-            name="members"
-            v-if="tools.iCanShowCircuitsMember(circuit)"
-          >
             <q-tabs
               v-show="tools.iAmAdminCircuit(circuit.name)"
               v-model="tabmembers"
@@ -1035,10 +944,10 @@
                 <CGridTableRec
                   v-if="!loading"
                   prop_mytable="circuits"
-                  prop_mytitle=""
+                  prop_mytitle
                   :prop_mycolumns="colmyUserPeople"
                   prop_colkey="_id"
-                  col_title=""
+                  col_title
                   :vertical="costanti.VISUTABLE_USER_TABCIRCUIT"
                   nodataLabel="Nessuna Richiesta in sospeso"
                   :prop_search="false"
@@ -1058,17 +967,16 @@
                   :extraparams="extraparams_rich()"
                   :circuitname="circuit.name"
                   :visufind="costanti.REQ_ADD_USER_TO_CIRCUIT"
-                >
+                ></CGridTableRec>
-                </CGridTableRec>
               </q-tab-panel>
               <q-tab-panel name="refused">
                 <CGridTableRec
                   v-if="!loading"
                   prop_mytable="circuits"
-                  prop_mytitle=""
+                  prop_mytitle
                   :prop_mycolumns="colmyUserPeople"
                   prop_colkey="_id"
-                  col_title=""
+                  col_title
                   :vertical="costanti.VISUTABLE_USER_TABCIRCUIT"
                   nodataLabel="Nessun utente Rifiutato"
                   :prop_search="false"
@@ -1088,8 +996,7 @@
                   :extraparams="extraparams_refused()"
                   :circuitname="circuit.name"
                   :visufind="costanti.REQ_ADD_USER_TO_CIRCUIT"
-                >
+                ></CGridTableRec>
-                </CGridTableRec>
               </q-tab-panel>
             </q-tab-panels>
           </q-tab-panel>
@@ -1097,9 +1004,7 @@
             <q-card v-if="circuit.name">
               <q-card-section>
                 <div class="text-h7">{{ t('circuit.contocomunitario') }}:</div>
-                <div class="text-h8 q-mb-sm">
+                <div class="text-h8 q-mb-sm">{{ $t('circuit.info_contocom') }}</div>
-                  {{ $t('circuit.info_contocom') }}
-                </div>
               </q-card-section>
               <q-separator />
 
@@ -1120,14 +1025,13 @@
                       :qtarem="
                         circuit.account
                           ? circuitStore.getRemainingCoinsToSend(
-                              circuit.account
+                            circuit.account
-                            )
+                          )
                           : 0
                       "
-                    >
+                    ></CSaldo>
-                    </CSaldo>
                   </span>
-                  <div class="">
+                  <div class>
                     <q-btn
                       icon="fas fa-coins"
                       color="green"
@@ -1135,8 +1039,7 @@
                       rounded
                       :label="$t('circuit.sendcoins_tocom')"
                       @click="showsendCoinTo = true"
-                    >
+                    ></q-btn>
-                    </q-btn>
                   </div>
                 </div>
               </q-card-section>
@@ -1147,7 +1050,7 @@
           <CGridTableRec
             v-if="!loading && tabmembers === 'all' && tabcircuit === 'members'"
             prop_mytable="users"
-            prop_mytitle=""
+            prop_mytitle
             :prop_mycolumns="showsaldi ? colmyUserPeopleSaldi : colmyUserPeople"
             prop_colkey="_id"
             col_title="username"
@@ -1178,27 +1081,16 @@
                 ? costanti.REQ_ADD_USER_TO_CIRCUIT
                 : costanti.FIND_PEOPLE
             "
-          >
+          ></CGridTableRec>
-          </CGridTableRec>
         </div>
       </div>
-      <div
+      <div v-else class="fit column no-wrap justify-evenly items-center content-start">
-        v-else
+        <q-skeleton type="QAvatar" size="140px" height="140px" animation="fade" />
-        class="fit column no-wrap justify-evenly items-center content-start"
-      >
-        <q-skeleton
-          type="QAvatar"
-          size="140px"
-          height="140px"
-          animation="fade"
-        />
         <q-card flat bordered style="width: 250px">
           <div class="text-h7">
             <q-skeleton :animation="animation" />
           </div>
-          <div class="col-12 text-h8 text-grey text-center">
+          <div class="col-12 text-h8 text-grey text-center">{{ path }}</div>
-            {{ path }}
-          </div>
           <div class="col-12 text-h8">
             <q-skeleton :animation="animation" />
           </div>
@@ -1222,6 +1114,6 @@
 </script>
 
 <style lang="scss" scoped>
-@import './mycircuit.scss';
+@import "./mycircuit.scss";
 </style>