From 68f2db7996a36c04475d3703422aa96df9163218 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Mon, 30 Jan 2023 12:59:51 +0100
Subject: [PATCH] Fix label template logo dimenstion calculation [SCI-7822]

---
 .../label_template/components/logo_insert_modal.vue  | 12 ++++++++++--
 .../vue/label_template/insert_field_dropdown.vue     |  3 ++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/javascript/vue/label_template/components/logo_insert_modal.vue b/app/javascript/vue/label_template/components/logo_insert_modal.vue
index 25f13e622..9e6272455 100644
--- a/app/javascript/vue/label_template/components/logo_insert_modal.vue
+++ b/app/javascript/vue/label_template/components/logo_insert_modal.vue
@@ -35,6 +35,7 @@
     name: 'logoInsertModal',
     props: {
       unit: { type: String, required: true },
+      density: { type: Number, required: true },
       dimension: { type: Array, required: true }
     },
     data() {
@@ -49,8 +50,15 @@
       $(this.$refs.modal).on('hidden.bs.modal', () => {
         this.$emit('cancel');
       });
-      this.width = this.dimension[0]
-      this.height = this.dimension[1]
+      this.width = this.dimension[0] / this.density
+      this.height = this.dimension[1] / this.density
+      if (this.unit == 'in') {
+        this.width = this.width / 25.4
+        this.height = this.height / 25.4
+      }
+
+      this.width = Math.round(this.width * 100) / 100
+      this.height = Math.round(this.height * 100) / 100
       this.ratio = this.dimension[0] / this.dimension[1]
     },
     methods: {
diff --git a/app/javascript/vue/label_template/insert_field_dropdown.vue b/app/javascript/vue/label_template/insert_field_dropdown.vue
index 163f0c5df..6c8e5ecc0 100644
--- a/app/javascript/vue/label_template/insert_field_dropdown.vue
+++ b/app/javascript/vue/label_template/insert_field_dropdown.vue
@@ -65,6 +65,7 @@
     </div>
     <LogoInsertModal v-if="openLogoModal"
                      :unit="labelTemplate.attributes.unit"
+                     :density="labelTemplate.attributes.density"
                      :dimension="logoDimension"
                      @insert:tag="insertTag"
                      @cancel="openLogoModal = false"/>
@@ -138,7 +139,7 @@
           value.key = this.i18n.t(`label_templates.default_columns.${value.key}`)
           return value;
         });
-  
+
         this.fields = result;
         this.$nextTick(() => {
           $('[data-toggle="tooltip"]').tooltip();