From e6ea3206a9ae02f63501bf4857c030c19e0ec832 Mon Sep 17 00:00:00 2001
From: Paolo Arena <paolo.arena77@gmail.com>
Date: Mon, 22 Nov 2021 18:28:45 +0100
Subject: [PATCH] fixed CGallery

---
 src/components/CGallery/CGallery.ts           |  29 +--
 src/components/CGallery/CGallery.vue          | 167 ++++++++++--------
 src/components/CGridTableRec/CGridTableRec.ts |   2 +-
 src/components/CMyFieldDb/CMyFieldDb.ts       |  11 ++
 src/components/CMyFieldDb/CMyFieldDb.vue      |   1 +
 src/components/CMyPopupEdit/CMyPopupEdit.ts   |  11 +-
 src/components/CMyPopupEdit/CMyPopupEdit.vue  |   6 +-
 src/store/globalStore.ts                      |   2 +-
 8 files changed, 127 insertions(+), 102 deletions(-)

diff --git a/src/components/CGallery/CGallery.ts b/src/components/CGallery/CGallery.ts
index 990ed942..84d5add3 100755
--- a/src/components/CGallery/CGallery.ts
+++ b/src/components/CGallery/CGallery.ts
@@ -58,16 +58,17 @@ export default defineComponent({
       console.log('created cgallery')
       if (isValid(props.imgGall)) {
         // @ts-ignore
-        gallerylist.value = props.imgGall
+        let myarr: any = props.imgGall
+        gallerylist.value = []
+        if (myarr) {
+          myarr.forEach((pic: any) => {
+            if (pic.imagefile)
+              gallerylist.value.push(pic)
+          })
+        }
       } else {
         gallerylist.value = [
-            {
-              _id: '',
-              imagefile: 'noimg.png',
-              order: 0,
-              alt: '',
-              description: '(nessuna foto)'
-            }]
+            ]
       }
     }
 
