From c63ed7e6d35015ce5a8d73ebc0d2ee5d3c512dd4 Mon Sep 17 00:00:00 2001
From: paoloar77 <paolo.arena77@gmail.com>
Date: Thu, 10 Feb 2022 23:31:18 +0100
Subject: [PATCH] - Se non aggiungo la foto alla competenza, prendo quella del
 profilo

---
 src/components/CGallery/CGallery.scss         | 14 ++++-
 src/components/CGallery/CGallery.ts           | 19 ++++++-
 src/components/CGallery/CGallery.vue          | 36 +++++++++++--
 .../CGridTableRec/CGridTableRec.vue           |  4 +-
 src/components/CMyPopupEdit/CMyPopupEdit.vue  |  7 +--
 src/css/app.scss                              |  2 +-
 src/model/GlobalStore.ts                      |  1 +
 src/rootgen/admin/importdata/importdata.ts    | 54 ++++++++++---------
 src/statics/lang/it.js                        |  1 +
 src/store/Modules/fieldsTable.ts              |  5 +-
 src/views/user/editprofile/editprofile.vue    |  1 +
 11 files changed, 104 insertions(+), 40 deletions(-)

diff --git a/src/components/CGallery/CGallery.scss b/src/components/CGallery/CGallery.scss
index 9c9a074e..0e7557e9 100755
--- a/src/components/CGallery/CGallery.scss
+++ b/src/components/CGallery/CGallery.scss
@@ -42,14 +42,24 @@ $grayshadow: #555;
   width: 100%;
   max-width: 300px;
   min-width: 200px;
-  padding: 1rem 1rem;
+  padding: 0.5rem 0.5rem;
   height: 350px;
   margin: auto;
 }
 
+.my-card-gallery-noModif {
+  width: 100%;
+  max-width: 300px;
+  min-width: 200px;
+  padding: 1rem 1rem;
+  height: 220px;
+}
+
+
+
 .my-card-gallery-view {
   width: 100px;
   height: 100px;
-  padding: 0.5rem 0.5rem;
+  padding: 0.25rem 0.25rem;
   margin: auto;
 }
