From 0a48ab788e586a092e6430f8952960783ee701bb Mon Sep 17 00:00:00 2001
From: paoloar77 <paolo.arena77@gmail.com>
Date: Thu, 20 Jan 2022 01:17:21 +0100
Subject: [PATCH] =?UTF-8?q?corretto=20edit=20e=20newrecord=20Citt=C3=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CFinder/CFinder.ts            |  4 +--
 src/components/CMyPopupEdit/CMyPopupEdit.vue |  7 ++---
 src/components/CMySelect/CMySelect.ts        | 32 ++++++++++++--------
 src/components/CMySelect/CMySelect.vue       | 27 +++++++++--------
 4 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/src/components/CFinder/CFinder.ts b/src/components/CFinder/CFinder.ts
index b82f8d2f..3e4d70f3 100755
--- a/src/components/CFinder/CFinder.ts
+++ b/src/components/CFinder/CFinder.ts
@@ -103,7 +103,7 @@ export default defineComponent({
           showcount: true,
           useinput: false,
         },
-        {
+        /*{
           label: 'Regione',
           table: 'regions',
           key: 'idReg',
@@ -112,7 +112,7 @@ export default defineComponent({
           arrvalue: tools.getCookie(tools.COOK_SEARCH + 'regions', [costanti.FILTER_TUTTI]),
           filter: null,
           useinput: true,
-        },
+        },*/
         {
           label: 'Citta',
           table: 'cities',
diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.vue b/src/components/CMyPopupEdit/CMyPopupEdit.vue
index b60c648d..391ed4c4 100755
--- a/src/components/CMyPopupEdit/CMyPopupEdit.vue
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.vue
@@ -311,16 +311,13 @@
             </div>
           </div>
           <div v-else-if="col.fieldtype === costanti.FieldType.multiselect_by_server">
-            tablesel: {{tablesel}}
-            myvalue: {{ myvalue}}
             <CMySelect
-              :isarray="true"
               :multiselect_by_server="true"
               :label="col.label"
               v-model:arrvalue="myvalue"
               @update:arrvalue="changevalRec"
-              :addall="true"
-              :tablesel="tablesel"
+              :addall="false"
+              :tablesel="col.tablesel"
               :pickup="true"
               label-color="primary"
               class="combowidth"
diff --git a/src/components/CMySelect/CMySelect.ts b/src/components/CMySelect/CMySelect.ts
index e8b1bee9..1a114678 100755
--- a/src/components/CMySelect/CMySelect.ts
+++ b/src/components/CMySelect/CMySelect.ts
@@ -135,8 +135,11 @@ export default defineComponent({
           if (!trovato) {
             const rec = valori.value.find((rec: any) => rec._id === id)
             if (rec) {
-              console.log('SAVE OPT rec', rec)
-              arrtempOpt.value.push({ _id: id, comune: rec.comune })
+              // console.log('SAVE OPT rec', rec)
+              let obj: any = {}
+              obj[`${props.optval}`] = id
+              obj[`${props.optlab}`] = rec[`${props.optlab}`]
+              arrtempOpt.value.push(obj)
               let num = localStorage.getItem(props.tablesel + 'NUM') || 0
               try {
                 if (!num) {
@@ -147,11 +150,11 @@ export default defineComponent({
               } catch (e) {
                 num = 0
               }
-              console.log('-----------  valori.value', valori.value)
-              console.log('-----------  arrtempOpt.value', arrtempOpt.value)
+              // console.log('-----------  valori.value', valori.value)
+              // console.log('-----------  arrtempOpt.value', arrtempOpt.value)
 
-              localStorage.setItem(props.tablesel + num + 'ID', rec._id)
-              localStorage.setItem(props.tablesel + num + 'COMUNE', rec.comune)
+              localStorage.setItem(props.tablesel + num + props.optval, id)
+              localStorage.setItem(props.tablesel + num + props.optlab, rec[`${props.optlab}`])
 
               num += 1
               localStorage.setItem(props.tablesel + 'NUM', num.toString())
@@ -163,13 +166,13 @@ export default defineComponent({
 
 
     function changeval(newval: any) {
-      console.log(' ½½½½½½½ changeval', newval)
+      // console.log(' ½½½½½½½ changeval', newval)
       if (props.multiselect_by_server) {
         // localStorage.setItem(props.tablesel + '_' + newval, valori.value[newval])
         myarrvalue.value = newval && newval['arrvalue'] ? newval['arrvalue'] : newval
         saveOptInCookie(newval)
 
-        console.log(' ----- Myselect changeval Arrvalue', myarrvalue.value)
+        // console.log(' ----- Myselect changeval Arrvalue', myarrvalue.value)
         emit('update:arrvalue', myarrvalue.value)
         emit('changeval', myarrvalue.value)
 
@@ -183,7 +186,7 @@ export default defineComponent({
           myvalue.value = newval && newval['code'] ? newval['code'] : newval
         else
           myvalue.value = newval
-        console.log('Myselect changeval', myvalue.value)
+        // console.log('Myselect changeval', myvalue.value)
         emit('update:value', myvalue.value)
         emit('changeval', myvalue.value)
       }
@@ -201,10 +204,13 @@ export default defineComponent({
         const num = parseInt(localStorage.getItem(props.tablesel + 'NUM')!)
         console.log('num LOADED ', num)
         for (let i = 0; i < num; i++) {
-          const itemId = parseInt(localStorage.getItem(props.tablesel + i + 'ID')!)
-          const itemcomune = localStorage.getItem(props.tablesel + i + 'COMUNE')
+          const itemId = parseInt(localStorage.getItem(props.tablesel + i + props.optval)!)
+          const itemlab = localStorage.getItem(props.tablesel + i + props.optlab)
           if (itemId) {
-            arrtempOpt.value.push({ _id: itemId, comune: itemcomune })
+            let obj: any = {}
+            obj[`${props.optval}`] = itemId
+            obj[`${props.optlab}`] = itemlab
+            arrtempOpt.value.push(obj)
           }
         }
 
@@ -285,7 +291,7 @@ export default defineComponent({
             myarr = [myobj, ...myarr]
           }
 
-          if (myarr.length > 0) {
+          if (myarr && myarr.length > 0) {
             valori.value = myarr
             if (props.multiselect_by_server) {
               console.log('@@@ VALORI CHANGED (3)', valori.value)
diff --git a/src/components/CMySelect/CMySelect.vue b/src/components/CMySelect/CMySelect.vue
index ec475999..fabc7175 100755
--- a/src/components/CMySelect/CMySelect.vue
+++ b/src/components/CMySelect/CMySelect.vue
@@ -11,7 +11,6 @@
         input-debounce="300"
         rounded
         outlined
-        fill-input
         multiple
         options-dense
         map-options
@@ -32,17 +31,7 @@
             </q-item-section>
           </q-item>
         </template>
-        <template v-slot:option="{ itemProps, opt, selected, toggleOption }">
-          <q-item v-bind="itemProps">
 
-            <q-item-section>
-              <q-item-label>{{ opt[fieldsTable.getLabelByTable(tablesel)] }}</q-item-label>
-            </q-item-section>
-            <q-item-section side>
-              <q-toggle :model-value="selected" @update:model-value="toggleOption(opt)"/>
-            </q-item-section>
-          </q-item>
-        </template>
         <template v-slot:selected-item="scope">
           <div v-if="scope.opt[fieldsTable.getLabelByTable(tablesel)]">
             <q-chip
@@ -60,6 +49,18 @@
           </div>
         </template>
 
+        <template v-slot:option="{ itemProps, opt, selected, toggleOption }">
+          <q-item v-bind="itemProps">
+
+            <q-item-section>
+              <q-item-label>{{ opt[fieldsTable.getLabelByTable(tablesel)] }}</q-item-label>
+            </q-item-section>
+            <q-item-section side>
+              <q-toggle :model-value="selected" @update:model-value="toggleOption(opt)"/>
+            </q-item-section>
+          </q-item>
+        </template>
+
       </q-select>
 
     </div>
@@ -72,10 +73,11 @@
         :input-class="myclass"
         :model-value="myvalue"
         :use-input="useinput"
-        @filter="filterFn"
         input-debounce="0"
         @new-value="newvaluefunc"
         new-value-mode="add-unique"
+        map-options
+        emit-value
         :options="valori"
         :option-value="optval"
         :option-label="optlab"
@@ -153,6 +155,7 @@
         </template>
 
       </q-select>
+
     </div>
   </div>
 </template>