@@ -210,7 +211,7 @@ export default defineComponent({
     }
 
     function uploaded(info: any) {
-      console.log(info)
+      console.log('uploaded', info)
       if (gallerylist.value) {
         for (const file of info.files) {
           gallerylist.value.push({ imagefile: file.name, order: getlastord() })
@@ -218,6 +219,8 @@ export default defineComponent({
 
         if (!props.single)
           save()
+
+        console.log('gallerylist', gallerylist.value)
       }
     }
 
@@ -270,21 +273,27 @@ export default defineComponent({
     }
 
     function save() {
+      console.log('CGallery save')
       if (gallerylist.value.length > 0) {
         if (!props.single) {
           emit('showandsave', gallerylist.value)
         } else {
           emit('showandsave', gallerylist.value[0].imagefile)
         }
+      } else {
+        emit('showandsave', '')
       }
     }
 
     function close() {
-      save()
+      return ''
     }
 
     function getsrcimg(gallerylistery: any) {
 
+      if (!gallerylistery.imagefile) {
+        return 'images/noimg.png';
+      }
       if (gallerylistery) {
         if (tools.getextfile(gallerylistery.imagefile) === 'pdf')
           return 'images/images/pdf.jpg'
diff --git a/src/components/CGallery/CGallery.vue b/src/components/CGallery/CGallery.vue
index 92206efb..dfb3f158 100755
--- a/src/components/CGallery/CGallery.vue
+++ b/src/components/CGallery/CGallery.vue
@@ -20,81 +20,89 @@
     </div>
   </div>
   <div v-else>
-    <div class=" row">
-      <!--<q-draggable-rows
-              v-model="order">-->
+    <div v-if="getnumimages() <= 0">
+      <q-btn
+        flat round color="blue" icon="fas fa-tools" size="md"
+        @click="apri"></q-btn>
+    </div>
+    <div v-else>
+      <div class=" row">
+        <!--<q-draggable-rows
+                v-model="order">-->
 
-      <div v-for="(mygallery, index) in getlistimages()" :key="index">
-        <div
-          class="q-pa-sm q-gutter-sm"
-          @dragenter="onDragEnter"
-          @dragleave="onDragLeave"
+        <div v-for="(mygallery, index) in getlistimages()" :key="index">
+          mygallery : {{ mygallery}}
+          <div
+            class="q-pa-sm q-gutter-sm"
+            @dragenter="onDragEnter"
+            @dragleave="onDragLeave"
 
-          @dragover="onDragOver">
-          <q-card
-            :id="mygallery._id" :class="getclass()"
-            draggable="true"
-            @dragstart="onDragStart"
-            @drop="onDrop"
-          >
+            @dragover="onDragOver">
+            <q-card
+              :id="mygallery._id" :class="getclass()"
+              draggable="true"
+              @dragstart="onDragStart"
+              @drop="onDrop"
+            >
 
-            <q-img
-              :src="getsrcimg(mygallery)"
-              :class="getclimg()"
-              :alt="mygallery.alt">
-              <div class="absolute-bottom text-shadow">
-                <!-- <div class="text-h6 text-trans">{{ mygallery.description }} </div> -->
-                <div class="text-subtitle-carica text-trans">{{ mygallery.description }}</div>
-              </div>
-            </q-img>
+              <q-img
+                :src="getsrcimg(mygallery)"
+                :class="getclimg()"
+                :alt="mygallery.alt">
+                <div class="absolute-bottom text-shadow">
+                  <!-- <div class="text-h6 text-trans">{{ mygallery.description }} </div> -->
+                  <div class="text-subtitle-carica text-trans">{{ mygallery.description }}</div>
+                </div>
+              </q-img>
 
 
-            <q-field
-              stack-label
-              dense
-              label="FileName">
-              <template v-slot:control>
-                <div class="self-center full-width no-outline" tabindex="0">{{ mygallery.imagefile }}</div>
-              </template>
+              <q-field
+                stack-label
+                dense
+                label="FileName">
+                <template v-slot:control>
+                  <div class="self-center full-width no-outline" tabindex="0">{{ mygallery.imagefile }}</div>
+                </template>
 
-            </q-field>
+              </q-field>
 
-            <q-input
-              v-model="mygallery.description"
-              dense
-              :label="$t('proj.longdescr')"
-              @keyup.enter.stop
-              @update:model-value="save"
-              debounce="1000"
-              autofocus>
-            </q-input>
+              <q-input
+                v-model="mygallery.description"
+                dense
+                :label="$t('proj.longdescr')"
+                @keyup.enter.stop
+                @update:model-value="save"
+                debounce="1000"
+                autofocus>
+              </q-input>
 
-            <q-card-actions align="center">
-              <q-btn
-                flat round color="blue" icon="fas fa-copy" size="sm"
-                @click="copytoclipboard(mygallery)"></q-btn>
-              <q-btn
-                flat round color="red" icon="fas fa-trash-alt" size="sm"
-                @click="deleteFile(mygallery)"></q-btn>
-            </q-card-actions>
-          </q-card>
+              <q-card-actions align="center">
+                <q-btn
+                  flat round color="blue" icon="fas fa-copy" size="sm"
+                  @click="copytoclipboard(mygallery)"></q-btn>
+                <q-btn
+                  flat round color="red" icon="fas fa-trash-alt" size="sm"
+                  @click="deleteFile(mygallery)"></q-btn>
+              </q-card-actions>
+            </q-card>
+          </div>
         </div>
-      </div>
-      <div class="q-pa-sm">
-        <div v-if="edit" class="q-gutter-sm " style="max-height: 200px; width: 208px;">
-          <q-uploader
-            label="Aggiungi Immagine o PDF"
-            accept=".jpg, image/*, .pdf"
-            :url="getUrl()"
-            :headers="tools.getheaders()"
-            :max-file-size="2000000"
-            multiple
-            auto-upload
-            hide-upload-btn
-            no-thumbnails
-            @uploaded="uploaded"
-            style="width: 208px"
-          ></q-uploader>
+        <div class="q-pa-sm">
+          <div v-if="edit" class="q-gutter-sm " style="max-height: 200px; width: 208px;">
+            <q-uploader
+              label="Aggiungi Immagine"
+              accept=".jpg, image/*, .pdf"
+              :url="getUrl()"
+              :headers="tools.getheaders()"
+              :max-file-size="2000000"
+              multiple
+              auto-upload
+              hide-upload-btn
+              no-thumbnails
+              @uploaded="uploaded"
+              style="width: 208px"
+            ></q-uploader>
+          </div>
         </div>
       </div>
     </div>
@@ -108,7 +116,7 @@
   >
     <q-card>
       <q-bar class="bg-primary text-white">
-        <q-space />
+        <q-space/>
 
         <q-btn dense flat icon="minimize" @click="maximizedToggle = false" :disable="!maximizedToggle">
           <q-tooltip v-if="maximizedToggle" class="bg-white text-primary">Minimize</q-tooltip>
@@ -116,7 +124,7 @@
         <q-btn dense flat icon="crop_square" @click="maximizedToggle = true" :disable="maximizedToggle">
           <q-tooltip v-if="!maximizedToggle" class="bg-white text-primary">Maximize</q-tooltip>
         </q-btn>
-        <q-btn dense flat icon="close" v-close-popup @click="close">
+        <q-btn dense flat icon="close" v-close-popup>
           <q-tooltip class="bg-white text-primary">Close</q-tooltip>
         </q-btn>
       </q-bar>
@@ -170,14 +178,14 @@
                     autofocus>
                   </q-input>
 
-                <q-card-actions align="center">
-                  <q-btn
-                    flat round color="blue" icon="fas fa-copy" size="sm"
-                    @click="copytoclipboard(mygallery)"></q-btn>
-                  <q-btn
-                    flat round color="red" icon="fas fa-trash-alt" size="sm"
-                    @click="deleteFile(mygallery)"></q-btn>
-                </q-card-actions>
+                  <q-card-actions align="center">
+                    <q-btn
+                      flat round color="blue" icon="fas fa-copy" size="sm"
+                      @click="copytoclipboard(mygallery)"></q-btn>
+                    <q-btn
+                      flat round color="red" icon="fas fa-trash-alt" size="sm"
+                      @click="deleteFile(mygallery)"></q-btn>
+                  </q-card-actions>
                 </q-card-section>
 
               </q-card>
@@ -186,7 +194,7 @@
           <div class="q-pa-sm">
             <div class="q-gutter-sm " style="max-height: 200px; width: 208px;">
               <q-uploader
-                label="Aggiungi Immagine o PDF"
+                label="Aggiungi Immagine"
                 accept=".jpg, image/*, .pdf"
                 :url="getUrl()"
                 :headers="tools.getheaders()"
@@ -202,6 +210,11 @@
           </div>
         </div>
 
+        <q-card-actions align="right">
+          <q-btn flat label="Annulla" color="primary" v-close-popup />
+          <q-btn label="salva" color="primary" v-close-popup @click="save"/>
+        </q-card-actions>
+
       </q-card-section>
     </q-card>
   </q-dialog>
diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts
index 3ed4bfc0..a0ea612a 100755
--- a/src/components/CGridTableRec/CGridTableRec.ts
+++ b/src/components/CGridTableRec/CGridTableRec.ts
@@ -363,7 +363,7 @@ export default defineComponent({
 
 
     function showandsel(row: any, col: any, newval: any, valinitial: any) {
-      // console.log('showandsel', row, col, newval)
+      console.log('showandsel CGridTable', row, col, newval)
       rowsel = row
       colsel.value = col
       idsel = row._id
diff --git a/src/components/CMyFieldDb/CMyFieldDb.ts b/src/components/CMyFieldDb/CMyFieldDb.ts
index 4d4f2c25..a89321f6 100755
--- a/src/components/CMyFieldDb/CMyFieldDb.ts
+++ b/src/components/CMyFieldDb/CMyFieldDb.ts
@@ -7,6 +7,7 @@ import { tools } from '@store/Modules/tools'
 import { costanti } from '@costanti'
 import { CMyPopupEdit } from '@/components/CMyPopupEdit'
 import { IColGridTable } from 'model'
+import MixinBase from '@/mixins/mixin-base'
 
 
 export default defineComponent({
@@ -84,6 +85,15 @@ export default defineComponent({
     const col = ref(<IColGridTable> { name: 'test' })
     const row = ref({})
 
+    const { setValDb, getValDb } = MixinBase()
+
+    function showandsel(row: any, col: any, newval: any, valinitial: any) {
+      console.log('showandsel CMyFieldDb', row, col, newval)
+
+      if (newval !== valinitial)
+        setValDb($q, props.mykey, newval, props.type, props.serv, props.table, props.mysubkey, props.id, props.indrec, props.mysubsubkey)
+    }
+
     return {
       tools,
       costanti,
@@ -91,6 +101,7 @@ export default defineComponent({
       globalStore,
       col,
       row,
+      showandsel,
     }
   },
 })
diff --git a/src/components/CMyFieldDb/CMyFieldDb.vue b/src/components/CMyFieldDb/CMyFieldDb.vue
index 567e216c..4d9a73a0 100755
--- a/src/components/CMyFieldDb/CMyFieldDb.vue
+++ b/src/components/CMyFieldDb/CMyFieldDb.vue
@@ -39,6 +39,7 @@
           :mycol="col"
           v-model:row="row"
           minuteinterval="1"
+          @showandsave="showandsel"
         >
 
         </CMyPopupEdit>
diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.ts b/src/components/CMyPopupEdit/CMyPopupEdit.ts
index 06491ae7..b84f9f73 100755
--- a/src/components/CMyPopupEdit/CMyPopupEdit.ts
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.ts
@@ -20,6 +20,7 @@ import MixinUsers from '@/mixins/mixin-users'
 
 export default defineComponent({
   name: 'CMyPopupEdit',
+  emits: ['showandsave', 'update:row', 'show', 'save', 'annulla'],
   props: {
     title: {
       type: String,
@@ -250,14 +251,7 @@ export default defineComponent({
           myvalue.value = {
             title: 'Galleria',
             directory: 'none',
-            list: [
-              {
-                _id: '',
-                imagefile: 'noimg.png',
-                order: 0,
-                alt: '',
-                description: '(nessuna foto)'
-              }]
+            list: []
           }
         }
       }
@@ -336,6 +330,7 @@ export default defineComponent({
 
 
     function Savedb(newVal: any, valinitial: any) {
+      console.log('Savedb')
 
       if (col.value.fieldtype === costanti.FieldType.boolean) {
         // console.log('myvalue', myvalue, newVal, myvalueprec)
diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.vue b/src/components/CMyPopupEdit/CMyPopupEdit.vue
index b72e3db5..105cf890 100755
--- a/src/components/CMyPopupEdit/CMyPopupEdit.vue
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.vue
@@ -85,7 +85,6 @@
         <div v-else-if="col.fieldtype === costanti.FieldType.listimages">
           gall1:
           <CGallery
-            v-if="myvalue"
             :title="getTitleGall()"
             :directory="getDirectoryGall()"
             :imgGall="myvalue" :edit="isviewfield()"
@@ -99,7 +98,6 @@
           <div v-if="canEdit">
             gall2:
             <CGallery
-              v-if="myvalue"
               :title="getTitleGall()"
               :directory="getDirectoryGall()"
               :imgGall="myvalue" :edit="isviewfield()"
@@ -184,7 +182,6 @@
       <div v-if="col.fieldtype === costanti.FieldType.listimages">
         gall3:
         <CGallery
-          v-if="myvalue"
           :title="getTitleGall()"
           :directory="getDirectoryGall()"
           :imgGall="myvalue" :edit="isviewfield()"
@@ -193,9 +190,8 @@
         </CGallery>
       </div>
       <div v-else-if="col.fieldtype === costanti.FieldType.image">
-        gall4:
+
         <CGallery
-          v-if="myvalue"
           :title="getTitleGall()"
           :directory="getDirectoryGall()"
           :single="isFieldDb()"
diff --git a/src/store/globalStore.ts b/src/store/globalStore.ts
index c4becfdc..8ca85449 100644
--- a/src/store/globalStore.ts
+++ b/src/store/globalStore.ts
@@ -839,7 +839,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
     async DeleteFile({ filename }: {filename: string}) {
       console.log('DeleteFile', filename)
 
-      return Api.SendReq('/delfile', 'DELETE', { filename })
+      return Api.SendReq(`/delfile/${tools.getvers()}/`, 'DELETE', { filename })
         .then((res) => {
           if (res.status === 200) {
             if (res.data.code === serv_constants.RIS_CODE_OK) {