From 3d605c619ce4f729205e188d74c134e0830d1979 Mon Sep 17 00:00:00 2001
From: Aaron Louie <ajlouie@gmail.com>
Date: Wed, 16 Dec 2020 10:39:06 -0500
Subject: [PATCH] Adds some space between lines of text. Hides unused label
 layouts.

---
 src/app/config/defaults.ts                    | 46 +++++++++----------
 ...angle-datamatrix-rectangular.component.svg |  6 +--
 .../rectangle-datamatrix.component.svg        |  9 ++--
 3 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/src/app/config/defaults.ts b/src/app/config/defaults.ts
index f4e1f23..6799a15 100644
--- a/src/app/config/defaults.ts
+++ b/src/app/config/defaults.ts
@@ -18,29 +18,29 @@ export const labelLayouts = {
     pageWidth: 64,
     pageHeight: 32,
   }),
-  rectangle_3x1_code128: new LabelLayout({
-    name: '3in x 1in Rectangular Label - CODE128',
-    barcodeType: 'code128',
-    id: 'rectangle_3x1_code128',
-    pageWidth: 76.2 + labelMargin,
-    pageHeight: 25.4 + labelMargin,
-    delimiter: '',
-  }),
-  rectangle_code128: new LabelLayout({
-    name: '2.75in x 1.25in Rectangular Label - CODE128',
-    barcodeType: 'code128',
-    id: 'rectangle_code128',
-    pageWidth: 69.9 + labelMargin,
-    pageHeight: 31.8 + labelMargin,
-    delimiter: '',
-  }),
-  rectangle_datamatrix: new LabelLayout({
-    name: '2in x 1in Rectangular Label - DataMatrix',
-    barcodeType: 'datamatrix',
-    id: 'rectangle_datamatrix',
-    pageWidth: 50.8 + labelMargin,
-    pageHeight: 25.4 + labelMargin,
-  }),
+  // rectangle_3x1_code128: new LabelLayout({
+  //   name: '3in x 1in Rectangular Label - CODE128',
+  //   barcodeType: 'code128',
+  //   id: 'rectangle_3x1_code128',
+  //   pageWidth: 76.2 + labelMargin,
+  //   pageHeight: 25.4 + labelMargin,
+  //   delimiter: '',
+  // }),
+  // rectangle_code128: new LabelLayout({
+  //   name: '2.75in x 1.25in Rectangular Label - CODE128',
+  //   barcodeType: 'code128',
+  //   id: 'rectangle_code128',
+  //   pageWidth: 69.9 + labelMargin,
+  //   pageHeight: 31.8 + labelMargin,
+  //   delimiter: '',
+  // }),
+  // rectangle_datamatrix: new LabelLayout({
+  //   name: '2in x 1in Rectangular Label - DataMatrix',
+  //   barcodeType: 'datamatrix',
+  //   id: 'rectangle_datamatrix',
+  //   pageWidth: 50.8 + labelMargin,
+  //   pageHeight: 25.4 + labelMargin,
+  // }),
   rectangle_datamatrixrectangular: new LabelLayout({
     name: '2in x 1in Rectangular Label - DataMatrix Rectangular',
     barcodeType: 'datamatrixrectangular',
diff --git a/src/app/label-layout/formats/rectangle-datamatrix-rectangular/rectangle-datamatrix-rectangular.component.svg b/src/app/label-layout/formats/rectangle-datamatrix-rectangular/rectangle-datamatrix-rectangular.component.svg
index c75b1f9..46071f3 100644
--- a/src/app/label-layout/formats/rectangle-datamatrix-rectangular/rectangle-datamatrix-rectangular.component.svg
+++ b/src/app/label-layout/formats/rectangle-datamatrix-rectangular/rectangle-datamatrix-rectangular.component.svg
@@ -64,14 +64,14 @@
         transform="scale(0.175)"
       />
     </g>
-    <g transform="translate(24, 11.5)">
+    <g transform="translate(24, 10.5)">
       <text x="0" y="0" style="font-size: 2.7px; text-anchor: start; text-align: left;">
         #{{sample.student_id}}
       </text>
-      <text x="0" y="2" style="font-size: 2.7px; text-anchor: start; text-align: left;">
+      <text x="0" y="3" style="font-size: 2.7px; text-anchor: start; text-align: left;">
         {{sample.date | date:'yyyy-MM-dd HH:mm'}}
       </text>
-      <text x="0" y="4" style="font-size: 2.7px; text-anchor: start; text-align: left;">
+      <text x="0" y="6" style="font-size: 2.7px; text-anchor: start; text-align: left;">
         {{sample.location}}  {{sample.initials}}
       </text>
     </g>
diff --git a/src/app/label-layout/formats/rectangle-datamatrix/rectangle-datamatrix.component.svg b/src/app/label-layout/formats/rectangle-datamatrix/rectangle-datamatrix.component.svg
index 89851fc..485b0c2 100644
--- a/src/app/label-layout/formats/rectangle-datamatrix/rectangle-datamatrix.component.svg
+++ b/src/app/label-layout/formats/rectangle-datamatrix/rectangle-datamatrix.component.svg
@@ -64,16 +64,15 @@
         transform="scale(0.175)"
       />
     </g>
-    <g transform="translate(17, 11.75)">
+    <g transform="translate(17, 10.5)">
       <text x="0" y="0" style="font-size: 2.7px; text-anchor: start; text-align: left;">
         #{{sample.student_id}}
       </text>
-      <text x="0" y="2" style="font-size: 2.7px; text-anchor: start; text-align: left;">
+      <text x="0" y="3" style="font-size: 2.7px; text-anchor: start; text-align: left;">
         {{sample.date | date:'yyyy-MM-dd HH:mm'}}
       </text>
-      <text x="0" y="4" style="font-size: 2.7px; text-anchor: start; text-align: left;">
-        {{sample.location}}
-        {{sample.initials}}
+      <text x="0" y="6" style="font-size: 2.7px; text-anchor: start; text-align: left;">
+        {{sample.location}}  {{sample.initials}}
       </text>
     </g>
   </g>