diff --git a/.env b/.env index 3678a05a..62a4d643 100755 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ -VITE_APP_VERSION="1.2.49" +VITE_APP_VERSION="1.2.50" VITE_LANG_DEFAULT="it" VITE_PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" -VITE_SERVICE_WORKER_FILE="sw-1.2.49.js" +VITE_SERVICE_WORKER_FILE="sw-1.2.50.js" VITE_PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" VITE_VUE_ROUTER_MODE="history" \ No newline at end of file diff --git a/alimentazione_sana-stampabile_compressed copia-converted.pdf b/alimentazione_sana-stampabile_compressed copia-converted.pdf deleted file mode 100644 index 3983fcdb..00000000 Binary files a/alimentazione_sana-stampabile_compressed copia-converted.pdf and /dev/null differ diff --git a/alimentazione_sana-stampabile_compressed copia-converted_compressed.pdf b/alimentazione_sana-stampabile_compressed copia-converted_compressed.pdf deleted file mode 100644 index 122a39ef..00000000 Binary files a/alimentazione_sana-stampabile_compressed copia-converted_compressed.pdf and /dev/null differ diff --git a/index.html b/index.html index 34f83caf..0b8c937f 100755 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ - + diff --git a/package.json b/package.json index 75c0f546..5a553b88 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gruppomacro", - "version": "1.2.49", + "version": "1.2.50", "description": "Gruppo Macro", "productName": "Gruppo Macro", "author": "Surya", @@ -9,20 +9,20 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8089 APP_VERSION='1.2.49' quasar dev", + "dev": "PORT=8089 APP_VERSION='1.2.50' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.49' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.49' quasar build -m pwa", + "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", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", - "buildspa": "APP_VERSION='1.2.49' quasar build -m spa", + "buildspa": "APP_VERSION='1.2.50' 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.49' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.49' quasar dev", + "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", "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 fd61b974..3b785d74 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.49", + "version": "1.2.50", "description": "Comunita Nuovo Mondo", "productName": "ComunitaNuovoMondo", "author": "Surya", @@ -9,7 +9,7 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8083 APP_VERSION='1.2.49' quasar dev", + "dev": "PORT=8083 APP_VERSION='1.2.50' 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.49' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.49' quasar dev", + "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", "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 c73f533e..1b4d2d70 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.49", + "version": "1.2.50", "description": "freeplanet", "productName": "freeplanet", "author": "Surya", @@ -9,11 +9,11 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8087 APP_VERSION='1.2.49' quasar dev", + "dev": "PORT=8087 APP_VERSION='1.2.50' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.49' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.49' quasar build -m pwa", + "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", "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.49' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8087 APP_VERSION='1.2.49' quasar dev", + "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", "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 410cf5a7..5a4ac068 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.49", + "version": "1.2.50", "description": "Gruppo Macro", "productName": "Gruppo Macro", "author": "Surya", @@ -9,20 +9,20 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8089 APP_VERSION='1.2.49' quasar dev", + "dev": "PORT=8089 APP_VERSION='1.2.50' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.49' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.49' quasar build -m pwa", + "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", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", - "buildspa": "APP_VERSION='1.2.49' quasar build -m spa", + "buildspa": "APP_VERSION='1.2.50' 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.49' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.49' quasar dev", + "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", "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 7c552307..da81fd78 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.49", + "version": "1.2.50", "description": "kolibrilab", "productName": "kolibrilab", "author": "Surya Paolo", @@ -8,11 +8,11 @@ "keywords": [], "license": "MIT", "scripts": { - "dev": "PORT=8083 APP_VERSION='1.2.49' quasar dev", + "dev": "PORT=8083 APP_VERSION='1.2.50' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.49' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.49' quasar build -m pwa", + "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", "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.49' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.49' quasar dev", + "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", "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 b8ddf85d..38dc7ac9 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.49", + "version": "1.2.50", "description": "Nutriben", "productName": "Nutriben", "author": "Surya", @@ -9,20 +9,20 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8093 APP_VERSION='1.2.49' quasar dev", + "dev": "PORT=8093 APP_VERSION='1.2.50' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.49' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.49' quasar build -m pwa", + "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", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", - "buildspa": "APP_VERSION='1.2.49' quasar build -m spa", + "buildspa": "APP_VERSION='1.2.50' 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.49' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.49' quasar dev", + "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", "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 82388618..fc4894ce 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.49", + "version": "1.2.50", "description": "PiuCheBuono", "productName": "PiuCheBuono", "author": "Surya", @@ -9,11 +9,11 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8085 APP_VERSION='1.2.49' quasar dev", + "dev": "PORT=8085 APP_VERSION='1.2.50' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.49' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.49' quasar build -m pwa", + "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", "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.49' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8085 APP_VERSION='1.2.49' quasar dev", + "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", "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 dd2221da..b05fc87d 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.49", + "version": "1.2.50", "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.49' PORT=8084 quasar dev", + "dev": "APP_VERSION='1.2.50' PORT=8084 quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.49' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.49' quasar build -m pwa", + "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", "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.49' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8084 APP_VERSION='1.2.49' quasar dev", + "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", "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 27a14ce7..0e43e58e 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.49'; +const VITE_APP_VERSION = '1.2.50'; // Costanti di configurazione const DYNAMIC_CACHE = 'dynamic-cache-v2'; diff --git a/src/components/CProductTable/CProductTable.ts b/src/components/CProductTable/CProductTable.ts index 7cae489d..0921840f 100755 --- a/src/components/CProductTable/CProductTable.ts +++ b/src/components/CProductTable/CProductTable.ts @@ -200,12 +200,24 @@ export default defineComponent({ field: 'pdf_online', align: 'center', }, + { + name: 'pdf_online_size', + label: 'Size', + field: 'pdf_online_size', + align: 'center', + }, { name: 'pdf_online_stampa', label: 'PDF OnLine Stampa', field: 'pdf_online_stampa', align: 'center', }, + { + name: 'pdf_online_stampa_size', + label: 'Size', + field: 'pdf_online_stampa_size', + align: 'center', + }, { name: 'data_online', label: 'Data Online', diff --git a/src/model/CatalogStore.ts b/src/model/CatalogStore.ts index 627c53fe..7e25abbb 100755 --- a/src/model/CatalogStore.ts +++ b/src/model/CatalogStore.ts @@ -26,15 +26,23 @@ export interface ICatalog { backcolor?: string pdf_generato?: string + pdf_generato_compressed?: string + pdf_generato_compr_size?: string + pdf_generato_size?: string data_generato?: Date data_lista_generata?: Date username_lista_generata?: string pdf_online?: string + pdf_online_size?: string data_online?: Date pdf_generato_stampa?: string + pdf_generato_stampa_compr_size?: string + pdf_generato_stampa_compressed?: string + pdf_generato_stampa_size?: string data_generato_stampa?: Date pdf_online_stampa?: string + pdf_online_stampa_size?: string data_online_stampa?: Date date_created?: Date, diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index 32b6a8cb..5079bcb4 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -10571,7 +10571,7 @@ export const tools = { // Se stai lavorando su schermi o canvas ad alta densità (es. retina), potresti usare dpi = 144 o leggere dinamicamente: let dpi = shared_consts.PUNTI_PER_POLLICE; // 96 è il valore standard per 1x DPI - dpi = dpi * window.devicePixelRatio + dpi = dpi * window.devicePixelRatio; const mmPerInch = 25.4; return (myvalpx / dpi) * mmPerInch; } catch (e) { @@ -10580,13 +10580,19 @@ export const tools = { }, getURLByHostAndFilePath(filepath: string) { try { - let myurl = filepath.startsWith('/') ? tools.getHost() + filepath : tools.getHost() + '/' + filepath - return myurl + let myurl = filepath.startsWith('/') + ? tools.getHost() + filepath + : tools.getHost() + '/' + filepath; + return myurl; } catch (e) { - return filepath + return filepath; } }, + getFileCompresso(filename: string) { + return this.removeFileExtension(filename) + `_compressed.pdf`; + } + // FINE ! // getLocale() { diff --git a/src/views/ecommerce/catalogo/catalogo.ts b/src/views/ecommerce/catalogo/catalogo.ts index 7bcdea86..ca393228 100755 --- a/src/views/ecommerce/catalogo/catalogo.ts +++ b/src/views/ecommerce/catalogo/catalogo.ts @@ -105,6 +105,7 @@ export default defineComponent({ const pdfColumns = [ { name: 'name', label: 'Nome', field: 'name', align: 'left' }, { name: 'pdf', label: 'PDF', field: 'pdf', align: 'left' }, + { name: 'size', label: 'Dimensione del file', field: 'size', align: 'right' }, { name: 'data', label: 'Data', field: 'data', align: 'left' }, { name: 'azioni', label: 'Azioni', field: 'azioni', align: 'center' }, ]; @@ -114,17 +115,37 @@ export default defineComponent({ name: 'PDF Generato', pdf: myCatalog.value.pdf_generato, data: myCatalog.value.data_generato, - showButton: myCatalog.value.data_generato !== myCatalog.value.data_online, + showButton: true, buttonLabel: 'Pubblica PDF OnLine', - action: pubblicaPDF, + size: myCatalog.value.pdf_generato_size, + action: () => pubblicaPDF(false), + }, + { + name: 'PDF Generato (Compresso)', + pdf: myCatalog.value.pdf_generato_compressed, + data: myCatalog.value.data_generato, + showButton: true, + buttonLabel: 'Pubblica PDF OnLine (Compr)', + size: myCatalog.value.pdf_generato_compr_size, + action: () => pubblicaPDF(true), }, { name: 'PDF Generato Stampa', pdf: myCatalog.value.pdf_generato_stampa, data: myCatalog.value.data_generato_stampa, - showButton: myCatalog.value.data_generato_stampa !== myCatalog.value.data_online_stampa, + showButton: true, buttonLabel: 'Pubblica PDF Stampa', - action: pubblicaPDFStampa, + size: myCatalog.value.pdf_generato_stampa_size, + action: () => pubblicaPDFStampa(false), + }, + { + 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)', + size: myCatalog.value.pdf_generato_stampa_compr_size, + action: () => pubblicaPDFStampa(true), }, ]); @@ -2085,7 +2106,7 @@ export default defineComponent({ salvasufiledascaricare, widthpdf.value, heightpdf.value, - optcatalogo.value.areadistampa.compress ? compressionepdf.value : '', + optcatalogo.value.areadistampa.compress ? (instampa ? compressionepdf.value : 'printer') : '', instampa, dir_out, file_out, @@ -2097,14 +2118,20 @@ export default defineComponent({ const catalog = myCatalog.value; if (catalog) { if (instampa) { - catalog.pdf_generato_stampa = ris.fileout_compressed - ? ris.fileout_compressed - : ris.fileout; + catalog.pdf_generato_stampa = ris.fileout; + catalog.pdf_generato_stampa_compressed = ris.fileout_compressed; + + catalog.pdf_generato_stampa_size = ris.filesize; + catalog.pdf_generato_stampa_compr_size = ris.filesize_compressed; + catalog.data_generato_stampa = tools.getDateNow(); } else { - catalog.pdf_generato = ris.fileout_compressed - ? ris.fileout_compressed - : ris.fileout; + catalog.pdf_generato_compressed = ris.fileout_compressed; + catalog.pdf_generato = ris.fileout; + + catalog.pdf_generato_size = ris.filesize; + catalog.pdf_generato_compr_size = ris.filesize_compressed; + catalog.data_generato = tools.getDateNow(); } await saveCatalog(); @@ -2183,8 +2210,8 @@ export default defineComponent({ if (!element) throw new Error('Elemento pdf-content non trovato'); const rect = element.getBoundingClientRect(); - const contentWidthPx = rect.width * scale; - const contentHeightPx = rect.height * scale; + const contentWidthPx = rect.width * scale; + const contentHeightPx = rect.height * scale; const scale2 = getBestFitScale(rect.width, rect.height, pdfWidthPx, pdfHeightPx); @@ -2240,7 +2267,7 @@ export default defineComponent({ // Default formato A4 in mm const A4_FORMAT_MM = [210, 297]; - const pubblicaPDF = async () => { + const pubblicaPDF = async (compresso: boolean) => { const catalog = myCatalog.value; const confirm = await $q @@ -2261,11 +2288,13 @@ export default defineComponent({ const ris = await globalStore.execOnlinePDF({ id_catalog: catalog._id, stampa: false, + compresso, }); if (ris) { if (ris.record?.pdf_online) { catalog.pdf_online = ris.record.pdf_online; + catalog.pdf_online_size = ris.record.pdf_online_size; catalog.data_online = ris.record.data_online; } $q.notify({ @@ -2284,7 +2313,7 @@ export default defineComponent({ }); }; - const pubblicaPDFStampa = async () => { + const pubblicaPDFStampa = async (compresso: boolean) => { const catalog = myCatalog.value; const confirm = await $q @@ -2303,11 +2332,13 @@ export default defineComponent({ const ris = await globalStore.execOnlinePDF({ id_catalog: catalog._id, stampa: true, + compresso, }); if (ris) { if (ris.record.pdf_online_stampa) { catalog.pdf_online_stampa = ris.record.pdf_online_stampa; + catalog.pdf_online_stampa_size = ris.record.pdf_online_stampa_size; catalog.data_online_stampa = ris.record.data_online_stampa; } $q.notify({ diff --git a/src/views/ecommerce/catalogo/catalogo.vue b/src/views/ecommerce/catalogo/catalogo.vue index be2de44d..2d6d97d4 100755 --- a/src/views/ecommerce/catalogo/catalogo.vue +++ b/src/views/ecommerce/catalogo/catalogo.vue @@ -552,6 +552,12 @@ + +