From 33493bdfe48ed9263f2642fbf2991221f19975bc Mon Sep 17 00:00:00 2001
From: Surya Paolo <paolo.arena77@gmail.com>
Date: Wed, 7 Jun 2023 18:46:14 +0200
Subject: [PATCH] Controllare che le notifiche per gli Eventi arrivino agli
 utenti (se io sono in una provincia mi deve arrivare almeno quella)

---
 src/components/CFinder/CFinder.ts             | 44 ++++++------
 .../CGridTableRec/CGridTableRec.vue           | 71 ++++++++++---------
 2 files changed, 58 insertions(+), 57 deletions(-)

diff --git a/src/components/CFinder/CFinder.ts b/src/components/CFinder/CFinder.ts
index 1362cc3c..bf07f203 100755
--- a/src/components/CFinder/CFinder.ts
+++ b/src/components/CFinder/CFinder.ts
@@ -390,17 +390,6 @@ 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',
@@ -413,6 +402,17 @@ export default defineComponent({
           showcount: 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: 'Specializzazione',
           table: 'subskills',
@@ -750,17 +750,6 @@ export default defineComponent({
           filter: null,
           tablesel: 'pub_to_share',
         },*/
-        {
-          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: 'sectorgoods',
@@ -785,6 +774,17 @@ export default defineComponent({
           showcount: 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: 'Consegna',
diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue
index b086f7a0..be9fed6e 100755
--- a/src/components/CGridTableRec/CGridTableRec.vue
+++ b/src/components/CGridTableRec/CGridTableRec.vue
@@ -88,8 +88,8 @@
                 :col="fieldsTable.getColByColumns(mycolumns, item.key)"
                 v-if="
                   (item.type === costanti.FieldType.select ||
-                  item.type === costanti.FieldType.select_by_server)
-                  && lengthopt(item, false) > 1
+                    item.type === costanti.FieldType.select_by_server) &&
+                  lengthopt(item, false) > 1
                 "
                 :label="labelcombo(item)"
                 v-model:value="item.value"
@@ -123,7 +123,10 @@
             </div>-->
 
               <CMySelect
-                v-if="item.type === costanti.FieldType.multiselect_by_server && lengthopt(item, false) > 1"
+                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)"
@@ -228,34 +231,35 @@
 
       <div
         v-if="prop_search || canEdit"
-        class="row justify-center vertical-middle"
-      >
-        <div class="row justify-around q-mb-sm">
-          <div v-if="searchList && finder">
-            <q-btn
-              dense
-              label="Filtra Ricerca"
-              color="positive"
-              icon="fas fa-filter"
-              @click="showfilter = !showfilter"
-              ><q-badge
-                v-if="getNumFilterSelected()"
-                color="red"
-                floating
-                transparent
-              >
-                {{ getNumFilterSelected() }}
-              </q-badge>
-            </q-btn>
 
-            <q-btn
-              dense
-              color="orange"
-              icon="fas fa-bell"
-              label="Avvisami se..."
-              @click="showNotification = !showNotification"
-            ></q-btn>
-          </div>
+      >
+        <div
+          v-if="searchList && finder"
+          class="row justify-evenly q-mb-sm q-mx-sm"
+        >
+          <q-btn
+            dense
+            label="Filtra Ricerca"
+            color="positive"
+            icon="fas fa-filter"
+            @click="showfilter = !showfilter"
+            ><q-badge
+              v-if="getNumFilterSelected()"
+              color="red"
+              floating
+              transparent
+            >
+              {{ getNumFilterSelected() }}
+            </q-badge>
+          </q-btn>
+
+          <q-btn
+            dense
+            color="orange"
+            icon="fas fa-bell"
+            label="Avvisami se..."
+            @click="showNotification = !showNotification"
+          ></q-btn>
         </div>
         <div v-if="prop_search" class="q-mr-sm full-width">
           <q-input
@@ -550,7 +554,6 @@
                         @save="SaveValue"
                         @show="selItem(row, col)"
                         @showandsave="showandsel"
-
                       >
                       </CMyPopupEdit>
                     </div>
@@ -1216,7 +1219,7 @@
           <q-btn flat round color="white" icon="close" v-close-popup></q-btn>
         </q-bar>
         <q-card-section class="inset-shadow">
-          newRecord: {{newRecord}}
+          newRecord: {{ newRecord }}
           <div
             :class="$q.screen.lt.sm ? `` : `row` + ` text-blue `"
             v-for="col in mycolumns"
@@ -1421,9 +1424,7 @@
   <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-toolbar-title> Notifiche </q-toolbar-title>
         <q-btn flat round color="white" icon="close" v-close-popup></q-btn>
       </q-toolbar>