Filtra Ricerca...

src/components/CBarSelection/CBarSelection.ts

@@ -100,6 +100,7 @@ export default defineComponent({
     const serverData: any = ref([])
     const numRecLoaded = ref(0)
     const changetable = ref(false)
+    const filtri = ref(false)
     const searchList = ref([] as ISearchList[])
 
     const actual = ''
@@ -349,6 +350,7 @@ export default defineComponent({
       createNewRecordDialog,
       toHome,
       iconsel,
+      filtri,
     }
   }
 })

src/components/CBarSelection/CBarSelection.vue

@@ -3,7 +3,7 @@
     :class="$q.screen.lt.sm ? `` : `q-pa-xs`"
     v-if="isfinishLoading && mycolumns"
   >
-    <q-layout view="hHh lpR fFf" :class="`shadow-2 rounded-borders `">
+    <div :class="`shadow-2 rounded-borders`">
       <div>
         <div v-if="prop_search || canEdit" class="q-my-xs text-right">
           <q-btn
@@ -15,9 +15,7 @@
           ></q-btn>
         </div>
         <q-slide-transition>
-          <div class="row no-wrap shadow-1">
+          <div class="row no-wrap shadow-1" style="height: 40px;">
-            <q-header elevated reveal>
-              <q-toolbar class="glossy" style="">
             <div v-if="$q.screen.gt.xs" class="col-1">
               <q-avatar @click="toHome" class="imglink">
                 <img
@@ -29,11 +27,12 @@
             </div>
             <div class="col-4">
               <q-select
+                dense
                 v-model="tablesel"
                 :options="optionsMainCards"
-                    dark
                 emit-value
                 borderless
+                class="text-blue"
                 map-options
                 :behavior="$q.platform.is.ios === true ? 'dialog' : 'menu'"
                 @update:model-value="gotoPageSel"
@@ -56,7 +55,7 @@
                 </template>
               </q-select>
             </div>
-                <q-space />
+
             <!--<q-btn
                   size="sm"
                   class="col-1 q-mx-xs"
@@ -64,6 +63,9 @@
                   @click="createNewRecordDialog"
                 >
                 </q-btn>-->
+            <q-btn v-if="false" color="green" label="Filtra la ricerca">
+              <q-popup-proxy>
+                <q-banner class="bg-brown text-white">
                   <div
                     class="col"
                     v-for="(item, index) in searchList"
@@ -90,8 +92,10 @@
                           ? item.tablesel
                           : ''
                       "
-                    :pickup="item.type === costanti.FieldType.select_by_server"
+                      :pickup="
-                    label-color="white"
+                        item.type === costanti.FieldType.select_by_server
+                      "
+                      :label-color="$q.dark.isActive ? 'white' : 'black'"
                       myclass="comboselector"
                       color="primary"
                       dark
@@ -172,7 +176,9 @@
                       >
                         <div
                           v-if="
-                          scope.opt[fieldsTable.getLabelByTable(item.table)] ||
+                            scope.opt[
+                              fieldsTable.getLabelByTable(item.table)
+                            ] ||
                             (scope.opt && checkIfShowRec(scope.opt))
                           "
                         >
@@ -181,13 +187,13 @@
                             dense
                             @remove="scope.removeAtIndex(scope.index)"
                             v-if="checkIfShowRec(scope.opt)"
-                          color="white"
+                            :color="$q.dark.isActive ? 'white' : 'black'"
                             text-color="mycol"
                             class="q-my-none q-ml-xs q-mr-none"
                           >
                             <q-avatar
                               color="primary"
-                            text-color="white"
+                              :text-color="$q.dark.isActive ? 'white' : 'black'"
                               :icon="item.icon"
                               size="12px"
                             />
@@ -200,7 +206,12 @@
                         </div>
                       </template>
                       <template
-                      v-slot:option="{ itemProps, opt, selected, toggleOption }"
+                        v-slot:option="{
+                          itemProps,
+                          opt,
+                          selected,
+                          toggleOption,
+                        }"
                       >
                         <q-item v-bind="itemProps">
                           <q-item-section>
