From 3aebf19a91cf8d31b5fdd663abe290ff61e8142c Mon Sep 17 00:00:00 2001
From: Paolo Arena <paolo.arena77@gmail.com>
Date: Sun, 3 Oct 2021 16:11:29 +0200
Subject: [PATCH] Corretto Chip List

---
 .../CGridTableRec/CGridTableRec.scss          |  2 +-
 src/components/CGridTableRec/CGridTableRec.ts |  6 ++---
 .../CGridTableRec/CGridTableRec.vue           |  4 ++--
 src/components/CMyPopupEdit/CMyPopupEdit.ts   |  4 ++--
 src/components/CMyPopupEdit/CMyPopupEdit.vue  | 16 ++++++-------
 .../CMyToggleList/CMyToggleList.vue           | 23 ++++++++++---------
 src/db/lang/ws_it.js                          |  1 +
 src/store/Modules/fieldsTable.ts              |  4 ++--
 8 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/src/components/CGridTableRec/CGridTableRec.scss b/src/components/CGridTableRec/CGridTableRec.scss
index 845760c9..58dd0d6d 100755
--- a/src/components/CGridTableRec/CGridTableRec.scss
+++ b/src/components/CGridTableRec/CGridTableRec.scss
@@ -8,7 +8,7 @@
 }
 
 .tdclass, .trclass{
-  height: 20px !important;
+  min-height: 20px !important;
 }
 
 .q-table td {
diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts
index 80291537..e03ad84d 100755
--- a/src/components/CGridTableRec/CGridTableRec.ts
+++ b/src/components/CGridTableRec/CGridTableRec.ts
@@ -348,7 +348,7 @@ export default defineComponent({
     }
 
     function SaveValdb(newVal: any, valinitial: any) {
-      // console.log('SaveValdb', newVal)
+      console.log('SaveValdb', newVal)
       // console.log('SaveValue', newVal, 'rowsel', rowsel)
 
       colsel.value = colclicksel.value
@@ -359,7 +359,7 @@ export default defineComponent({
 
 
     function showandsel(row: any, col: any, newval: any, valinitial: any) {
-      // console.log('showandsel', row, col, newval)
+      console.log('showandsel', row, col, newval)
       rowsel = row
       colsel.value = col
       idsel = row._id
@@ -377,7 +377,7 @@ export default defineComponent({
     }
 
     function SaveValue(newVal: any, valinitial: any) {
-      console.log('SaveValue', newVal, 'rowsel', rowsel, 'colsel', colsel.value)
+      // console.log('SaveValue', newVal, 'rowsel', rowsel, 'colsel', colsel.value)
 
       if (colsel.value) {
         // Update value in table memory
diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue
index 1430b44d..42bdd522 100755
--- a/src/components/CGridTableRec/CGridTableRec.vue
+++ b/src/components/CGridTableRec/CGridTableRec.vue
@@ -4,7 +4,7 @@
       <q-btn
         v-if="mytable && visButtRow()" rounded dense color="primary"
         size="lg"
-        :label="getlabelAddRow"
+        :label="getlabelAddRow()"
         @click="createNewRecordDialog"></q-btn>
     </div>
 
@@ -127,7 +127,6 @@
       </template>
 
       <template v-slot:body="props">
-
         <q-tr :props="props" class="trclass">
           <q-td auto-width class="tdclass">
             <q-checkbox dense v-model="props.selected"></q-checkbox>
@@ -167,6 +166,7 @@
             </div>
           </q-td>
         </q-tr>
+        <br>
       </template>
 
       <!--
diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.ts b/src/components/CMyPopupEdit/CMyPopupEdit.ts
index f75d7ce3..e5cdaeec 100755
--- a/src/components/CMyPopupEdit/CMyPopupEdit.ts
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.ts
@@ -170,7 +170,7 @@ export default defineComponent({
 
     function SaveValueInt(newVal: any, valinitial: any) {
 
-      console.log('SaveValueInt', newVal, valinitial)
+      // console.log('SaveValueInt', newVal, valinitial)
 
       // Update value in table memory
       if (props.subfield !== '') {
@@ -282,7 +282,7 @@ export default defineComponent({
 
     function getclassCol(col: any) {
       if (col) {
-        let mycl = (props.col.disable || isviewfield) ? '' : 'colmodif'
+        let mycl = (props.col.disable || isviewfield()) ? '' : 'colmodif'
         mycl += ((props.col.fieldtype === costanti.FieldType.date) || (props.col.fieldtype === costanti.FieldType.onlydate)) ? ' coldate flex flex-container' : ''
 
         return mycl
diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.vue b/src/components/CMyPopupEdit/CMyPopupEdit.vue
index 53b4c54b..c6b5344c 100755
--- a/src/components/CMyPopupEdit/CMyPopupEdit.vue
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.vue
@@ -186,7 +186,7 @@
                 </CDateTime>
             </span>
         <span v-else-if="col.fieldtype === costanti.FieldType.onlydate">
-          Data4:
+
                 <CDateTime
                   :label="col.label"
                   class="cursor-pointer"
@@ -263,7 +263,7 @@
               v-if="canEdit && col.fieldtype !== costanti.FieldType.html"
               v-model="myvalue"
               :disable="col.disable"
-              :title="col.title"
+              :title="col.title ? col.title : col.titlepopupedit"
               buttons
               persistent
               @save="SaveValueInt"
@@ -271,7 +271,6 @@
               v-slot="scope">
 
               <div v-if="col.fieldtype === costanti.FieldType.boolean">
-                Boolean:
                 <q-checkbox v-model="scope.value" :label="col.title">
                 </q-checkbox>
                 {{ visuValByType(myvalue, col, row) }}
@@ -309,10 +308,11 @@
                 </q-input>
               </div>
               <div v-else-if="col.fieldtype === costanti.FieldType.binary">
+
                 <CMyToggleList
-                  :label="col.title"
+                  :label="col.titlepopupedit"
                   :options="globalStore.getTableJoinByName(col.jointable)"
-                  v-model:value="myvalue"
+                  v-model:value="scope.value"
                   :optval="fieldsTable.getKeyByTable(col.jointable)"
                   :optlab="fieldsTable.getLabelByTable(col.jointable)">
                 </CMyToggleList>
@@ -320,7 +320,7 @@
               <div v-else-if="col.fieldtype === costanti.FieldType.select">
                 <CMySelect
                   :label="col.title"
-                  v-model:value="myvalue"
+                  v-model:value="scope.value"
                   :optval="fieldsTable.getKeyByTable(col.jointable)"
                   :optlab="fieldsTable.getLabelByTable(col.jointable)"
                   :options="globalStore.getTableJoinByName(col.jointable)"
@@ -339,7 +339,7 @@
                     <template v-slot:prepend>
                       <div style="font-size: 1rem;">
                         <!--<vue-country-code
-                          :defaultCountry="myvalue"
+                          :defaultCountry="scope.value"
                           :disabledFetchingCountry="true"
                           @onSelect="selectcountry"
                           :preferredCountries="tools.getprefCountries"
@@ -358,7 +358,7 @@
 
 <!--                <vue-tel-input
                   @country-changed="intcode_change"
-                  :value="myvalue"
+                  :value="scope.value"
                   @input="oninput"
                   :placeholder="$t('reg.cell')"
                   :enabledCountryCode="true"
diff --git a/src/components/CMyToggleList/CMyToggleList.vue b/src/components/CMyToggleList/CMyToggleList.vue
index e5a1b402..7f804358 100755
--- a/src/components/CMyToggleList/CMyToggleList.vue
+++ b/src/components/CMyToggleList/CMyToggleList.vue
@@ -1,20 +1,21 @@
 <template>
-    <div>
-        <div class="cltoggle" v-for="(rec, index) in myarrvalues" :key="index">
-            <q-toggle
-                    v-model="rec.valbool"
-                    :label="rec.label"
-                    :color="tools.getColorByIndexBest(index)"
-                    keep-color
-                    @update:model-value="changeval">
-            </q-toggle>
-        </div>
+  <div>
+    <div class="cltoggle" v-for="(rec, index) in myarrvalues" :key="index">
+      <q-toggle
+        v-if="rec.label"
+        v-model="rec.valbool"
+        :label="rec.label"
+        :color="tools.getColorByIndexBest(index)"
+        keep-color
+        @update:model-value="changeval">
+      </q-toggle>
     </div>
+  </div>
 </template>
 
 <script lang="ts" src="./CMyToggleList.ts">
 </script>
 
 <style lang="scss" scoped>
-    @import './CMyToggleList.scss';
+@import './CMyToggleList.scss';
 </style>
diff --git a/src/db/lang/ws_it.js b/src/db/lang/ws_it.js
index 26887962..7d11aa40 100755
--- a/src/db/lang/ws_it.js
+++ b/src/db/lang/ws_it.js
@@ -93,6 +93,7 @@ const msg_website_it = {
     ecommerce: 'Prodotti',
     ecommerce_menu: 'ECommerce1',
     hours: 'Ore',
+    department: 'Uffici'
   },
   msg: {
     myAppName: 'FreePlanet',
diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts
index 0c541676..bd23a950 100755
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -895,7 +895,7 @@ export const fieldsTable = {
     AddCol({ name: 'lasttimeonline', label_trans: 'reg.lasttimeonline', fieldtype: costanti.FieldType.date }),
     // AddCol({ name: 'idapp', label_trans: 'reg.idapp', fieldtype: costanti.FieldType.string }),
     AddCol({
-      name: 'perm', label_trans: 'reg.perm', fieldtype: costanti.FieldType.binary, jointable: 'permissions',
+      name: 'perm', label_trans: 'reg.perm', fieldtype: costanti.FieldType.binary, jointable: 'permissions', titlepopupedit: 'Permessi'
     }),
     AddCol({ name: 'ipaddr', label_trans: 'reg.ipaddr' }),
     AddCol(DeleteRec),
@@ -1061,7 +1061,7 @@ export const fieldsTable = {
     AddCol({ name: 'lasttimeonline', label_trans: 'reg.lasttimeonline', fieldtype: costanti.FieldType.date }),
     // AddCol({ name: 'idapp', label_trans: 'reg.idapp', fieldtype: costanti.FieldType.string }),
     AddCol({
-      name: 'perm', label_trans: 'reg.perm', fieldtype: costanti.FieldType.binary, jointable: 'permissions',
+      name: 'perm', label_trans: 'reg.perm', fieldtype: costanti.FieldType.binary, jointable: 'permissions', titlepopupedit: 'Permessi'
     }),
     AddCol({ name: 'ipaddr', label_trans: 'reg.ipaddr' }),
     AddCol({ name: 'deleted', label_trans: 'reg.deleted', fieldtype: costanti.FieldType.boolean }),