diff --git a/src/components/CGallery/CGallery.ts b/src/components/CGallery/CGallery.ts
index b6c91a78..f9934792 100755
--- a/src/components/CGallery/CGallery.ts
+++ b/src/components/CGallery/CGallery.ts
@@ -19,6 +19,11 @@ export default defineComponent({
       type: Boolean,
       required: true,
     },
+    isInModif: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
     single: {
       type: Boolean,
       required: false,
@@ -29,6 +34,11 @@ export default defineComponent({
       type: String,
       required: true,
     },
+    imagebak: {
+      type: String,
+      required: false,
+      default: '',
+    },
     imgGall: {
       type: Object as PropType<IImgGallery[] | string | undefined | null>,
       required: true,
@@ -184,7 +194,7 @@ export default defineComponent({
     }
 
     function getclass() {
-      return (props.edit || displayGall.value) ? 'my-card-gallery' : 'my-card-gallery-view' + ' text-center'
+      return (props.edit || displayGall.value) ? (props.isInModif ? 'my-card-gallery' : 'my-card-gallery-noModif') : 'my-card-gallery-view' + ' text-center'
     }
 
     function getclimg() {
@@ -247,7 +257,12 @@ export default defineComponent({
     }
 
     function getfullname(rec: any) {
-      return costanti.DIR_UPLOAD + props.directory + '/' + rec.imagefile
+      if (rec) {
+        return costanti.DIR_UPLOAD + props.directory + '/' + rec.imagefile
+      } else {
+        return props.imagebak
+      }
+
     }
 
     function copytoclipboard(rec: any) {
diff --git a/src/components/CGallery/CGallery.vue b/src/components/CGallery/CGallery.vue
index 92d15568..a5fe0014 100755
--- a/src/components/CGallery/CGallery.vue
+++ b/src/components/CGallery/CGallery.vue
@@ -1,8 +1,9 @@
 <template>
   <!--<div class="q-pa-md items-start " style="display: inline-flex; width: 800px;"> -->
+
   <div v-if="!edit">
-    <div class="q-pa-md q-gutter-md">
-      <q-card :class="getclass()" @click="apri">
+    <div class="q-pa-xs q-gutter-md">
+      <q-card v-if="getlistimages().length > 0" :class="getclass()" @click="apri">
         <div v-for="(mygallery, index) in getlistimages()" :key="index">
           <div v-if="index === 0">
             <q-img
@@ -16,6 +17,20 @@
           </div>
         </div>
       </q-card>
+      <div v-if="!isInModif && getlistimages().length <= 0 && imagebak">
+
+        <q-card :class="getclass()" @click="ImgFullScreen(mygallery)">
+          <q-img
+            :src="imagebak" :class="getclimg()">
+          </q-img>
+        </q-card>
+
+      </div>
+      <q-btn
+        v-if="isInModif"
+        color="primary" @click="apri"
+        :label="$t('gallery.select_image')">
+      </q-btn>
     </div>
   </div>
   <div v-else>
@@ -53,8 +68,8 @@
                 </div>
               </q-img>
 
-
               <q-field
+                v-if="canModify"
                 stack-label
                 dense
                 label="Nome File">
@@ -65,6 +80,7 @@
               </q-field>
 
               <q-input
+                v-if="canModify"
                 v-model="mygallery.description"
                 dense
                 :label="$t('proj.longdescr')"
@@ -156,7 +172,8 @@
                   Foto {{ index + 1 }}
                 </div>
                 <q-space></q-space>
-                <q-btn v-if="canModify" flat round color="red" icon="fas fa-trash-alt" @click="deleteFile(mygallery)"></q-btn>
+                <q-btn v-if="canModify" flat round color="red" icon="fas fa-trash-alt"
+                       @click="deleteFile(mygallery)"></q-btn>
               </q-bar>
 
               <q-card
@@ -178,6 +195,7 @@
                 </q-img>
                 <q-card-section>
                   <q-field
+                    v-if="canModify"
                     stack-label
                     dense
                     label="Nome File">
@@ -187,6 +205,7 @@
 
                   </q-field>
                   <q-input
+                    v-if="canModify"
                     v-model="mygallery.description"
                     dense
                     :label="$t('proj.longdescr')"
@@ -220,6 +239,15 @@
               ></q-uploader>
             </div>
           </div>
+          <div v-if="!isInModif && getlistimages().length <= 0 && imagebak">
+
+            <q-card :class="getclass()" @click="ImgFullScreen(mygallery)">
+              <q-img
+                :src="imagebak" :class="getclimg()">
+              </q-img>
+            </q-card>
+
+          </div>
         </div>
 
 
diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue
index 7be6963a..fa07152e 100755
--- a/src/components/CGridTableRec/CGridTableRec.vue
+++ b/src/components/CGridTableRec/CGridTableRec.vue
@@ -65,6 +65,7 @@
             :props="props"
             class="text-italic text-weight-bold"
           >
+
             <span v-if="col && showColCheck(col, tools.TIPOVIS_SHOW_RECORD, true)">
               {{ col.label }}
             </span>
@@ -266,6 +267,7 @@
             <div
               v-if="showColCheck(col, tools.TIPOVIS_SHOW_RECORD, true, 1, props.row)" class="tdclass">
               <div :class="getclrow(props.row)">
+
                 <CMyPopupEdit
                   :table="mytable"
                   :canEdit="canEdit"
@@ -353,7 +355,6 @@
             <q-card-section class="inset-shadow">
               <q-list dense>
                 <div v-for="col in mycolumns" :key="col.name">
-
                   <q-item v-if="showColCheck(col, tools.TIPOVIS_SHOW_RECORD, false, tools.getValue(props.row,col.field, col.subfield))"
                           :class="clByCol(col)" class="riduci_pad">
 
@@ -414,7 +415,6 @@
             <div
               class="q-ma-sm q-pa-sm colmodif col-grow rounded-borders " style="border: 1px solid #bbb"
               @click="colclicksel = mycol">
-
               <CMyPopupEdit
                 :table="mytable"
                 :canEdit="true"
diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.vue b/src/components/CMyPopupEdit/CMyPopupEdit.vue
index b168f076..82a66b06 100755
--- a/src/components/CMyPopupEdit/CMyPopupEdit.vue
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.vue
@@ -107,13 +107,12 @@
             </div>
           </div>
           <div v-else-if="col.fieldtype === costanti.FieldType.listimages" style="text-align: center;">
-            <p v-if="isInModif">
-              {{ $t('reg.image') }}:
-            </p>
             <CGallery
+              :imagebak="col.showpicprofile_ifnotset ? userStore.getImgByProfile(row) : ''"
               :title="getTitleGall()"
               :directory="getDirectoryGall()"
               :imgGall="myvalue"
+              :isInModif="isInModif"
               :edit="isviewfield() && isInModif"
               :canModify="canModify && isInModif"
               @showandsave="Savedb">
@@ -123,11 +122,13 @@
             <div v-if="canEdit">
               {{ $t('reg.photo') }}
               <CGallery
+                :imagebak="col.showpicprofile_ifnotset ? userStore.getImgByProfile(row['profile']) : ''"
                 :title="getTitleGall()"
                 :directory="getDirectoryGall()"
                 :imgGall="[{ imagefile: myvalue }]"
                 :edit="isviewfield()"
                 :canModify="canModify"
+                :isInModif="isInModif"
                 :single="isFieldDb()"
                 @update:imgGall="changevalRec"
                 @showandsave="Savedb">
diff --git a/src/css/app.scss b/src/css/app.scss
index 38d0c5b3..6e506048 100755
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -876,7 +876,7 @@ $heightBtn: 100%;
 
 .myimg-view {
   border-radius: 5px !important;
-  height: 80px;
+  height: 90px;
 }
 
 .dialog_card{
diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts
index 5f830c1a..ebcccb4d 100755
--- a/src/model/GlobalStore.ts
+++ b/src/model/GlobalStore.ts
@@ -522,6 +522,7 @@ export interface IColGridTable {
   field_extra1?: string
   subfield_extra1?: string
   allowNewValue?: boolean
+  showpicprofile_ifnotset?: boolean
 }
 
 export interface ITableRec {
diff --git a/src/rootgen/admin/importdata/importdata.ts b/src/rootgen/admin/importdata/importdata.ts
index ba78b6f2..9a547f28 100755
--- a/src/rootgen/admin/importdata/importdata.ts
+++ b/src/rootgen/admin/importdata/importdata.ts
@@ -155,35 +155,39 @@ export default defineComponent({
         if (sector)
           sector = sector.replace('\'', '\\\'')
 
-        idSector = findidSector(sector)
-        if (!idSector) {
-          idSector = createSector(sector)
+        if (sector) {
+          idSector = findidSector(sector)
+          if (!idSector) {
+            idSector = createSector(sector)
 
-          // sectors
-          strsectors += '{ \n'
-          strsectors += '   _id:' + idSector + ','
-          strsectors += '   descr:\'' + sector + '\','
-          strsectors += '}, \n'
-        }
+            // sectors
+            strsectors += '{ \n'
+            strsectors += '   _id:' + idSector + ','
+            strsectors += '   descr:\'' + sector + '\','
+            strsectors += '}, \n'
+          }
 
-        idSkill = findidSkill(skill)
-        if (!idSkill) {
-          idSkill = createSkill(skill)
+          if (skill !== '') {
+            idSkill = findidSkill(skill)
+            if (!idSkill) {
+              idSkill = createSkill(skill)
 
-          // skills
-          strskills += '{ \n'
-          strsectors += '   _id:' + idSkill + ','
-          strskills += '   idSector: [' + idSector + '],'
-          strskills += '   descr:\'' + skill + '\','
-          strskills += '}, \n'
-        }
+              // skills
+              strskills += '{ \n'
+              strsectors += '   _id:' + idSkill + ','
+              strskills += '   idSector: [' + idSector + '],'
+              strskills += '   descr:\'' + skill + '\','
+              strskills += '}, \n'
+            }
+          }
 
-        if (sotto_cat !== '') {
-          // subskills
-          strsubskills += '{ \n'
-          strsubskills += '   idSkill: ' + idSkill + ','
-          strsubskills += '   descr:\'' + sotto_cat + '\','
-          strsubskills += '}, \n'
+          if (sotto_cat !== '') {
+            // subskills
+            strsubskills += '{ \n'
+            strsubskills += '   idSkill: ' + idSkill + ','
+            strsubskills += '   descr:\'' + sotto_cat + '\','
+            strsubskills += '}, \n'
+          }
         }
 
         indrecsub++
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index 3bca71e5..ba39a450 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -21,6 +21,7 @@ const msg_it = {
       title: 'Titolo',
       directory: 'Directory',
       list: 'Lista',
+      select_image: 'Scegli un\'Immagine',
     },
     profile: {
       chisei: 'Chi Sei? Raccontaci di te:',
diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts
index 67e801f6..dafc0018 100755
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -60,6 +60,7 @@ function AddCol(params: IColGridTable) {
     field_extra1: (params.field_extra1 === undefined) ? '' : params.field_extra1,
     subfield_extra1: (params.subfield_extra1 === undefined) ? '' : params.subfield_extra1,
     allowNewValue: (params.allowNewValue === undefined) ? false : params.allowNewValue,
+    showpicprofile_ifnotset: (params.showpicprofile_ifnotset === undefined) ? false : params.showpicprofile_ifnotset,
     visible: (params.visible === undefined) ? true : params.visible,
     icon: (params.icon === undefined) ? '' : params.icon,
     action: (params.action === undefined) ? '' : params.action,
@@ -531,7 +532,9 @@ export const colmySkills = [
     label_trans: 'skill.photos',
     fieldtype: costanti.FieldType.listimages,
     jointable: '',
-    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
+    showpicprofile_ifnotset: true,
+    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView,
+    visible: true,
   }),
   AddCol({
     name: 'idSector',
diff --git a/src/views/user/editprofile/editprofile.vue b/src/views/user/editprofile/editprofile.vue
index 6931e403..0325ac0a 100755
--- a/src/views/user/editprofile/editprofile.vue
+++ b/src/views/user/editprofile/editprofile.vue
@@ -115,6 +115,7 @@
         mykey="profile"
         mysubkey="biografia"
         maxlength="300"
+        hint="Scrivi chi sei e quale percorso formativo hai fatto"
         :showall="true"
         :type="costanti.FieldType.string">
       </CMyFieldDb>