scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-26 01:35:34 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4542 from rekonder/aj_SCI_7346

Browse source 
Update default density for label templates [SCI-7346]
This commit is contained in:
Alex Kriuchykhin 2022-10-19 10:04:53 +02:00 committed by GitHub
commit 482044a448
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/vue/label_template/components/label_preview.vue
View file

@ -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);
},

2
app/models/fluics_label_template.rb
View file

@ -8,7 +8,7 @@ class FluicsLabelTemplate < LabelTemplate
height_mm: 12.7,
content: Extends::DEFAULT_LABEL_TEMPLATE[:zpl],
unit: 0,
density: 8
density: 12
)
end

2
app/models/zebra_label_template.rb
View file

@ -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

2
db/migrate/20221007113010_add_label_template_units.rb
View file

@ -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

2
db/structure.sql
View file

@ -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
);