diff --git a/package-lock.json b/package-lock.json
index b26f519..42bda88 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2659,6 +2659,16 @@
"integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
"dev": true
},
+ "bindings": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+ "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "file-uri-to-path": "1.0.0"
+ }
+ },
"blob": {
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
@@ -5149,6 +5159,13 @@
"schema-utils": "^2.6.5"
}
},
+ "file-uri-to-path": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+ "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+ "dev": true,
+ "optional": true
+ },
"fill-range": {
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -7876,6 +7893,13 @@
"integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
"dev": true
},
+ "nan": {
+ "version": "2.14.2",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
+ "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
+ "dev": true,
+ "optional": true
+ },
"nanomatch": {
"version": "1.2.13",
"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -12965,7 +12989,11 @@
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
"integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
"dev": true,
- "optional": true
+ "optional": true,
+ "requires": {
+ "bindings": "^1.5.0",
+ "nan": "^2.12.1"
+ }
},
"glob-parent": {
"version": "3.1.0",
@@ -13584,7 +13612,11 @@
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
"integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
"dev": true,
- "optional": true
+ "optional": true,
+ "requires": {
+ "bindings": "^1.5.0",
+ "nan": "^2.12.1"
+ }
},
"glob-parent": {
"version": "3.1.0",
diff --git a/src/app/_util/qrCode.ts b/src/app/_util/qrCode.ts
index 9e95ff6..fb372bc 100644
--- a/src/app/_util/qrCode.ts
+++ b/src/app/_util/qrCode.ts
@@ -8,11 +8,15 @@ export const createQrCodeValue = (
delimiter = '-',
barcodeType: string
): string => {
+ const is1D = (barcodeType === 'code128');
+ const dateFormat = is1D ? 'yyMMdd' : 'yyyyMMddHHmm';
+ const locId = is1D ? locationId.slice(3, 4) : locationId;
+
const valArray = [
barCode,
initials.toUpperCase(),
- formatDate(dateCreated, 'yyyyMMddHHmm', 'en-us'),
- locationId,
+ formatDate(dateCreated, dateFormat, 'en-us'),
+ locId,
];
return valArray.join(delimiter);
};
diff --git a/src/app/label-layout/formats/rectangle-3x1-code128/rectangle-3x1-code128.component.svg b/src/app/label-layout/formats/rectangle-3x1-code128/rectangle-3x1-code128.component.svg
index 8213c38..63664a9 100644
--- a/src/app/label-layout/formats/rectangle-3x1-code128/rectangle-3x1-code128.component.svg
+++ b/src/app/label-layout/formats/rectangle-3x1-code128/rectangle-3x1-code128.component.svg
@@ -25,13 +25,13 @@
stroke="#CCCCCC"
stroke-width="0.2"
width="76.2"
- height="24.4"
+ height="25.4"
x="0"
y="0"
rx="2"
/>
-
+
- {{sample.barcode}}
+ {{sample.barcode}}
diff --git a/src/app/label-layout/label-layout.component.scss b/src/app/label-layout/label-layout.component.scss
index 922c2ec..49a9f45 100644
--- a/src/app/label-layout/label-layout.component.scss
+++ b/src/app/label-layout/label-layout.component.scss
@@ -1,6 +1,7 @@
::ng-deep app-circle-qrcode-single,
::ng-deep app-circle-qrcode-double,
::ng-deep app-rectangle-code128,
+::ng-deep app-rectangle-3x1-code128,
::ng-deep app-rectangle-datamatrix {
background-color: transparent;
margin: 0 !important;
diff --git a/src/material-theme.scss b/src/material-theme.scss
index 08595cc..ee1012b 100644
--- a/src/material-theme.scss
+++ b/src/material-theme.scss
@@ -445,6 +445,8 @@
svg.label-layout-format {
+ background-color: transparent;
+
text, tspan {
font-style: normal;
font-variant: normal;
@@ -465,7 +467,7 @@
@media print {
.label-layout-border {
- stroke: transparent;
+ //stroke: transparent;
}
}
}