From 538f141aaf6dd2aa60d4118c097a47914f619b10 Mon Sep 17 00:00:00 2001 From: Andrej Date: Tue, 18 Oct 2022 09:40:32 +0200 Subject: [PATCH] Change default density for label templates [SCI-7346] --- app/javascript/vue/label_template/components/label_preview.vue | 2 +- app/models/fluics_label_template.rb | 2 +- app/models/zebra_label_template.rb | 2 +- db/migrate/20221007113010_add_label_template_units.rb | 2 +- db/structure.sql | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/javascript/vue/label_template/components/label_preview.vue b/app/javascript/vue/label_template/components/label_preview.vue index b8309986d..5dc55ceec 100644 --- a/app/javascript/vue/label_template/components/label_preview.vue +++ b/app/javascript/vue/label_template/components/label_preview.vue @@ -135,7 +135,7 @@ methods: { setDefaults() { !this.unit && (this.unit = 'in'); - !this.density && (this.density = 8); + !this.density && (this.density = 12); !this.width && (this.width = this.unit === 'in' ? 2 : 50.8); !this.height && (this.height = this.unit === 'in' ? 1 : 25.4); }, diff --git a/app/models/fluics_label_template.rb b/app/models/fluics_label_template.rb index 4cab626c6..c576cc53d 100644 --- a/app/models/fluics_label_template.rb +++ b/app/models/fluics_label_template.rb @@ -8,7 +8,7 @@ class FluicsLabelTemplate < LabelTemplate height_mm: 12.7, content: Extends::DEFAULT_LABEL_TEMPLATE[:zpl], unit: 0, - density: 8 + density: 12 ) end diff --git a/app/models/zebra_label_template.rb b/app/models/zebra_label_template.rb index a82499acd..a3174b05a 100644 --- a/app/models/zebra_label_template.rb +++ b/app/models/zebra_label_template.rb @@ -8,7 +8,7 @@ class ZebraLabelTemplate < LabelTemplate height_mm: 12.7, content: Extends::DEFAULT_LABEL_TEMPLATE[:zpl], unit: 0, - density: 8 + density: 12 ) end end diff --git a/db/migrate/20221007113010_add_label_template_units.rb b/db/migrate/20221007113010_add_label_template_units.rb index 17950f3a9..e6c8dac45 100644 --- a/db/migrate/20221007113010_add_label_template_units.rb +++ b/db/migrate/20221007113010_add_label_template_units.rb @@ -4,7 +4,7 @@ class AddLabelTemplateUnits < ActiveRecord::Migration[6.1] def up change_table :label_templates, bulk: true do |t| t.integer :unit, default: 0 - t.integer :density, default: 8 + t.integer :density, default: 12 end end diff --git a/db/structure.sql b/db/structure.sql index 5fb7f294f..6f1eec5da 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -712,7 +712,7 @@ CREATE TABLE public.label_templates ( height_mm double precision, height_mm double precision, unit integer DEFAULT 0, - density integer DEFAULT 8 + density integer DEFAULT 12 );