@@ -218,15 +229,16 @@
                       </template>
                     </q-select>
                   </div>
-              </q-toolbar>
+                </q-banner>
-            </q-header>
+              </q-popup-proxy>
+            </q-btn>
           </div>
         </q-slide-transition>
       </div>
-      <div class="q-my-md">
+      <div class="q-my-xs">
         <slot />
       </div>
-    </q-layout>
+    </div>
   </div>
 </template>
 <script lang="ts" src="./CBarSelection.ts">

src/components/CFinder/CFinder.ts

@@ -326,18 +326,6 @@ export default defineComponent({
 
 
       searchList_Servizi.value = [
-        {
-          label: 'Stato',
-          table: 'statusSkills',
-          key: 'idStatusSkill',
-          value: 0,
-          arrvalue: tools.getCookie(tools.COOK_SEARCH + 'statusSkills', []),
-          type: costanti.FieldType.multiselect,
-          filter: null,
-          useinput: false,
-          icon: 'mood',
-          filteradv: true,
-        },
         {
           label: 'Regione',
           table: 'regions',
@@ -377,7 +365,7 @@ export default defineComponent({
           // param1: shared_consts.PARAM_SHOW_PROVINCE,
           tablesel: 'cities',
         },
-        {
+        /*{
           label: 'Visibilità',
           table: 'pub_to_share',
           key: 'pub_to_share',
@@ -387,18 +375,7 @@ export default defineComponent({
           arrvalue: [],
           useinput: false,
           filter: null,
-        },
+        },*/
-        {
-          label: 'Offro/Cerco',
-          table: 'adtypes',
-          key: 'adType',
-          value: tools.getCookie(tools.COOK_SEARCH + 'adtypes', costanti.FILTER_TUTTI, true),
-          arrvalue: [],
-          addall: true,
-          type: costanti.FieldType.select,
-          filter: null,
-          useinput: false,
-        },
         {
           label: 'Settore',
           table: toolsext.TABSECTORS,
@@ -411,6 +388,17 @@ export default defineComponent({
           notinsearch: true,
           useinput: false,
         },
+        {
+          label: 'Offro/Cerco',
+          table: 'adtypes',
+          key: 'adType',
+          value: tools.getCookie(tools.COOK_SEARCH + 'adtypes', costanti.FILTER_TUTTI, true),
+          arrvalue: [],
+          addall: true,
+          type: costanti.FieldType.select,
+          filter: null,
+          useinput: false,
+        },
         {
           label: 'Categoria',
           table: 'skills',
@@ -456,6 +444,18 @@ export default defineComponent({
 
 
          */
+        {
+          label: 'Stato',
+          table: 'statusSkills',
+          key: 'idStatusSkill',
+          value: 0,
+          arrvalue: tools.getCookie(tools.COOK_SEARCH + 'statusSkills', []),
+          type: costanti.FieldType.multiselect,
+          filter: null,
+          useinput: false,
+          icon: 'mood',
+          filteradv: true,
+        },
         {
           label: 'In cambio di',
           table: 'contribtypes',
@@ -490,7 +490,7 @@ export default defineComponent({
       ]
 
       searchList_Events.value = [
-        {
+        /*{
           label: 'Stato',
           table: 'statusSkills',
           key: 'idStatusSkill',
@@ -501,7 +501,7 @@ export default defineComponent({
           useinput: false,
           icon: 'mood',
           filteradv: false,
-        },
+        },*/
         {
           label: 'Regione',
           table: 'regions',
@@ -540,7 +540,7 @@ export default defineComponent({
           // param1: shared_consts.PARAM_SHOW_PROVINCE,
           tablesel: 'cities',
         },
-        {
+        /*{
           label: 'Visiblità',
           table: 'pub_to_share',
           key: 'pub_to_share',
@@ -551,7 +551,7 @@ export default defineComponent({
           useinput: true,
           filter: null,
           tablesel: 'pub_to_share',
-        },
+        },*/
         {
           label: 'Data Inizio',
           table: 'caldate',
@@ -736,7 +736,7 @@ export default defineComponent({
           // param1: shared_consts.PARAM_SHOW_PROVINCE,
           tablesel: 'cities',
         },
-        {
+        /*{
           label: 'Visiblità',
           table: 'pub_to_share',
           key: 'pub_to_share',
@@ -747,7 +747,7 @@ export default defineComponent({
           useinput: true,
           filter: null,
           tablesel: 'pub_to_share',
-        },
+        },*/
         {
           label: 'Offro/Cerco',
           table: 'adtypes',

src/components/CGridTableRec/CGridTableRec.ts

@@ -20,6 +20,7 @@ import { lists } from '@store/Modules/lists'
 import { IParamsQuery } from 'model'
 import { CMyPopupEdit } from '../CMyPopupEdit'
 import { CMyFriends } from '../CMyFriends'
+import { CNotifSettings } from '../CNotifSettings'
 import { CMyUser } from '../CMyUser'
 import { CMyGroups } from '../CMyGroups'
 import { CMyFieldDb } from '../CMyFieldDb'
@@ -293,7 +294,7 @@ export default defineComponent({
   components: {
     CMyPopupEdit, CTitleBanner, CMyFieldDb, CMySelect, CMyFriends, CMyGroups,
     CMyUser, CMyRecCard, CMyCardPopup, CMyRecGrpCard, CMyCardGrpPopup, CMyCardCircuitPopup,
-    CMyRecCircuitCard, CMyCardService
+    CMyRecCircuitCard, CMyCardService, CNotifSettings
   },
   setup(props, { emit }) {
     const $q = useQuasar()
@@ -312,6 +313,7 @@ export default defineComponent({
     const newRecord: any = ref({})
     const recSaved: any = ref({})
     const recModif: any = ref({})
+    const showInnerDialog: any = ref(false)
 
     const mytable = ref('')
     const mytitle = ref('')
@@ -321,6 +323,7 @@ export default defineComponent({
 
     const tablesel = ref('')
     const showSpin = ref(false)
+    const showNotification = ref(false)
 
     const loading = ref(false)
     const editOn = computed({
@@ -387,6 +390,11 @@ export default defineComponent({
       // console.log('valoriopt', item.table)
       return globalStore.getTableJoinByName(item.table, addall, addnone, item.filter)
     })
+    const lengthopt = computed(() => (item: any, addall: boolean, addnone: boolean) => {
+      // console.log('valoriopt', item.table)
+      const valori = globalStore.getTableJoinByName(item.table, addall, addnone, item.filter)
+      return (valori ? valori.length : 0)
+    })
 
     const labelcombo = computed(() => (item: any) => {
       let lab = item.label
@@ -2150,6 +2158,7 @@ export default defineComponent({
     }
 
     function onLoadScroll(index: number, done: any) {
+
       if (index > 1) {
         // console.log('onLoadScroll', index, 'RECLOAD', numRecLoaded.value, 'ROWS: ', pagination.value.rowsNumber, 'PAGE: ', pagination.value.page)
         if (numRecLoaded.value < pagination.value.rowsNumber || (pagination.value.rowsNumber <= 0 && clickbuttsearch.value)) {
@@ -2228,9 +2237,9 @@ export default defineComponent({
       }
     }
 
-    function showNotification() {
+    /*function showNotification() {
       $router.push('/notifs')
-    }
+    } */
 
     created()
     mounted()
@@ -2333,6 +2342,8 @@ export default defineComponent({
       ordinam_desc,
       getNumFilterSelected,
       rowsel,
+      showInnerDialog,
+      lengthopt,
     }
   }
 })

src/components/CGridTableRec/CGridTableRec.vue

@@ -87,8 +87,9 @@
               <CMySelect
                 :col="fieldsTable.getColByColumns(mycolumns, item.key)"
                 v-if="
-                  item.type === costanti.FieldType.select ||
+                  (item.type === costanti.FieldType.select ||
-                  item.type === costanti.FieldType.select_by_server
+                  item.type === costanti.FieldType.select_by_server)
+                  && lengthopt(item, false) > 1
                 "
                 :label="labelcombo(item)"
                 v-model:value="item.value"
@@ -122,7 +123,7 @@
             </div>-->
 
               <CMySelect
-                v-if="item.type === costanti.FieldType.multiselect_by_server"
+                v-if="item.type === costanti.FieldType.multiselect_by_server && lengthopt(item, false) > 1"
                 :col="fieldsTable.getColByColumns(mycolumns, item.key)"
                 :multiselect_by_server="true"
                 :label="labelcombo(item)"
@@ -229,23 +230,11 @@
         v-if="prop_search || canEdit"
         class="row justify-center vertical-middle"
       >
-        <div v-if="prop_search" class="q-mr-sm full-width">
+        <div class="row justify-around q-mb-sm">
-          <q-input
+          <div v-if="searchList && finder">
-            v-model="search"
-            filled
-            dense
-            type="search"
-            debounce="500"
-            :hint="hint"
-            label="Cerca"
-            v-on:keyup.enter="doSearch"
-          >
-            <template v-slot:prepend>
-              <q-icon name="search" />
-            </template>
-            <template v-if="searchList && finder" v-slot:before>
             <q-btn
               dense
+              label="Filtra Ricerca"
               color="positive"
               icon="fas fa-filter"
               @click="showfilter = !showfilter"
@@ -263,8 +252,24 @@
               dense
               color="orange"
               icon="fas fa-bell"
-                @click="showNotification"
+              label="Avvisami se..."
+              @click="showNotification = !showNotification"
             ></q-btn>
+          </div>
+        </div>
+        <div v-if="prop_search" class="q-mr-sm full-width">
+          <q-input
+            v-model="search"
+            filled
+            dense
+            type="search"
+            debounce="500"
+            :hint="hint"
+            label="Cerca"
+            v-on:keyup.enter="doSearch"
+          >
+            <template v-slot:prepend>
+              <q-icon name="search" />
             </template>
             <template v-slot:after>
               <q-select
@@ -376,7 +381,9 @@
           <div v-if="row && shared_consts.TABLES_WITH_DATE.includes(tablesel)">
             <div
               v-if="
-                actmonth !== tools.getstrMonth(row.dateTimeStart) || !actmonth || index === 0
+                actmonth !== tools.getstrMonth(row.dateTimeStart) ||
+                !actmonth ||
+                index === 0
               "
             >
               <span style="display: none">{{
@@ -393,7 +400,8 @@
             </div>
 
             <div
-              v-if="false &&
+              v-if="
+                false &&
                 ((row.dateTimeStart &&
                   tools.getstrVeryShortDate(row.dateTimeStart) !== actual) ||
                   index === 0)
@@ -457,6 +465,7 @@
                   ? tools.getLabelFooterByRow(row, col_footer, tablesel)
                   : ''
               "
+              @showInnerDialog="showInnerDialog"
             >
             </CMyUser>
 
@@ -1404,7 +1413,22 @@
     </q-dialog>
     <span v-if="!hidetitleIfEmpty"> <br /></span>
   </div>
+  <q-dialog v-model="showNotification" :maximized="$q.screen.lt.sm">
+    <q-card class="dialog_card">
+      <q-toolbar class="bg-primary text-white">
+        <q-toolbar-title>
+          Notifiche
+        </q-toolbar-title>
+        <q-btn flat round color="white" icon="close" v-close-popup></q-btn>
+      </q-toolbar>
+
+      <q-card-section class="inset-shadow">
+        <CNotifSettings> </CNotifSettings>
+      </q-card-section>
+    </q-card>
+  </q-dialog>
 </template>
+
 <script lang="ts" src="./CGridTableRec.ts">
 </script>
 

src/components/CMyUser/CMyUser.ts

@@ -15,7 +15,7 @@ import { useCircuitStore } from '@store/CircuitStore'
 export default defineComponent({
   name: 'CMyUser',
   components: { CSendCoins, CSaldo, CUserInfoAccount },
-  emits: ['setCmd'],
+  emits: ['setCmd', 'showInnerDialog'],
   props: {
     mycontact: {
       type: Object as PropType<IUserFields | null>,
@@ -111,6 +111,11 @@ export default defineComponent({
       }
     }
 
+    function showsendCoin(value: boolean) {
+      showsendCoinTo.value = value
+      emit('showInnerDialog', showsendCoinTo.value)
+    }
+
     onMounted(mounted)
 
     return {
@@ -125,6 +130,7 @@ export default defineComponent({
       circuit,
       showAccountInfo,
       showsendCoinTo,
+      showsendCoin,
     }
   },
 })

src/components/CMyUser/CMyUser.vue

@@ -391,6 +391,17 @@
             <q-menu>
               <q-list v-if="true" style="min-width: 150px">
                 <q-item
+                  clickable
+                  v-close-popup
+                  dense
+                  @click="naviga(`/my/` + contact.username)"
+                >
+                  <q-item-section avatar>
+                    <q-icon color="primary" name="fas fa-user" />
+                  </q-item-section>
+                  <q-item-section>{{ $t('shared.profile') }}</q-item-section>
+                </q-item>
+                <!--<q-item
                   v-if="
                     userStore.showButtonSendCoin(contact) &&
                     (contact.username !== userStore.my.username ||
@@ -400,13 +411,13 @@
                   clickable
                   v-close-popup
                   dense
-                  @click="showsendCoinTo = true"
+                  @click="showsendCoin(true)"
                 >
                   <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
@@ -776,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 ||
@@ -786,13 +797,25 @@
                   clickable
                   v-close-popup
                   dense
-                  @click="showsendCoinTo = true"
+                  @click="showsendCoin(true)"
                 >
                   <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
+                  clickable
+                  v-close-popup
+                  dense
+                  @click="naviga(`/my/` + contact.username)"
+                >
+                  <q-item-section avatar>
+                    <q-icon color="primary" name="fas fa-user" />
+                  </q-item-section>
+                  <q-item-section>{{ $t('shared.profile') }}</q-item-section>
                 </q-item>
+
                 <q-item
                   v-if="
                     costanti.ENABLE_FRIENDS &&
@@ -979,12 +1002,13 @@
       </q-item-section>
     </q-item>
   </div>
-  <div v-if="showsendCoinTo && contact">
+  <div v-if="contact">
     <CSendCoins
+      v-if="showsendCoinTo"
       :showprop="showsendCoinTo"
       :to_user="contact"
       :circuitname="circuitname"
-      @close="showsendCoinTo = false"
+      @close="showsendCoin(false)"
     >
     </CSendCoins>
   </div>

src/components/CNotifSettings/CNotifSettings.vue

@@ -35,21 +35,21 @@
                 <div
                   v-if="tools.isBitActive(getnotifbydir(shared_consts.TypeNotifs.TYPEDIR_BACHECA), shared_consts.UsersNotif.NEW_ADV_SECTOR)">
                   <CMyFieldDb
-                    :title="$t('sectors.sector_general')"
+                    :title="$t('sectors.sector_goods_select')"
-                    table="users"
-                    mykey="profile"
-                    mysubkey="notif_sectors"
-                    :jointable="toolsext.TABSECTORS"
-                    :type="costanti.FieldType.multiselect">
-                  </CMyFieldDb>
-                  <CMyFieldDb
-                    :title="$t('sectors.sector_goods')"
                     table="users"
                     mykey="profile"
                     mysubkey="notif_sector_goods"
                     :jointable="toolsext.TABSECTORGOODS"
                     :type="costanti.FieldType.multiselect">
                   </CMyFieldDb>
+                  <CMyFieldDb
+                    :title="$t('sectors.sector_select')"
+                    table="users"
+                    mykey="profile"
+                    mysubkey="notif_sectors"
+                    :jointable="toolsext.TABSECTORS"
+                    :type="costanti.FieldType.multiselect">
+                  </CMyFieldDb>
                 </div>
                 <div
                   v-if="tools.isBitActive(getnotifbydir(shared_consts.TypeNotifs.TYPEDIR_BACHECA), shared_consts.UsersNotif.NEW_ADV_REGION)">

src/components/CSendCoins/CSendCoins.ts

@@ -240,7 +240,7 @@ export default defineComponent({
       }
     }
 
-    function mounted() {
+    async function mounted() {
 
       arrTypesAccounts.value = [
         {
@@ -259,13 +259,13 @@ export default defineComponent({
         } else {
           circuitsel.value = tools.getCookie(tools.CIRCUIT_USE, bothcircuits.value[0])
         }
-        if (!userStore.IsMyCircuitByName(circuitsel.value)) {
+        if (bothcircuits.value && bothcircuits.value.find((name: any) => name !== circuitsel.value)) {
           circuitsel.value = bothcircuits.value[0]
         }
 
         qty.value = props.qtydefault
 
-        aggiorna()
+        await aggiorna()
 
         showpage.value = true
       }
@@ -283,7 +283,7 @@ export default defineComponent({
           circuitsel.value = bothcircuits.value[0]
         }
 
-        aggiorna()
+        await aggiorna()
 
         showpage.value = true
       }
@@ -296,7 +296,7 @@ export default defineComponent({
           circuitsel.value = bothcircuits.value[0]
         }
 
-        aggiorna()
+        await aggiorna()
 
         showpage.value = true
       }

src/components/CSendCoins/CSendCoins.vue

@@ -82,9 +82,7 @@
               <!-- Mostra i gruppi su cui sei Admin -->
             </q-select>
           </div>
-            <div
+          <div v-else-if="tipoConto === costanti.AccountType.COMMUNITY_ACCOUNT">
-              v-else-if="tipoConto === costanti.AccountType.COMMUNITY_ACCOUNT"
-            >
             <q-input
               v-model="from_contocom"
               :label="$t('circuit.contocom')"
@@ -221,7 +219,8 @@
               :min="0"
               :max="Number(maxsendable ? maxsendable : 0)"
             />
-          --></div>
+          -->
+        </div>
 
         <q-input
           ref="causalRef"

src/statics/lang/it.js

@@ -867,7 +867,7 @@ const msg_it = {
     },
     typenotifs: {
       new_rec_bacheca: 'Annunci',
-      new_rec_bacheca_descr: 'Avvisami se:',
+      new_rec_bacheca_descr: 'Avvisami quando viene aggiunto un Annuncio:',
       friends: 'Richieste di Amicizia',
       groups: 'Gruppi',
       friends_descr: 'Avvisami se:',
@@ -1050,7 +1050,9 @@ const msg_it = {
     sectors: {
       name: 'Settore',
       sector_general: 'Settori',
+      sector_select: 'Scegli i Settori Preferiti',
       sector_goods: 'Settori dei Beni',
+      sector_goods_select: 'Scegli i Settori Preferiti dei Beni',
     },
     catgrps: {
       name: 'Categoria',
@@ -1136,6 +1138,7 @@ const msg_it = {
       subscribes: 'Membri',
       cancel_ask: 'Annulla la richiesta',
       refuse_ask: 'Rifiuta la richiesta',
+      profile: 'Apri Profilo',
       cancel_ask_short: 'Annulla richiesta',
       refuse_ask_short: 'Rifiuta la richiesta',
       member: 'membro',

src/views/user/mycircuit/mycircuit.ts

@@ -86,6 +86,8 @@ export default defineComponent({
 
     const cities = ref([] as ICity[])
 
+    const fidoConcesso = computed(() => account.value ? account.value.fidoConcesso : circuit.value!.fido_scoperto_default)
+    const qtaMax = computed(() => account.value ? account.value.qta_maxConcessa : circuit.value!.qta_max_default)
 
     watch(() => path.value, (to: any, from: any) => {
       loadCircuit()
@@ -496,6 +498,8 @@ export default defineComponent({
       extraparams_rich_groups,
       extraparams_refused_groups,
       getRegulation,
+      fidoConcesso,
+      qtaMax,
     }
   }
 })

src/views/user/mycircuit/mycircuit.vue

@@ -22,6 +22,77 @@
       <div v-if="!tools.isLogged()">
         <CCheckIfIsLogged></CCheckIfIsLogged>
       </div>
+      <q-dialog v-model="showPic" full-height full-width>
+        <img :src="getImgCircuit()" :alt="circuit.name" class="full-width" />
+      </q-dialog>
+
+      <q-dialog
+        v-model="requestToEnterCircuit"
+        maximized
+        transition-show="slide-up"
+        transition-hide="slide-down"
+      >
+        <q-card v-if="circuit" class="dialog_card">
+          <q-toolbar class="bg-primary text-white" dense>
+            <!--<q-toolbar :class="tools.displayClasses(myevent)"-->
+            <!--:style="tools.displayStyles(myevent) + ` min-width: `+ tools.myheight_dialog() + `px;`">-->
+            <q-toolbar-title>
+              {{ circuit.name }}
+              <div v-if="groupnameSel">
+                Gruppo: {{ groupnameSel.groupname }}
+              </div>
+            </q-toolbar-title>
+            <q-btn flat round color="white" icon="close" v-close-popup></q-btn>
+          </q-toolbar>
+          <q-card-section class="inset-shadow">
+            <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">
+              Regolamento:
+            </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
+              class="centeritems"
+              icon="fas fa-user-plus"
+              color="positive"
+              :label="$t('circuit.acceptregulation')"
+              @click="
+                requestToEnterCircuit = false;
+                tools.setRequestCircuit(
+                  $q,
+                  userStore.my.username,
+                  circuit.name,
+                  true,
+                  groupnameSel ? groupnameSel.groupname : ''
+                );
+              "
+            />
+            <q-btn
+              outline
+              :label="$t('dialog.cancel')"
+              icon="close"
+              v-close-popup
+            ></q-btn>
+          </q-card-actions>
+        </q-card>
+      </q-dialog>
+      <div v-if="showsendCoinTo">
+        <CSendCoins
+          :showprop="showsendCoinTo"
+          :circuitname="circuit.name"
+          :to_contocom="circuit.path"
+        >
+        </CSendCoins>
+      </div>
+    </div>
     <div v-if="circuit">
       <div style="align-self: center; vertical-align: middle">
         <q-btn
@@ -66,9 +137,7 @@
           class="bg-red text-white"
           style="text-align: center"
         >
-            <em style="font-weight: bold">{{
+          <em style="font-weight: bold">{{ $t('db.youarerefusedcircuit') }}</em
-              $t('db.youarerefusedcircuit')
-            }}</em
           ><br />
         </q-banner>
 
@@ -200,11 +269,7 @@
               outline
               :label="$t('shared.cancel_ask_short')"
               @click="
-                  tools.cancelReqCircuit(
+                tools.cancelReqCircuit($q, userStore.my.username, circuit.name)
-                    $q,
-                    userStore.my.username,
-                    circuit.name
-                  )
               "
             />
           </div>
@@ -410,7 +475,7 @@
                 </CGridTableRec>
               </q-tab-panel>
               <q-tab-panel name="rich">
-                  {{$t('circuit.richieste_title')}}
+                {{ $t('circuit.richieste_title') }}
                 <CGridTableRec
                   v-if="!loading"
                   prop_mytable="circuits"
@@ -626,9 +691,7 @@
                     <q-icon name="fas fa-user-cog" class="iconcirc"></q-icon>
                     <span class="element">{{ numAdmins() }}</span>
                     {{
-                        numAdmins() === 1
+                      numAdmins() === 1 ? t('shared.admin') : t('shared.admins')
-                          ? t('shared.admin')
-                          : t('shared.admins')
                     }}
                   </div>
                   <div v-for="(user, index) of circuit.admins" :key="index">
@@ -659,7 +722,7 @@
                         :symbol="tools.getSymbolByCircuit(circuit)"
                         :color="tools.getColorByCircuit(circuit)"
                         color_border="red"
-                          v-model="circuit.fido_scoperto_default"
+                        v-model="fidoConcesso"
                         icon="fas fa-battery-quarter"
                         :label="t('circuit.fido_scoperto_default')"
                         :tips="t('circuit.fido_scoperto_default_tips')"
@@ -671,14 +734,14 @@
                         :symbol="tools.getSymbolByCircuit(circuit)"
                         :color="tools.getColorByCircuit(circuit)"
                         color_border="green"
-                          v-model="circuit.qta_max_default"
+                        v-model="qtaMax"
                         icon="fas fa-battery-quarter"
                         :label="t('circuit.qta_max_default')"
                         :tips="t('circuit.qta_max_default_tips')"
                       >
                       </CCurrencyValue>
                     </div>
-                      <div v-if="circuit.qta_max_default_grp" class="sezioni">
+                    <!--<div v-if="circuit.qta_max_default_grp" class="sezioni">
                         <CCurrencyValue
                           :symbol="tools.getSymbolByCircuit(circuit)"
                           :color="tools.getColorByCircuit(circuit)"
@@ -702,6 +765,7 @@
                         >
                         </CCurrencyValue>
                       </div>
+                      -->
                   </div>
                   <div class="sezioni">
                     <q-icon name="fas fa-stats" class="iconcirc"></q-icon>
@@ -814,9 +878,7 @@
             </q-card>
             <q-card v-if="circuit.name">
               <q-card-section>
-                  <div class="text-h6">
+                <div class="text-h6">{{ t('circuit.contocomunitario') }}:</div>
-                    {{ t('circuit.contocomunitario') }}:
-                  </div>
                 <div class="text-h7 q-mb-sm">
                   {{ $t('circuit.info_contocom') }}
                 </div>
@@ -960,9 +1022,9 @@
           </q-tab-panel>
           <q-tab-panel name="mov"> </q-tab-panel>
         </q-tab-panels>
+        <div>
           <CGridTableRec
             v-if="!loading && tabmembers === 'all' && tabcircuit === 'members'"
-            ref="tabMembri"
             prop_mytable="users"
             prop_mytitle=""
             :prop_mycolumns="showsaldi ? colmyUserPeopleSaldi : colmyUserPeople"
@@ -998,6 +1060,7 @@
           >
           </CGridTableRec>
         </div>
+      </div>
       <div
         v-else
         class="fit column no-wrap justify-evenly items-center content-start"
@@ -1028,78 +1091,6 @@
         </q-card>
       </div>
     </div>
-      <q-dialog v-model="showPic" full-height full-width>
-        <img :src="getImgCircuit()" :alt="circuit.name" class="full-width" />
-      </q-dialog>
-
-      <q-dialog
-        v-model="requestToEnterCircuit"
-        maximized
-        transition-show="slide-up"
-        transition-hide="slide-down"
-      >
-        <q-card v-if="circuit" class="dialog_card">
-          <q-toolbar class="bg-primary text-white" dense>
-            <!--<q-toolbar :class="tools.displayClasses(myevent)"-->
-            <!--:style="tools.displayStyles(myevent) + ` min-width: `+ tools.myheight_dialog() + `px;`">-->
-            <q-toolbar-title>
-              {{ circuit.name }}
-              <div v-if="groupnameSel">
-                Gruppo: {{ groupnameSel.groupname }}
-              </div>
-            </q-toolbar-title>
-            <q-btn flat round color="white" icon="close" v-close-popup></q-btn>
-          </q-toolbar>
-          <q-card-section class="inset-shadow">
-            <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">
-              Regolamento:
-            </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
-              class="centeritems"
-              icon="fas fa-user-plus"
-              color="positive"
-              :label="$t('circuit.acceptregulation')"
-              @click="
-                requestToEnterCircuit = false;
-                tools.setRequestCircuit(
-                  $q,
-                  userStore.my.username,
-                  circuit.name,
-                  true,
-                  groupnameSel ? groupnameSel.groupname : ''
-                );
-              "
-            />
-            <q-btn
-              outline
-              :label="$t('dialog.cancel')"
-              icon="close"
-              v-close-popup
-            ></q-btn>
-          </q-card-actions>
-        </q-card>
-      </q-dialog>
-      <div v-if="showsendCoinTo">
-        <CSendCoins
-          :showprop="showsendCoinTo"
-          :circuitname="circuit.name"
-          :to_contocom="circuit.path"
-          @close="showsendCoinTo = false"
-        >
-        </CSendCoins>
-      </div>
-    </div>
   </div>
 </template>