diff --git a/.env b/.env index 62a4d643..2e35aeff 100755 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ -VITE_APP_VERSION="1.2.50" +VITE_APP_VERSION="1.2.52" VITE_LANG_DEFAULT="it" VITE_PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" -VITE_SERVICE_WORKER_FILE="sw-1.2.50.js" +VITE_SERVICE_WORKER_FILE="sw-1.2.52.js" VITE_PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" VITE_VUE_ROUTER_MODE="history" \ No newline at end of file diff --git a/index.html b/index.html index 0b8c937f..5347a381 100755 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ - + diff --git a/package.json b/package.json index 5a553b88..ddfea73c 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gruppomacro", - "version": "1.2.50", + "version": "1.2.52", "description": "Gruppo Macro", "productName": "Gruppo Macro", "author": "Surya", @@ -9,20 +9,20 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8089 APP_VERSION='1.2.50' quasar dev", + "dev": "PORT=8089 APP_VERSION='1.2.52' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.50' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.50' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.52' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.52' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", - "buildspa": "APP_VERSION='1.2.50' quasar build -m spa", + "buildspa": "APP_VERSION='1.2.52' quasar build -m spa", "lint": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\"", "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt", "fix": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\" --ignore-pattern .gitignore ./ --fix > file.out.txt", - "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.50' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.50' quasar dev", + "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.52' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.52' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/scripts/_ALL_SITES/comunitanuovomondo.app/package.json b/scripts/_ALL_SITES/comunitanuovomondo.app/package.json index 3b785d74..3071a237 100755 --- a/scripts/_ALL_SITES/comunitanuovomondo.app/package.json +++ b/scripts/_ALL_SITES/comunitanuovomondo.app/package.json @@ -1,6 +1,6 @@ { "name": "cnm", - "version": "1.2.50", + "version": "1.2.52", "description": "Comunita Nuovo Mondo", "productName": "ComunitaNuovoMondo", "author": "Surya", @@ -9,7 +9,7 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8083 APP_VERSION='1.2.50' quasar dev", + "dev": "PORT=8083 APP_VERSION='1.2.52' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", "buildpwa": "NODE_ENV=production quasar build -m pwa", @@ -21,8 +21,8 @@ "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt", "fix": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\" --ignore-pattern .gitignore ./ --fix > file.out.txt", - "pwa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.50' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.50' quasar dev", + "pwa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.52' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.52' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/scripts/_ALL_SITES/freeplanet.app/package.json b/scripts/_ALL_SITES/freeplanet.app/package.json index 1b4d2d70..c9f4e9b2 100755 --- a/scripts/_ALL_SITES/freeplanet.app/package.json +++ b/scripts/_ALL_SITES/freeplanet.app/package.json @@ -1,6 +1,6 @@ { "name": "freeplanet", - "version": "1.2.50", + "version": "1.2.52", "description": "freeplanet", "productName": "freeplanet", "author": "Surya", @@ -9,11 +9,11 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8087 APP_VERSION='1.2.50' quasar dev", + "dev": "PORT=8087 APP_VERSION='1.2.52' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.50' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.50' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.52' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.52' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", "buildspa": "quasar build -m spa", @@ -21,8 +21,8 @@ "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt", "fix": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\" --ignore-pattern .gitignore ./ --fix > file.out.txt", - "pwa": "NODE_ENV=development PORT=8097 APP_VERSION='1.2.50' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8087 APP_VERSION='1.2.50' quasar dev", + "pwa": "NODE_ENV=development PORT=8097 APP_VERSION='1.2.52' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8087 APP_VERSION='1.2.52' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/scripts/_ALL_SITES/gruppomacro.app/package.json b/scripts/_ALL_SITES/gruppomacro.app/package.json index 5a4ac068..54adfc47 100755 --- a/scripts/_ALL_SITES/gruppomacro.app/package.json +++ b/scripts/_ALL_SITES/gruppomacro.app/package.json @@ -1,6 +1,6 @@ { "name": "gruppomacro", - "version": "1.2.50", + "version": "1.2.52", "description": "Gruppo Macro", "productName": "Gruppo Macro", "author": "Surya", @@ -9,20 +9,20 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8089 APP_VERSION='1.2.50' quasar dev", + "dev": "PORT=8089 APP_VERSION='1.2.52' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.50' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.50' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.52' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.52' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", - "buildspa": "APP_VERSION='1.2.50' quasar build -m spa", + "buildspa": "APP_VERSION='1.2.52' quasar build -m spa", "lint": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\"", "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt", "fix": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\" --ignore-pattern .gitignore ./ --fix > file.out.txt", - "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.50' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.50' quasar dev", + "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.52' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.52' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/scripts/_ALL_SITES/kolibrilab.it/package.json b/scripts/_ALL_SITES/kolibrilab.it/package.json index da81fd78..c3618621 100755 --- a/scripts/_ALL_SITES/kolibrilab.it/package.json +++ b/scripts/_ALL_SITES/kolibrilab.it/package.json @@ -1,6 +1,6 @@ { "name": "kolibrilab", - "version": "1.2.50", + "version": "1.2.52", "description": "kolibrilab", "productName": "kolibrilab", "author": "Surya Paolo", @@ -8,11 +8,11 @@ "keywords": [], "license": "MIT", "scripts": { - "dev": "PORT=8083 APP_VERSION='1.2.50' quasar dev", + "dev": "PORT=8083 APP_VERSION='1.2.52' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.50' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.50' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.52' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.52' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", "buildspa": "quasar build -m spa", @@ -20,8 +20,8 @@ "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt", "fix": "eslint --ext .ts,.vue --ignore-path .gitignore ./ --fix > file.out.txt", - "pwa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.50' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.50' quasar dev", + "pwa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.52' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.52' quasar dev", "spanorefresh": "NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 DEBUG=v8:* quasar dev -m spa", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js" diff --git a/scripts/_ALL_SITES/nutriben-naturopatia.it/package.json b/scripts/_ALL_SITES/nutriben-naturopatia.it/package.json index 38dc7ac9..a0558f02 100755 --- a/scripts/_ALL_SITES/nutriben-naturopatia.it/package.json +++ b/scripts/_ALL_SITES/nutriben-naturopatia.it/package.json @@ -1,6 +1,6 @@ { "name": "nutriben", - "version": "1.2.50", + "version": "1.2.52", "description": "Nutriben", "productName": "Nutriben", "author": "Surya", @@ -9,20 +9,20 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8093 APP_VERSION='1.2.50' quasar dev", + "dev": "PORT=8093 APP_VERSION='1.2.52' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.50' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.50' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.52' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.52' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", - "buildspa": "APP_VERSION='1.2.50' quasar build -m spa", + "buildspa": "APP_VERSION='1.2.52' quasar build -m spa", "lint": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\"", "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt", "fix": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\" --ignore-pattern .gitignore ./ --fix > file.out.txt", - "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.50' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.50' quasar dev", + "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.52' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.52' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/scripts/_ALL_SITES/piuchebuono.app/package.json b/scripts/_ALL_SITES/piuchebuono.app/package.json index fc4894ce..99890c20 100755 --- a/scripts/_ALL_SITES/piuchebuono.app/package.json +++ b/scripts/_ALL_SITES/piuchebuono.app/package.json @@ -1,6 +1,6 @@ { "name": "piuchebuono", - "version": "1.2.50", + "version": "1.2.52", "description": "PiuCheBuono", "productName": "PiuCheBuono", "author": "Surya", @@ -9,11 +9,11 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8085 APP_VERSION='1.2.50' quasar dev", + "dev": "PORT=8085 APP_VERSION='1.2.52' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.50' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.50' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.52' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.52' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", "buildspa": "quasar build -m spa", @@ -21,8 +21,8 @@ "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt", "fix": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\" --ignore-pattern .gitignore ./ --fix > file.out.txt", - "pwa": "NODE_ENV=development PORT=8085 APP_VERSION='1.2.50' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8085 APP_VERSION='1.2.50' quasar dev", + "pwa": "NODE_ENV=development PORT=8085 APP_VERSION='1.2.52' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8085 APP_VERSION='1.2.52' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/scripts/_ALL_SITES/riso.app/package.json b/scripts/_ALL_SITES/riso.app/package.json index b05fc87d..956ed961 100755 --- a/scripts/_ALL_SITES/riso.app/package.json +++ b/scripts/_ALL_SITES/riso.app/package.json @@ -1,6 +1,6 @@ { "name": "riso", - "version": "1.2.50", + "version": "1.2.52", "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.", "productName": "Riso", "author": "Surya", @@ -9,11 +9,11 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "APP_VERSION='1.2.50' PORT=8084 quasar dev", + "dev": "APP_VERSION='1.2.52' PORT=8084 quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.50' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.50' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.52' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.52' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", "buildspa": "quasar build -m spa", @@ -21,8 +21,8 @@ "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt", "fix": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\" --ignore-pattern .gitignore ./ --fix > file.out.txt", - "pwa": "NODE_ENV=development PORT=8094 APP_VERSION='1.2.50' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8084 APP_VERSION='1.2.50' quasar dev", + "pwa": "NODE_ENV=development PORT=8094 APP_VERSION='1.2.52' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8084 APP_VERSION='1.2.52' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/src-pwa/custom-service-worker.js b/src-pwa/custom-service-worker.js index 0e43e58e..18953371 100755 --- a/src-pwa/custom-service-worker.js +++ b/src-pwa/custom-service-worker.js @@ -3,7 +3,7 @@ /* global workbox */ /* global cfgenv */ -const VITE_APP_VERSION = '1.2.50'; +const VITE_APP_VERSION = '1.2.52'; // Costanti di configurazione const DYNAMIC_CACHE = 'dynamic-cache-v2'; diff --git a/src/components/CCatalogList/CCatalogList.vue b/src/components/CCatalogList/CCatalogList.vue index 25d1ff6f..96bac320 100755 --- a/src/components/CCatalogList/CCatalogList.vue +++ b/src/components/CCatalogList/CCatalogList.vue @@ -6,7 +6,7 @@ :prop_mytable="table" :options="tools.optionsTable(table)" :prop_mytitlenew="tools.getTitleAnnuncio(table)" - prop_mytitle="Cataloghi" + prop_mytitle="" :prop_mycolumns="col" :prop_colkey="prop_colkey" :col_title="col_title" diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index c6da1185..b52339c5 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -524,6 +524,7 @@ row: opt.rowclass, 'items-stretch': opt.rowclass, 'justify-evenly': opt.rowclass, + 'q-col-gutter-y-md': opt.rowclass, }" >
- - +
- {{ myrec.title }} +
+ + {{ myrec.title }} + +
- {{ $t('cataloglist.numprodotti') }}: - {{ numprodottistr }} +   {{ $t('cataloglist.numprodotti') }}: + {{ + numprodottistr + }}
{{ $t('cataloglist.referenti') }}: {{ myrec.referenti ? myrec.referenti.join(', ') : '' }} @@ -103,18 +121,14 @@
-   - PDF OnLine - aggiornato al ({{ tools.getstrDate(myrec.data_online) }}) +   Aggiornato al ({{ + tools.getstrDate(myrec.data_online) + }})
  @@ -130,8 +144,12 @@ class="text-caption text-h7 text-grey q-pb-xs" > Lista generata il: - {{ tools.getstrDate(myrec.data_lista_generata) || '(non ancora generata)' }} da + {{ tools.getstrDate(myrec.data_lista_generata) || '(non ancora generata)' }} + da {{ myrec.username_lista_generata }}
@@ -140,11 +158,34 @@ + + - + />--> @@ -214,9 +255,15 @@ class="q-ma-sm" >
{ return allColumns.value.filter( - (col) => !col.visu || col.visu === costanti.VISUCAMPI.PER_TUTTI + (col) => !col.visu || col.visu === costanti.VISUCAMPI.PER_TUTTI || (col.visu === costanti.VISUCAMPI.PER_EDITORE && tools.isCollaboratore()) ); }); @@ -448,6 +447,7 @@ export default defineComponent({ if (props.table === shared_consts.TABLES_CATALOG) { selectedColumns.value = selectedColumns_Catalogs.value; } else { + // "products" selectedColumns.value = tools.isUtente() ? selectedColumns_Utenti.value : selectedColumns_Editori.value; diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index 03885987..458674d1 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -10351,6 +10351,22 @@ export const tools = { ); }, + isCollStampa() { + const userStore = useUserStore(); + return (userStore.isGrafico || userStore.isAdmin) + }, + + isCollaboratore() { + const userStore = useUserStore(); + + return ( + userStore.isEditor || + userStore.isCommerciale || + userStore.isAdmin || + userStore.isManager || userStore.isGrafico + ); + }, + getsearchList_RaccoltaCataloghi() { const lista = [ { diff --git a/src/views/ecommerce/catalogo/catalogo.scss b/src/views/ecommerce/catalogo/catalogo.scss index e1637ff6..445ebecf 100755 --- a/src/views/ecommerce/catalogo/catalogo.scss +++ b/src/views/ecommerce/catalogo/catalogo.scss @@ -186,4 +186,61 @@ body { font-weight: 600; border-color: #5c8ef4 !important; box-shadow: 0 0 0 2px rgba(92, 142, 244, 0.3); +} + +.pdf-link { + font-family: 'Arial', sans-serif; + font-size: 1.1rem; + color: #1a3f8a; + text-decoration: underline; + cursor: pointer; + transition: color 0.2s ease-in-out; + + &:hover { + color: #5c8ef4; + } +} + +.intestaz-col { + font-size: 1.10rem; +} + +.catalog-download-section { + padding: 2rem; + display: flex; + justify-content: center; + align-items: center; + background-color: #f9f9f9; +} + +.catalog-card { + border-radius: 16px; + max-width: 400px; + width: 100%; + transition: transform 0.2s ease-in-out; +} + +.catalog-card:hover { + transform: translateY(-5px); +} + +.hover-lift { + transition: transform 0.2s ease; +} + +.hover-lift:hover { + transform: translateY(-2px); +} + +.text-link{ + font-family: 'Arial', sans-serif; + font-size: 1.1rem; + color: #1a3f8a; + text-decoration: underline; + cursor: pointer; + transition: color 0.2s ease-in-out; + + &:hover { + color: #5c8ef4; + } } \ No newline at end of file diff --git a/src/views/ecommerce/catalogo/catalogo.ts b/src/views/ecommerce/catalogo/catalogo.ts index bcb7a5c1..5c22a0af 100755 --- a/src/views/ecommerce/catalogo/catalogo.ts +++ b/src/views/ecommerce/catalogo/catalogo.ts @@ -124,8 +124,13 @@ export default defineComponent({ { name: 'azioni', label: 'Azioni', field: 'azioni', align: 'center' }, ]; - const pdfRows = computed(() => [ + const pdfRows = computed(() => { + return pdfRowsall.value.filter((row) => row.visible); + }); + + const pdfRowsall = computed(() => [ { + visible: true, name: 'PDF Generato', pdf: myCatalog.value.pdf_generato, data: myCatalog.value.data_generato, @@ -135,15 +140,17 @@ export default defineComponent({ action: () => pubblicaPDF(false), }, { + visible: true, name: 'PDF Generato (Compresso)', pdf: myCatalog.value.pdf_generato_compressed, data: myCatalog.value.data_generato, showButton: true, - buttonLabel: 'Pubblica PDF OnLine (Compr)', + buttonLabel: 'Pubblica PDF Compresso', size: myCatalog.value.pdf_generato_compr_size, action: () => pubblicaPDF(true), }, { + visible: tools.isCollStampa(), name: 'PDF Generato Stampa', pdf: myCatalog.value.pdf_generato_stampa, data: myCatalog.value.data_generato_stampa, @@ -153,11 +160,12 @@ export default defineComponent({ action: () => pubblicaPDFStampa(false), }, { + visible: tools.isCollStampa(), name: 'PDF Generato Stampa (Compresso)', pdf: myCatalog.value.pdf_generato_stampa_compressed, data: myCatalog.value.data_generato_stampa, showButton: true, - buttonLabel: 'Pubblica PDF Stampa (Compr)', + buttonLabel: 'Pubblica PDF Stampa (Compresso)', size: myCatalog.value.pdf_generato_stampa_compr_size, action: () => pubblicaPDFStampa(true), }, @@ -326,7 +334,8 @@ export default defineComponent({ () => tabcatalogo.value, () => { if (!onlyCatalogoPDF.value) { - tools.setCookie('TAB_CAT', tabcatalogo.value); + if (tabcatalogo.value === 'lista' || tabcatalogo.value === 'visu') + tools.setCookie('TAB_CAT', tabcatalogo.value); } } ); @@ -2534,7 +2543,6 @@ export default defineComponent({ idCatalog: myCatalog.value._id, stampa: instampa, comprimi: true, - compressione: 'printer', path: 'upload/cataloghi/', // idtag_pdfcontent: 'tag-catalogo', compressione: 'printer', diff --git a/src/views/ecommerce/catalogo/catalogo.vue b/src/views/ecommerce/catalogo/catalogo.vue index 668f99fe..755f0718 100755 --- a/src/views/ecommerce/catalogo/catalogo.vue +++ b/src/views/ecommerce/catalogo/catalogo.vue @@ -9,8 +9,9 @@
--> + + + +
+
+
+ + + + + + + + + +
+
+ + +
+
+ Larghezza Pagina: + {{ + tools.adjustSize( + optcatalogo, + optcatalogo.dimensioni_def?.pagina?.size?.width, + null, + true, + { parteesternafissa: true } + ) + }}
+ Altezza Pagina: + {{ + tools.adjustSize( + optcatalogo, + optcatalogo.dimensioni_def?.pagina?.size?.height, + null, + true, + { parteesternafissa: true } + ) + }}
+ Margine Top: + {{ + tools.adjustSize( + optcatalogo, + optcatalogo.dimensioni_def?.pagina?.padding?.top, + null, + true, + { paddingTop: true, parteesternafissa: true } + ) + }} + - Bottom: + {{ + tools.adjustSize( + optcatalogo, + optcatalogo.dimensioni_def?.pagina?.padding?.bottom, + null, + true, + { paddingBottom: true, parteesternafissa: true } + ) + }} +
+
+ +
+
+ + +
+ Ratio: + {{ + optcatalogo.areadistampa.format[0] / + optcatalogo.areadistampa.format[1] + }} +
+ + +
+ Ratio: + {{ + optcatalogo.areadistampa.format_printable[0] / + optcatalogo.areadistampa.format_printable[1] + }} +
+ + + + + + + + + + + + + + + + +
+
+ +
+
+ +
+ {{ strout }} +
+
+
+
+
+
+ PDF generati Temporanei +
+ + + + + + + + + + +
+
+ +
+
+ + + +
+ Catalogo {{ `${myCatalog.title}` }} +
+
+
+ + + {{ + myCatalog.pdf_online + ? `${myCatalog.pdf_online_size} MB` + : '' + }} + + + Pubblicato il + + + {{ + myCatalog.pdf_online + ? tools.getstrDate(myCatalog.data_online) + : '' + }} + +
+
+ + + + + + + +
+
+ + + +
Versione per STAMPA
+
+
+ + + {{ + myCatalog.pdf_online + ? `${myCatalog.pdf_online_stampa_size} MB` + : '' + }} + + + Pubblicato il + + + {{ + myCatalog.pdf_online_stampa + ? tools.getstrDate(myCatalog.data_online_stampa) + : '' + }} + +
+
+ + + + + + + +
+
+
+
+
+
+ -
+
- -
-
- - - - - - - - - -
-
- - -
-
- Larghezza Pagina: - {{ - tools.adjustSize( - optcatalogo, - optcatalogo.dimensioni_def?.pagina?.size?.width, - null, - true, - { parteesternafissa: true } - ) - }}
- Altezza Pagina: - {{ - tools.adjustSize( - optcatalogo, - optcatalogo.dimensioni_def?.pagina?.size?.height, - null, - true, - { parteesternafissa: true } - ) - }}
- Margine - Top: - {{ - tools.adjustSize( - optcatalogo, - optcatalogo.dimensioni_def?.pagina?.padding?.top, - null, - true, - { paddingTop: true, parteesternafissa: true } - ) - }} - Bottom: - {{ - tools.adjustSize( - optcatalogo, - optcatalogo.dimensioni_def?.pagina?.padding?.bottom, - null, - true, - { paddingBottom: true, parteesternafissa: true } - ) - }} -
-
- -
-
- - -
- Ratio: - {{ - optcatalogo.areadistampa.format[0] / - optcatalogo.areadistampa.format[1] - }} -
- - -
- Ratio: - {{ - optcatalogo.areadistampa.format_printable[0] / - optcatalogo.areadistampa.format_printable[1] - }} -
- - - - - - - - - - - - - - - - -
-
- -
-
- -
- {{ strout }} -
- -
-
-
- PDF generati Temporanei -
- - - - - - - - - - - -
-
- PDF Pubblicati OnLine -
- - - - - - - - - - - - - - -
- PDF OnLine - {{ myCatalog.pdf_online_size }} MB - {{ tools.getstrDateTime(myCatalog.data_online) }} -
- PDF OnLine Stampa - {{ myCatalog.pdf_online_stampa_size }} MB - {{ tools.getstrDateTime(myCatalog.data_online_stampa) }} -
-
-
-
- -
- - @@ -906,9 +1032,17 @@ >
-
+
Seleziona {{ filtroStrApplicato }} @@ -965,7 +1099,12 @@ >
isStampa: {{ isStampa }} generazionePDFInCorso: {{ optcatalogo.generazionePDFInCorso }} getScaleX: - {{ tools.getScaleX(optcatalogo, recscheda.scheda) }} getScaleY: + {{ tools.getScaleX(optcatalogo, recscheda.scheda) }} + getScaleY: {{ tools.getScaleY(optcatalogo, recscheda.scheda) }} IMG: