diff --git a/src/Views/Home/Assets.cshtml b/src/Views/Home/Assets.cshtml index 3b4bd3a..5fec769 100644 --- a/src/Views/Home/Assets.cshtml +++ b/src/Views/Home/Assets.cshtml @@ -2,8 +2,10 @@ @using Berufsschule_HAM.Models @model HomeIndexViewModel @inject IViewLocalizer T +@inject IConfiguration Configuration @{ ViewData["Title"] = T["Assets"]; + string barcodeType = Configuration["BarcodeType"] ?? "EAN13"; } @@ -672,7 +674,7 @@ function registerRowDetailviewClick(row) {
@T["Barcode"]
- +
@@ -749,15 +751,15 @@ function registerRowDetailviewClick(row) {
` : ''}
`; viewContent.innerHTML = html; - JsBarcode("#ean13", idToEAN13(asset.Cn), { - format: "EAN13", + JsBarcode("#@barcodeType", getBarcodeValue("@barcodeType", asset.Cn), { + format: "@barcodeType", lineColor: "#000", width: 2, height: 80, displayValue: true }); document.getElementById("downloadBtn").addEventListener("click", () => { - downloadBarcode("ean13", idToEAN13(asset.Cn)); + downloadBarcode("@barcodeType", getBarcodeValue("@barcodeType", asset.Cn)); }); document.getElementById("printBtn").addEventListener("click", () => { addAssetIdToBatch(asset.Cn); diff --git a/src/Views/Home/Inventory.cshtml b/src/Views/Home/Inventory.cshtml index c27a259..99e3a6c 100644 --- a/src/Views/Home/Inventory.cshtml +++ b/src/Views/Home/Inventory.cshtml @@ -2,8 +2,10 @@ @using Berufsschule_HAM.Models @model HomeIndexViewModel @inject IViewLocalizer T +@inject IConfiguration Configuration @{ ViewData["Title"] = T["Inventory"]; + string barcodeType = Configuration["BarcodeType"] ?? "EAN13"; } @@ -72,7 +74,34 @@ async function onScanSuccess(decodedText, decodedResult) { const rawDecoded = decodedText; - decodedText = decodedText.substr(0,11).replace(/^0+/, ''); + const BARCODE_TYPE = "@barcodeType"; + switch (BARCODE_TYPE.toUpperCase()) { + case "EAN13": + decodedText = decodedText.substr(0, 11); + break; + case "EAN8": + decodedText = decodedText.substr(0, 6); + break; + case "UPC": + decodedText = decodedText.substr(0, 10); + break; + case "ITF14": + decodedText = decodedText.substr(0, 12); + break; + case "MSI10": + decodedText = decodedText.slice(0,-1); + break; + case "MSI11": + decodedText = decodedText.slice(0,-1); + break; + case "MSI1010": + decodedText = decodedText.slice(0,-2); + break; + case "MSI1110": + decodedText = decodedText.slice(0,-1); + break; + } + decodedText = decodedText.replace(/^0+/, ''); console.log(`Code matched = ${decodedText}`, decodedResult); document.getElementById("barcodeInput").value = decodedText; @@ -105,7 +134,7 @@
@T["Barcode"]
- +
@@ -184,15 +213,15 @@ viewContent.innerHTML = html; console.log(rawDecoded); - JsBarcode("#ean13", idToEAN13(decodedText), { - format: "EAN13", + JsBarcode("#@barcodeType", getBarcodeValue("@barcodeType", decodedText), { + format: "@barcodeType", lineColor: "#000", width: 2, height: 80, displayValue: true }); - document.getElementById("downloadBtn").addEventListener("click", () => downloadBarcode("ean13", decodedText)); + document.getElementById("downloadBtn").addEventListener("click", () => downloadBarcode("@barcodeType", decodedText)); document.getElementById("printBtn").addEventListener("click", () => { addAssetIdToBatch(asset.Cn); showToast("@T["Successfully added barcode to print batch"]", "success"); diff --git a/src/Views/Shared/_Batch.cshtml b/src/Views/Shared/_Batch.cshtml index 7521065..b3a2642 100644 --- a/src/Views/Shared/_Batch.cshtml +++ b/src/Views/Shared/_Batch.cshtml @@ -1,6 +1,9 @@ @using Microsoft.AspNetCore.Mvc.Localization @inject IViewLocalizer T - +@inject IConfiguration Configuration +@{ + string barcodeType = Configuration["BarcodeType"] ?? "EAN13"; +}