From bd1e30d19bd81ee4112fb8d3b4480042febab4d0 Mon Sep 17 00:00:00 2001 From: Martin Artnik Date: Tue, 30 Aug 2022 16:16:02 +0200 Subject: [PATCH] Add default measurments to label templates [SCI-7129] --- .../components/label_preview.vue | 44 ++++++++++++++----- 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/app/javascript/vue/label_template/components/label_preview.vue b/app/javascript/vue/label_template/components/label_preview.vue index afc53d94e..d29b7ff8d 100644 --- a/app/javascript/vue/label_template/components/label_preview.vue +++ b/app/javascript/vue/label_template/components/label_preview.vue @@ -25,15 +25,16 @@
- +
- +
const DPI_RESOLUTION_OPTIONS = [ - { value: 6, label: '6 dpi' }, - { value: 8, label: '8 dpi', selected: true }, - { value: 12, label: '12 dpi'}, - { value: 24, label: '24 dpi' } + { value: 6, label: '152 dpi' }, + { value: 8, label: '203 dpi' }, + { value: 12, label: '300 dpi'}, + { value: 24, label: '600 dpi' } ] const DPMM_RESOLUTION_OPTIONS = [ - { value: 6, label: '152 dpmm (6 dpi)' }, - { value: 8, label: '203 dpmm (8 dpi)', selected: true }, - { value: 12, label: '300 dpmm (12 dpi)' }, - { value: 24, label: '600 dpmm (24 dpi)' } + { value: 6, label: '6 dpmm (152 dpi)' }, + { value: 8, label: '8 dpmm (203 dpi)' }, + { value: 12, label: '12 dpmm (300 dpi)' }, + { value: 24, label: '24 dpmm (600 dpi)' } ] import DropdownSelector from 'vue/shared/dropdown_selector.vue' @@ -82,8 +83,8 @@ DPMM_RESOLUTION_OPTIONS, DPI_RESOLUTION_OPTIONS, optionsOpen: false, - width: null, - height: null, + width: 2, + height: 1, unit: 'in', density: 8, base64Image: null, @@ -101,7 +102,26 @@ return this.unit === 'in' ? this.height * 25.4 : this.height; } }, + watch: { + unit() { + if (this.unit === 'in') { + this.width /= 25.4; + this.height /= 25.4; + } else { + this.width *= 25.4; + this.height *= 25.4; + } + + this.setDefaults(); + } + }, methods: { + setDefaults() { + !this.unit && (this.unit = 'in'); + !this.density && (this.density = 8); + !this.width && (this.width = this.unit === 'in' ? 2 : 50.8); + !this.height && (this.height = this.unit === 'in' ? 1 : 25.4); + }, refreshPreview() { $.ajax({ url: this.previewUrl,