- posso fare upload dell'immagine del prodotto dalla lista

- corretto import dati
2024-03-02 22:53:35 +01:00
parent 93e58f444d
commit 71e4c91930
68 changed files with 240 additions and 161 deletions
--- a/src/common/shared_vuejs.ts
+++ b/src/common/shared_vuejs.ts
@@ -30,6 +30,7 @@ export const shared_consts = {
    LITRI: 3,
    MILLILITRI: 4,
    PEZZI: 10,
+    UOVA: 15,
  },

  TYPECASH: {
@@ -89,6 +90,11 @@ export const shared_consts = {
      short: 'p',
      value: 10,
    },
+    {
+      label: 'Uova',
+      short: 'uova',
+      value: 15,
+    },
  ],

  CallFunz: {
--- a/src/components/CGallery/CGallery.ts
+++ b/src/components/CGallery/CGallery.ts
@@ -96,7 +96,7 @@ export default defineComponent({
        }
      } else {
        gallerylist.value = [
-            ]
+        ]
      }

    }
@@ -229,12 +229,16 @@ export default defineComponent({
    function uploaded(info: any) {
      console.log('uploaded', info)
      if (gallerylist.value) {
-        for (const file of info.files) {
-          gallerylist.value.push({ imagefile: file.name })
+        if (props.single && info.files) {
+          console.log('gallerylist.value[0]', info.files[0].name)
+          gallerylist.value[0] = { imagefile: info.files[0].name }
+        } else {
+          for (const file of info.files) {
+            gallerylist.value.push({ imagefile: file.name })
+          }
        }

-        if (!props.single)
-          save()
+        save()

        console.log('gallerylist', gallerylist.value)
      }
@@ -260,9 +264,7 @@ export default defineComponent({

        console.log('single', props.single)

-        if (!props.single) {
-          save()
-        }
+        save()
      }
    }

@@ -280,8 +282,7 @@ export default defineComponent({
      tools.copyStringToClipboard($q, filename, true)
    }

-    function deleteFile(rec: any)
-    {
+    function deleteFile(rec: any) {
      console.log('deleteFile....')
      const filename = getfullname(rec)
      const filenamerel = filename.replace(/^.*[\\\/]/, '')
@@ -353,7 +354,7 @@ export default defineComponent({
      fullscreensrc.value = getfullname(mygallery)
    }

-    function onRejected (rejectedEntries: any) {
+    function onRejected(rejectedEntries: any) {
      // Notify plugin needs to be installed
      // https://quasar.dev/quasar-plugins/notify#Installation
      console.log('rejectedEntries', rejectedEntries)
--- a/src/components/CGallery/CGallery.vue
+++ b/src/components/CGallery/CGallery.vue
@@ -116,12 +116,12 @@
        <div class="q-pa-sm">
          <div v-if="edit" class="q-gutter-sm " style="max-height: 200px; width: 208px;">
            <q-uploader
-              label="Aggiungi Immagine"
+              :label="single && (gallerylist.length > 0 && gallerylist[0].imagefile !== '') ? 'Sostituisci Immagine' : 'Aggiungi Immagine'"
              accept="image/*"
              :url="getUrl()"
              :headers="tools.getheaders()"
              :max-file-size="3000000"
-              multiple
+              :multiple="!single"
              auto-upload
              hide-upload-btn
              no-thumbnails
--- a/src/components/CMyPopupEdit/CMyPopupEdit.ts
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.ts
@@ -263,6 +263,7 @@ export default defineComponent({
    })

    const myrow = ref(<any>null)
+    const mypath = ref('')

    /*     const myrow = computed(() => {
          return props.rec && props.isrec ? props.rec : props.row
@@ -328,6 +329,13 @@ export default defineComponent({
        }
      }

+      if (props.path) {
+        mypath.value = props.path
+      } else {
+        if (col.value.hasOwnProperty('path'))
+          mypath.value = col.value.path ? col.value.path : ''
+      }
+
      // console.log('CMyFieldDb crea', myvalue)
    }

@@ -612,6 +620,9 @@ export default defineComponent({
      } else if (col.value.fieldtype === costanti.FieldType.imgcard) {
        console.log('newVal.imagefile', newVal)
        myvalue.value = newVal
+      } else if (col.value.fieldtype === costanti.FieldType.image_and_filename) {
+        console.log('newVal.imagefile', newVal)
+        myvalue.value = newVal
      }

      if (col.value.fieldtype === costanti.FieldType.listobj) {
@@ -855,6 +866,7 @@ export default defineComponent({
      shared_consts,
      nameKeydown,
      gotoPage,
+      mypath,
    }
  }
 })
--- a/src/components/CMyPopupEdit/CMyPopupEdit.vue
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.vue
@@ -377,7 +377,7 @@
                  : ''
              "
              :title="tools.getTitleGall(table)"
-              :directory="tools.getDirectoryGall(myrow, table, path)"
+              :directory="tools.getDirectoryGall(myrow, table, mypath)"
              :imgGall="myvalue"
              :isInModif="isInModif"
              :edit="isviewfield() && isInModif"
@@ -409,7 +409,71 @@
                    : ''
                "
                :title="tools.getTitleGall(table)"
-                :directory="tools.getDirectoryGall(myrow, table, path)"
+                :directory="tools.getDirectoryGall(myrow, table, mypath)"
+                :imgGall="[{ imagefile: myvalue }]"
+                :edit="isviewfield()"
+                :canModify="canModify"
+                :isInModif="isInModif"
+                :single="true"
+                @update:imgGall="changevalRec"
+                @showandsave="Savedb"
+              >
+              </CGallery>
+            </div>
+            <div v-else>
+              <div v-if="myvalue" class="text-center">
+                <q-img
+                  :src="myvalue"
+                  class="text-center"
+                  style="height: 100px; width: 100px"
+                  alt="foto"
+                >
+                </q-img>
+              </div>
+              <div v-else class="text-center">
+                <q-img
+                  :src="
+                    col.showpicprofile_ifnotset
+                      ? userStore.getImgByProfile(row['profile'], true)
+                      : 'images/noimg-user.svg'
+                  "
+                  class="text-center"
+                  style="height: 100px; width: 100px"
+                  alt="nessuna immagine"
+                >
+                </q-img>
+              </div>
+              <q-btn
+                v-if="myvalue"
+                label="Rimuovi Foto"
+                color="blue"
+                icon="fas fa-trash-alt"
+                size="sm"
+                @click="removephoto"
+              ></q-btn>
+            </div>
+          </div>
+          <div
+            v-else-if="col.fieldtype === costanti.FieldType.image_and_filename"
+          >
+            <div v-if="canEdit">
+              {{ $t('reg.photo') }}
+              <q-input
+                v-model="myvalue"
+                @update:value="changevalRec"
+                @update:model-value="Savedb"
+                :maxlength="col.maxlength ? col.maxlength : undefined"
+                autofocus
+              >
+              </q-input>
+              <CGallery
+                :imagebak="
+                  col.showpicprofile_ifnotset
+                    ? userStore.getImgByProfile(row['profile'], true)
+                    : ''
+                "
+                :title="tools.getTitleGall(table)"
+                :directory="tools.getDirectoryGall(myrow, table, mypath)"
                :imgGall="[{ imagefile: myvalue }]"
                :edit="isviewfield()"
                :canModify="canModify"
@@ -464,7 +528,7 @@
                    : ''
                "
                :title="tools.getTitleGall(table)"
-                :directory="tools.getDirectoryGall(myrow, table, path)"
+                :directory="tools.getDirectoryGall(myrow, table, mypath)"
                :imgGall="[myvalue]"
                :edit="isviewfield()"
                :canModify="canModify"
@@ -1055,7 +1119,7 @@
          <q-popup-edit
            v-if="!isInModif && canEdit && noPopupeditByCol(col)"
            v-model="myvalue"
-            :disable="col.disable || disable"
+            :disable="(col.disable || disable) || (col.fieldtype === costanti.FieldType.image_and_filename)"
            :readonly="col.disable || disable"
            :title="col.title ? col.title : col.titlepopupedit"
            buttons
@@ -1079,8 +1143,7 @@
                col.fieldtype === costanti.FieldType.string ||
                col.fieldtype === costanti.FieldType.crypted
              "
-            >          
-
+            >
              <q-input
                v-bind="$attrs"
                counter
@@ -1097,9 +1160,9 @@
                @keyup.enter.stop
                autofocus
              >
-              <template v-if="notAllowAtChar" v-slot:prepend>
-                <span class="text-h7 text-blue">@</span>
-              </template>
+                <template v-if="notAllowAtChar" v-slot:prepend>
+                  <span class="text-h7 text-blue">@</span>
+                </template>
              </q-input>
            </div>
            <div v-else-if="col.fieldtype === costanti.FieldType.number">
@@ -1488,6 +1551,35 @@
                </CMyEditor>
              </div>
            </div>
+            <div v-else-if="col.fieldtype === costanti.FieldType.image_and_filename">
+              <div v-if="canEdit">
+                {{ $t('reg.photo') }}
+                <q-input
+                  v-model="myvalue"
+                  @update:value="changevalRec"
+                  :maxlength="col.maxlength ? col.maxlength : undefined"
+                  autofocus
+                >
+                </q-input>
+                <CGallery
+                  :imagebak="
+                    col.showpicprofile_ifnotset
+                      ? userStore.getImgByProfile(row['profile'], true)
+                      : ''
+                  "
+                  :title="tools.getTitleGall(table)"
+                  :directory="tools.getDirectoryGall(myrow, table, mypath)"
+                  :imgGall="[{ imagefile: myvalue }]"
+                  :edit="isviewfield()"
+                  :canModify="canModify"
+                  :isInModif="isInModif"
+                  :single="true"
+                  @update:imgGall="changevalRec"
+                  @showandsave="Savedb"
+                >
+                </CGallery>
+              </div>
+            </div>
            <div v-else-if="col.fieldtype === costanti.FieldType.color">
              <q-select
                :behavior="$q.platform.is.ios === true ? 'dialog' : 'menu'"
--- a/src/db/lang/ws_enUs.js
+++ b/src/db/lang/ws_enUs.js
@@ -8,6 +8,8 @@ const msg_website_enUs = {
  products: {
    quantity: 'Quantità',
    quantityAvailable: 'Disponibili',
+    stockQty: 'In Magazzino',
+    stockBloccatiQty: 'Bloccati In Magazzino',  
    weight: 'Peso',
    stars: 'Voto',
    color: 'Colore',
@@ -36,6 +38,7 @@ const msg_website_enUs = {
    productslist: 'Lista Prodotti',
    collabora: 'Collabora',
    storehouses: 'Magazzino',
+    providers: 'Fornitori',
    departments: 'Uffici',
    orders: 'Ordini Ricevuti',
    orders2: 'Ordini Ricevuti',
--- a/src/db/lang/ws_es.js
+++ b/src/db/lang/ws_es.js
@@ -8,6 +8,7 @@ const msg_website_es = {
  products: {
    quantity: 'Quantità',
    quantityAvailable: 'Disponibili',
+    stockQty: 'In Magazzino',
    weight: 'Peso',
    stars: 'Voto',
    color: 'Colore',
--- a/src/db/lang/ws_it.js
+++ b/src/db/lang/ws_it.js
@@ -1,9 +1,9 @@
 const msg_website_it = {
  ws: {
-    sitename: 'Riso',
-    siteshortname: 'RISO',
-    description: 'Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.',
-    keywords: 'riso, piattaforma di scambio, rete italiana scambio orizzontale, riso app, riso piattaforma, scambio e baratto, momenta RIS',
+    sitename: 'Più che Buono',
+    siteshortname: 'Più che Buono',
+    description: '',
+    keywords: '',
  },
  hours: {
    descr: 'Descrizione',
@@ -16,23 +16,35 @@ const msg_website_it = {
  pages: {
    home: 'Home',
    profile: 'Profilo',
+    install_site: 'Installa Sito',
    profile2: 'ProfiloU',
    mypage2: 'mypage2',
    myservice2: 'myservice2',
    myhosps2: 'myhosps2',
    mygood2: 'mygood2',
+    catalogo: 'Catalogo',
    fundraising: 'Sostieni il Progetto',
    notifs: 'Configura le Notifiche',
    unsubscribe: 'Disiscriviti',
+    unsubscribe_user: 'Disiscriviti User',
    test: 'Test',
    projects: 'Progetti',
    report: 'Report Ore',
    producer: 'Produttore',
    orderinfo: 'Ordini Effettuati',
    products: 'Prodotti',
+    cash: 'Cassa',
+    productInfos: 'Info Prodotti',
+    listinoprodotti: 'Listino Prodotti',
    productslist: 'Lista Prodotti',
    collabora: 'Collabora',
+    categories: 'Categorie',
    storehouses: 'Magazzino',
+    providers: 'Fornitori',
+    catprods: 'Categorie',
+    subcatprods: 'Sotto-Categorie',
+    gasordine: 'Gas Ordine',
+    scontisticas: 'Scontistica',
    departments: 'Uffici',
    orders: 'Ordini Ricevuti',
    orders2: 'Ordini Ricevuti',
@@ -121,9 +133,11 @@ const msg_website_it = {
    only_residenti: 'Solo Residenti',
    only_consiglio: 'Solo Consiglieri',
    color: 'Colore',
+    gasordini: 'Gas Ordini',
+    gestoreordini: 'Gestore Ordini',
  },
  msg: {
-    myAppName: 'Riso',
+    myAppName: 'Più che Buono',
    myAppDescription: 'Il primo Vero Social Libero, Equo e Solidale, dove Vive Consapevolezza e Aiuto Comunitario. Gratuito',
    underconstruction: 'App in costruzione...',
    myDescriz: '',
--- a/src/db/static_data.ts
+++ b/src/db/static_data.ts
@@ -7,30 +7,6 @@ import {
 import { func } from '@store/Modules/fieldsTable'


-// const SHOW_PROJINTHEMENU = false
-//
-// let arrlistafavourite = []
-// let arrlistaprojtutti = []
-// let arrlistaprojmiei = []
-// if (SHOW_PROJINTHEMENU) {
-//   arrlistaprojtutti = Projects.getters.listaprojects(RouteNames.projectsall)
-//   arrlistaprojmiei = Projects.getters.listaprojects(RouteNames.myprojects)
-//   arrlistafavourite = Projects.getters.listaprojects(RouteNames.favouriteprojects)
-// }
-// PROGETTI -> FAVORITI :
-
-// if (arrlistafavourite.length > 0) {
-//   arrMenu.push({
-//     icon: 'favorite_border',
-//     nametranslate: 'pages.' + RouteNames.favouriteprojects,
-//     urlroute: RouteNames.favouriteprojects,
-//     level_parent: 0.0,
-//     level_child: 0.5,
-//     routes2: arrlistafavourite,
-//     idelem: ''
-//   })
-// }
-
 const firstPage = {
  active: true,
  order: 5,
@@ -57,72 +33,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      inmenu: true,
      infooter: true,
    },
-    {
-      active: true,
-      order: 400,
-      path: '/test',
-      materialIcon: 'fas fa-test',
-      name: 'mypages.test',
-      component: () => import('@/views/testServer/testServer.vue'),
-      inmenu: false,
-      infooter: false,
-    },
-    {
-      active: true,
-      order: 12,
-      path: '/goods',
-      materialIcon: 'fas fa-tshirt',
-      name: 'mypages.goods',
-      component: () => import('@/root/goods/goods.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
-    {
-      active: true,
-      order: 15,
-      path: '/services',
-      materialIcon: 'fas fa-house-user',
-      name: 'mypages.services',
-      component: () => import('@/root/services/services.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
-    {
-      active: true,
-      order: 15,
-      path: '/provapao',
-      materialIcon: 'fas fa-house-user',
-      name: 'mypages.provapao',
-      component: () => import('@/root/provapao/provapao.vue'),
-      meta: { requiresAuth: true },
-      inmenu: false,
-      infooter: false,
-    },
-    {
-      active: true,
-      order: 15,
-      path: '/hosps',
-      materialIcon: 'fas fa-bed',
-      name: 'mypages.hosp',
-      component: () => import('@/root/hosp/hosp.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
-    {
-      active: site.confpages && site.confpages.enableCircuits,
-      order: 16,
-      path: '/circuits',
-      materialIcon: 'fas fa-coins',
-      name: 'mypages.circuits',
-      component: () => import('@/views/user/mycircuits/mycircuits.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
-    {
+    /*{
      active: true,
      order: 20,
      path: '/events',
@@ -132,6 +43,17 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      meta: { requiresAuth: true },
      inmenu: true,
      infooter: true,
+    },*/
+    {
+      active: site.confpages && site.confpages.showProfile,
+      order: 120,
+      path: '/myprofile',
+      materialIcon: 'fas fa-user',
+      name: 'pages.profile',
+      component: () => import('@/views/user/myprofile/myprofile.vue'),
+      meta: { requiresAuth: true },
+      inmenu: true,
+      infooter: true,
    },
    {
      active: true,
@@ -145,18 +67,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      infooter: false,
    },
    {
-      active: true,
-      order: 120,
-      path: '/myprofile',
-      materialIcon: 'fas fa-user',
-      name: 'pages.profile',
-      component: () => import('@/views/user/myprofile/myprofile.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
-    {
-      active: true,
+      active: site.confpages && site.confpages.showProfile,
      order: 120,
      path: '/editprofile',
      materialIcon: 'fas fa-user',
@@ -167,7 +78,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      infooter: false,
    },
    {
-      active: true,
+      active: site.confpages && site.confpages.showiscrittiMenu,
      order: 130,
      path: '/friends',
      materialIcon: 'fas fa-user-friends',
@@ -177,6 +88,19 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      inmenu: true,
      infooter: true,
    },
+    {
+      active: site.confpages && site.confpages.enableCircuits,
+      order: 16,
+      path: '/circuits',
+      materialIcon: 'fas fa-coins',
+      name: 'mypages.circuits',
+      component: () => import('@/views/user/mycircuits/mycircuits.vue'),
+      meta: { requiresAuth: true },
+      inmenu: true,
+      infooter: true,
+      onlyAdmin: true,
+      onlyManager: true,
+    },
    {
      active: site.confpages && site.confpages.enableGroups,
      order: 132,
@@ -187,6 +111,8 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      meta: { requiresAuth: true },
      inmenu: true,
      infooter: false,
+      onlyAdmin: true,
+      onlyManager: true,
    },
    {
      active: true,
--- a/src/model/GlobalStore.ts
+++ b/src/model/GlobalStore.ts
@@ -781,6 +781,7 @@ export interface IColGridTable {
  showpicprofile_ifnotset?: boolean
  extrafield?: string
  tipoconto?: number
+  path?: string
 }

 export interface ITableRec {
--- a/src/rootgen/admin/importdata/importdata.ts
+++ b/src/rootgen/admin/importdata/importdata.ts
@@ -358,7 +358,8 @@ export default defineComponent({
          if (opt.iseuro) {
            valstr = tools.convertPriceEurToValue(valstr)
          }
-          valstr = tools.removeescape(tools.addslashes(valstr))
+          valstr = tools.removeescape(valstr)
+          // valstr = tools.addslashes(valstr)
          if (!opt.primo)
            risultato += ', '

--- a/src/store/Modules/costanti.ts
+++ b/src/store/Modules/costanti.ts
@@ -374,6 +374,7 @@ export const costanti = {
    listimages: 1024,
    exact: 2048,
    image: 3000,
+    image_and_filename: 3100,
    imgcard: 3500,
    select_by_server: 4000,
    multiselect_by_server: 4010,
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -101,6 +101,7 @@ function AddCol(params: IColGridTable) {
    minlength: (params.minlength === undefined) ? 0 : params.minlength,
    filter_field: (params.filter_field === undefined) ? '' : params.filter_field,
    isadvanced_field: (params.isadvanced_field === undefined) ? false : params.isadvanced_field,
+    path: (params.path === undefined) ? '' : params.path,
  }
 }

@@ -2040,7 +2041,7 @@ export const colTableProductInfos = [
  AddCol({ name: 'name', label_trans: 'products.name' }),
  AddCol({ name: 'description', label_trans: 'products.description', fieldtype: costanti.FieldType.html }),
  AddCol({ name: 'icon', label_trans: 'products.icon' }),
-  AddCol({ name: 'img', label_trans: 'products.img' }),
+  AddCol({ name: 'img', label_trans: 'products.img', fieldtype: costanti.FieldType.image_and_filename, path: 'upload/products/'  }),
  AddCol({
    name: 'department',
    label_trans: 'products.department',
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -8363,6 +8363,15 @@ export const tools = {
    return inputString.replace(/[^\d.,]/g, '').replace(',', '.');
  },

+  escapeQuotes(stringa: string) {
+    return stringa.replace(/"/g, '\\"');
+  },
+
+  replaceQuotesWithSingleQuotes(jsonString: string) {
+    return jsonString.replace(/"/g, "'");
+  },
+
+
  removeescape(inputString: string): string {
    return inputString.replace('\\', '').replace(/"/g, '')
  },