diff --git a/AppData/Enum.cs b/AppData/Enum.cs index 09ed24d..ce55159 100644 --- a/AppData/Enum.cs +++ b/AppData/Enum.cs @@ -14,4 +14,15 @@ namespace AppData CART, BIN } + public enum cssClass + { + ND, + primary, + secondary, + info, + success, + warning, + danger + } + } diff --git a/NKC_WF/WebUserControls/cmp_barcode.ascx b/NKC_WF/WebUserControls/cmp_barcode.ascx index 3858786..b1498d8 100644 --- a/NKC_WF/WebUserControls/cmp_barcode.ascx +++ b/NKC_WF/WebUserControls/cmp_barcode.ascx @@ -1,7 +1,8 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_barcode.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_barcode" %> -
- <%--AutoPostBack="True"--%> +
- + + +
diff --git a/NKC_WF/WebUserControls/cmp_barcode.ascx.cs b/NKC_WF/WebUserControls/cmp_barcode.ascx.cs index 057c98f..4edb74a 100644 --- a/NKC_WF/WebUserControls/cmp_barcode.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_barcode.ascx.cs @@ -92,21 +92,32 @@ namespace NKC_WF.WebUserControls /// public void resetMessage() { - lblOutput.Visible = false; + lbtReset.Visible = false; lblOutput.Text = ""; } /// /// Gestione output da mostrare (opzionale /// - /// + /// Enum delle classi permesse /// - public void showOutput(string cssClass, string messaggio) + public void showOutput(AppData.cssClass cssClass, string messaggio) { // In primis: mostro qualcosa SOLO SE ho del testo - lblOutput.Visible = !string.IsNullOrEmpty(messaggio); + lbtReset.Visible = !string.IsNullOrEmpty(messaggio); lblOutput.Text = messaggio; - lblOutput.Attributes.Remove("class"); - lblOutput.Attributes.Add("class", cssClass); + //lbtReset.Attributes.Remove("class"); + //lbtReset.Attributes.Add("class", $"btn btn-block {cssClass}"); + lbtReset.CssClass = $"btn btn-sm btn-block py-0 btn-{cssClass}"; + } + /// + /// reset lettura + /// + /// + /// + protected void lbtReset_Click(object sender, EventArgs e) + { + Response.Redirect(Request.RawUrl); } } + } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_barcode.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_barcode.ascx.designer.cs index 6f70ae0..c2ddc00 100644 --- a/NKC_WF/WebUserControls/cmp_barcode.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_barcode.ascx.designer.cs @@ -23,6 +23,15 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.WebControls.TextBox txtBarcode; + /// + /// Controllo lbtReset. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtReset; + /// /// Controllo lblOutput. /// diff --git a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs index 658c07c..2d4e98f 100644 --- a/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kittingSmart.ascx.cs @@ -208,53 +208,53 @@ namespace NKC_WF.WebUserControls switch (decoData.codeType) { case codeType.UNK: - cmp_barcode.showOutput("text-danger", $"Unknown Data: {decoData.rawData} --> no action"); + cmp_barcode.showOutput(cssClass.danger, $"Unknown Data: {decoData.rawData} --> no action"); resetSelection(); doRaiseEv = true; break; case codeType.Item: - cmp_barcode.showOutput("badge badge-success", $"Valid IT Code: {decoData.rawData}"); + cmp_barcode.showOutput(cssClass.success, $"Valid IT Code: {decoData.rawData}"); processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); break; case codeType.ItemGeneric: - cmp_barcode.showOutput("badge badge-success", $"Valid IG Code: {decoData.rawData}"); + cmp_barcode.showOutput(cssClass.success, $"Valid IG Code: {decoData.rawData}"); //processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); break; case codeType.OtherItem: - cmp_barcode.showOutput("badge badge-success", $"Valid Generic PART Code: {decoData.rawData}"); + cmp_barcode.showOutput(cssClass.success, $"Valid Generic PART Code: {decoData.rawData}"); processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); break; case codeType.Material: - cmp_barcode.showOutput("badge badge-warning", $"Material - ignored: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"Material - ignored: {decoData.description}"); doRaiseEv = true; break; case codeType.Sheet: - cmp_barcode.showOutput("badge badge-warning", $"Sheet - ignored: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"Sheet - ignored: {decoData.description}"); doRaiseEv = true; break; case codeType.Stack: - cmp_barcode.showOutput("badge badge-warning", $"BUNK - ignored: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"BUNK - ignored: {decoData.description}"); doRaiseEv = true; break; case codeType.Batch: - cmp_barcode.showOutput("badge badge-warning", $"Batch - ignored: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"Batch - ignored: {decoData.description}"); doRaiseEv = true; break; case codeType.Cart: - cmp_barcode.showOutput("badge badge-success", $"Valid CR Code: {decoData.description}"); + cmp_barcode.showOutput(cssClass.success, $"Valid CR Code: {decoData.description}"); processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); doRaiseEv = true; break; case codeType.Bin: - cmp_barcode.showOutput("badge badge-warning", $"BIN NOT PAINTED - Ignored: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"BIN NOT PAINTED - Ignored: {decoData.description}"); doRaiseEv = true; break; case codeType.BinProcessed: - cmp_barcode.showOutput("badge badge-success", $"Valid BP Code: {decoData.description}"); + cmp_barcode.showOutput(cssClass.success, $"Valid BP Code: {decoData.description}"); processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); break; default: - cmp_barcode.showOutput("text-danger", $"Unknown Data: {decoData.rawData} --> no action"); + cmp_barcode.showOutput(cssClass.danger, $"Unknown Data: {decoData.rawData} --> no action"); resetSelection(); break; } diff --git a/NKC_WF/WebUserControls/cmp_labelsPrint.ascx.cs b/NKC_WF/WebUserControls/cmp_labelsPrint.ascx.cs index 9b8446c..f4c2d0d 100644 --- a/NKC_WF/WebUserControls/cmp_labelsPrint.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_labelsPrint.ascx.cs @@ -188,57 +188,57 @@ namespace NKC_WF.WebUserControls switch (decoData.codeType) { case codeType.Item: - cmp_barcode.showOutput("badge badge-success", $"IT {traduci("ValidCode")}: {decoData.rawData}"); + cmp_barcode.showOutput(cssClass.success, $"IT {traduci("ValidCode")}: {decoData.rawData}"); processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); break; case codeType.ItemGeneric: - cmp_barcode.showOutput("badge badge-success", $"{traduci("ItemGeneric")} - {traduci("Ignored")}: {decoData.rawData}"); + cmp_barcode.showOutput(cssClass.success, $"{traduci("ItemGeneric")} - {traduci("Ignored")}: {decoData.rawData}"); resetDisplay(true); doRaiseEv = true; break; case codeType.OtherItem: - cmp_barcode.showOutput("badge badge-success", $"{traduci("OtherPart")} - {traduci("Ignored")}: {decoData.rawData}"); + cmp_barcode.showOutput(cssClass.success, $"{traduci("OtherPart")} - {traduci("Ignored")}: {decoData.rawData}"); resetDisplay(true); doRaiseEv = true; break; case codeType.Material: - cmp_barcode.showOutput("badge badge-warning", $"{traduci("Material")} - {traduci("Ignored")}: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"{traduci("Material")} - {traduci("Ignored")}: {decoData.description}"); resetDisplay(true); doRaiseEv = true; break; case codeType.Sheet: - cmp_barcode.showOutput("badge badge-warning", $"{traduci("Sheet")} - {traduci("Ignored")}: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"{traduci("Sheet")} - {traduci("Ignored")}: {decoData.description}"); resetDisplay(true); doRaiseEv = true; break; case codeType.Stack: - cmp_barcode.showOutput("badge badge-warning", $"{traduci("Sheet")}BUNK - {traduci("Ignored")}: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"{traduci("Sheet")}BUNK - {traduci("Ignored")}: {decoData.description}"); resetDisplay(true); doRaiseEv = true; break; case codeType.Batch: - cmp_barcode.showOutput("badge badge-warning", $"{traduci("Sheet")}BATCH - {traduci("Ignored")}: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"{traduci("Sheet")}BATCH - {traduci("Ignored")}: {decoData.description}"); resetDisplay(true); doRaiseEv = true; break; case codeType.Cart: - cmp_barcode.showOutput("badge badge-warning", $"{traduci("Sheet")}CART - {traduci("Ignored")}: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"{traduci("Sheet")}CART - {traduci("Ignored")}: {decoData.description}"); resetDisplay(true); doRaiseEv = true; break; case codeType.Bin: - cmp_barcode.showOutput("badge badge-warning", $"{traduci("BinNotPainted")} - {traduci("Ignored")}: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"{traduci("BinNotPainted")} - {traduci("Ignored")}: {decoData.description}"); resetDisplay(true); doRaiseEv = true; break; case codeType.BinProcessed: - cmp_barcode.showOutput("badge badge-warning", $"{traduci("BinPainted")} - {traduci("Ignored")}: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"{traduci("BinPainted")} - {traduci("Ignored")}: {decoData.description}"); resetDisplay(true); doRaiseEv = true; break; case codeType.UNK: default: - cmp_barcode.showOutput("text-danger", $"{traduci("UnknownData")}: {decoData.rawData} --> {traduci("NoValiAction")}"); + cmp_barcode.showOutput(cssClass.danger, $"{traduci("UnknownData")}: {decoData.rawData} --> {traduci("NoValiAction")}"); resetDisplay(true); doRaiseEv = true; break; diff --git a/NKC_WF/WebUserControls/cmp_paintingSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_paintingSmart.ascx.cs index 66a9bbf..12953d4 100644 --- a/NKC_WF/WebUserControls/cmp_paintingSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_paintingSmart.ascx.cs @@ -85,31 +85,31 @@ namespace NKC_WF.WebUserControls switch (decoData.codeType) { case codeType.Item: - cmp_barcode.showOutput("badge badge-warning", $"{traduci("Item")} - {traduci("Ignored")}: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"{traduci("Item")} - {traduci("Ignored")}: {decoData.description}"); doRaiseEv = true; break; case codeType.ItemGeneric: - cmp_barcode.showOutput("badge badge-warning", $"{traduci("ItemGeneric")} - {traduci("Ignored")}: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"{traduci("ItemGeneric")} - {traduci("Ignored")}: {decoData.description}"); doRaiseEv = true; break; case codeType.Material: - cmp_barcode.showOutput("badge badge-warning", $"{traduci("Material")} - {traduci("Ignored")}: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"{traduci("Material")} - {traduci("Ignored")}: {decoData.description}"); doRaiseEv = true; break; case codeType.Sheet: - cmp_barcode.showOutput("badge badge-warning", $"{traduci("Sheet")} - {traduci("Ignored")}: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"{traduci("Sheet")} - {traduci("Ignored")}: {decoData.description}"); doRaiseEv = true; break; case codeType.Stack: - cmp_barcode.showOutput("badge badge-warning", $"{traduci("Bunk")} - {traduci("Ignored")}: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"{traduci("Bunk")} - {traduci("Ignored")}: {decoData.description}"); doRaiseEv = true; break; case codeType.Batch: - cmp_barcode.showOutput("badge badge-warning", $"{traduci("Batch")} - {traduci("Ignored")}: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"{traduci("Batch")} - {traduci("Ignored")}: {decoData.description}"); doRaiseEv = true; break; case codeType.Cart: - cmp_barcode.showOutput("badge badge-warning", $"{traduci("Cart")} - {traduci("Ignored")}: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"{traduci("Cart")} - {traduci("Ignored")}: {decoData.description}"); doRaiseEv = true; break; case codeType.Bin: @@ -127,7 +127,7 @@ namespace NKC_WF.WebUserControls // ora confronto cmd con ultimo valido if (lastValidCmd != lastCmd) { - cmp_barcode.showOutput("badge badge-success", $"{traduci("ValiBnCode")}: {decoData.description}"); + cmp_barcode.showOutput(cssClass.success, $"{traduci("ValiBnCode")}: {decoData.description}"); // salvo lastValidCmd = lastCmd; } @@ -141,21 +141,21 @@ namespace NKC_WF.WebUserControls } else { - cmp_barcode.showOutput("badge badge-danger", $"{decoData.description} --> {traduci("NoValiAction")}"); + cmp_barcode.showOutput(cssClass.danger, $"{decoData.description} --> {traduci("NoValiAction")}"); } lbtConfirmPaint.Visible = allOk; break; case codeType.BinProcessed: - cmp_barcode.showOutput("text-danger", $"{traduci("BinProcessed")} - {traduci("Ignored")}: {decoData.rawData} --> no action"); + cmp_barcode.showOutput(cssClass.danger, $"{traduci("BinProcessed")} - {traduci("Ignored")}: {decoData.rawData} --> no action"); doRaiseEv = true; break; case codeType.SecScreen: - cmp_barcode.showOutput("badge badge-warning", $"{traduci("SecScreen")} - {traduci("Ignored")}: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"{traduci("SecScreen")} - {traduci("Ignored")}: {decoData.description}"); doRaiseEv = true; break; case codeType.UNK: default: - cmp_barcode.showOutput("text-danger", $"{traduci("UnknownData")}: {decoData.rawData} --> {traduci("NoValiAction")}"); + cmp_barcode.showOutput(cssClass.danger, $"{traduci("UnknownData")}: {decoData.rawData} --> {traduci("NoValiAction")}"); doRaiseEv = true; break; } @@ -188,7 +188,7 @@ namespace NKC_WF.WebUserControls printNewLabel(decoData); // update tabelle! doUpdate(); - cmp_barcode.showOutput("badge badge-success", $"{traduci("PaintConfirmed")}: {decoData.description}"); + cmp_barcode.showOutput(cssClass.success, $"{traduci("PaintConfirmed")}: {decoData.description}"); } } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs index dc9728c..3a3d59c 100644 --- a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs @@ -62,12 +62,12 @@ namespace NKC_WF.WebUserControls switch (decoData.codeType) { case codeType.UNK: - cmp_barcode.showOutput("text-danger", traduci("UnkownData")); + cmp_barcode.showOutput(cssClass.danger, traduci("UnkownData")); doRaiseEv = true; break; case codeType.Item: case codeType.ItemGeneric: - cmp_barcode.showOutput("text-warning", $"{traduci("Part")} - {traduci("Ignored")}"); + cmp_barcode.showOutput(cssClass.warning, $"{traduci("Part")} - {traduci("Ignored")}"); doRaiseEv = true; break; case codeType.Material: @@ -76,7 +76,7 @@ namespace NKC_WF.WebUserControls // se tab vuota --> HO FINITO!!!! if (nextTbl.Count == 0) { - cmp_barcode.showOutput("badge badge-warning", $"{traduci("BunkCompleted")}, {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"{traduci("BunkCompleted")}, {decoData.description}"); } // se ho valori --> controllo se corretto... else @@ -84,27 +84,27 @@ namespace NKC_WF.WebUserControls string codReq = nextTbl[0].MatExtCode.ToString(); if (codReq == decoData.codeInt.ToString()) { - cmp_barcode.showOutput("badge badge-success", $"{traduci("SheetRecorded")}: {decoData.description}"); + cmp_barcode.showOutput(cssClass.success, $"{traduci("SheetRecorded")}: {decoData.description}"); // chiamo stored x indicare preparato DLMan.taSHL.setPrepared(nextTbl[0].SheetID); lgInfo($"cmpStackBuilding | taSHL.setPrepared | SheetID: {nextTbl[0].SheetID}"); } else { - cmp_barcode.showOutput("badge badge-danger", $"{traduci("WrongSheet")}: {decoData.description}"); + cmp_barcode.showOutput(cssClass.danger, $"{traduci("WrongSheet")}: {decoData.description}"); } } break; case codeType.Sheet: - cmp_barcode.showOutput("badge badge-warning", $"{traduci("Sheet")} - {traduci("Ignored")}"); + cmp_barcode.showOutput(cssClass.warning, $"{traduci("Sheet")} - {traduci("Ignored")}"); doRaiseEv = true; break; case codeType.Stack: - cmp_barcode.showOutput("badge badge-warning", $"{traduci("Bunk")} - {traduci("Ignored")}"); + cmp_barcode.showOutput(cssClass.warning, $"{traduci("Bunk")} - {traduci("Ignored")}"); doRaiseEv = true; break; case codeType.Batch: - cmp_barcode.showOutput("badge badge-warning", $"{traduci("Batch")} - {traduci("Ignored")}"); + cmp_barcode.showOutput(cssClass.warning, $"{traduci("Batch")} - {traduci("Ignored")}"); doRaiseEv = true; break; default: diff --git a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs index 3e7cf4d..b4cb40f 100644 --- a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs @@ -138,7 +138,7 @@ namespace NKC_WF.WebUserControls { } if (tabStack != null && tabStack.Count == 0) { - cmp_barcode.showOutput("badge badge-danger", $"{traduci("ErrBunkNotFound")}: {decoData.description}"); + cmp_barcode.showOutput(cssClass.danger, $"{traduci("ErrBunkNotFound")}: {decoData.description}"); doRaiseEv = true; } else @@ -146,7 +146,7 @@ namespace NKC_WF.WebUserControls // verifico non sia già in lavorazione if (currentBunkAlreadyWorking(decoData.codeInt)) { - cmp_barcode.showOutput("badge badge-success", $"{traduci("ErrBunkInProc")}: {decoData.rawData}"); + cmp_barcode.showOutput(cssClass.success, $"{traduci("ErrBunkInProc")}: {decoData.rawData}"); doRaiseEv = true; } else @@ -157,7 +157,7 @@ namespace NKC_WF.WebUserControls // controllo se il bunk richiesto sia stato caricato coi materiali... if (!isBunkFilled(decoData.codeInt)) { - cmp_barcode.showOutput("badge badge-danger", $"{traduci("ErrNextBunkNotReady")}: {decoData.rawData}"); + cmp_barcode.showOutput(cssClass.danger, $"{traduci("ErrNextBunkNotReady")}: {decoData.rawData}"); doRaiseEv = true; } else @@ -165,7 +165,7 @@ namespace NKC_WF.WebUserControls // verifico SE i BUNKS correnti siano tutti stati completati (NumSheet == NumWorking) if (currentBunkPrinted) { - cmp_barcode.showOutput("badge badge-success", $"{traduci("BunkOK")}: {decoData.rawData}"); + cmp_barcode.showOutput(cssClass.success, $"{traduci("BunkOK")}: {decoData.rawData}"); ComLib.resetCurrBunk(); ComLib.taktMLCurrBunk = decoData.codeInt.ToString(); // processo DB e salvo che lo stack è stato caricato in MACHINE LOAD @@ -196,21 +196,21 @@ namespace NKC_WF.WebUserControls // altrimenti segnalo NON pronto x caricare prossimo else { - cmp_barcode.showOutput("badge badge-danger", $"{traduci("ErrPrevBunkNotReady")}: {decoData.rawData}"); + cmp_barcode.showOutput(cssClass.danger, $"{traduci("ErrPrevBunkNotReady")}: {decoData.rawData}"); doRaiseEv = true; } } } else { - cmp_barcode.showOutput("badge badge-danger", $"{traduci("ErrWrongBunk")}: {decoData.rawData}"); + cmp_barcode.showOutput(cssClass.danger, $"{traduci("ErrWrongBunk")}: {decoData.rawData}"); doRaiseEv = true; } } } break; default: - cmp_barcode.showOutput("text-danger", $"{traduci("UnknownData")}: {decoData.rawData} --> {traduci("NoValiAction")}"); + cmp_barcode.showOutput(cssClass.danger, $"{traduci("UnknownData")}: {decoData.rawData} --> {traduci("NoValiAction")}"); doRaiseEv = true; break; } diff --git a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx index 9ec4282..d64e875 100644 --- a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx +++ b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx @@ -9,8 +9,8 @@

<%: traduci("MachineUnloadSmart") %>

-
-
+
+
@@ -18,15 +18,15 @@
-
+
-
+
-
+
diff --git a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs index 4e37a38..0af9fb9 100644 --- a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs @@ -213,54 +213,54 @@ namespace NKC_WF.WebUserControls switch (decoData.codeType) { case codeType.UNK: - cmp_barcode.showOutput("text-danger", $"Unknown Data: {decoData.rawData} --> no action"); + cmp_barcode.showOutput(cssClass.danger, $"Unknown Data: {decoData.rawData} --> no action"); resetSelection(false); doRaiseEv = true; break; case codeType.Item: tryPickup(decoData.rawData); - cmp_barcode.showOutput("badge badge-success", $"Valid IT Code: {decoData.rawData}"); + cmp_barcode.showOutput(cssClass.success, $"Valid IT Code: {decoData.rawData}"); processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); break; case codeType.ItemGeneric: tryPickup(decoData.rawData); - cmp_barcode.showOutput("badge badge-success", $"Valid IG Code: {decoData.rawData}"); + cmp_barcode.showOutput(cssClass.success, $"Valid IG Code: {decoData.rawData}"); processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); break; case codeType.Material: - cmp_barcode.showOutput("badge badge-warning", $"Material - ignored: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"Material - ignored: {decoData.description}"); doRaiseEv = true; break; case codeType.Sheet: - cmp_barcode.showOutput("badge badge-warning", $"Sheet - ignored: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"Sheet - ignored: {decoData.description}"); doRaiseEv = true; break; case codeType.Stack: - cmp_barcode.showOutput("badge badge-warning", $"BUNK - ignored: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"BUNK - ignored: {decoData.description}"); doRaiseEv = true; break; case codeType.OtherItem: - cmp_barcode.showOutput("badge badge-warning", $"Generic PART - ignored: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"Generic PART - ignored: {decoData.description}"); doRaiseEv = true; break; case codeType.Batch: - cmp_barcode.showOutput("badge badge-warning", $"Batch - ignored: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"Batch - ignored: {decoData.description}"); doRaiseEv = true; break; case codeType.Cart: - cmp_barcode.showOutput("badge badge-success", $"Valid CR Code: {decoData.description}"); + cmp_barcode.showOutput(cssClass.success, $"Valid CR Code: {decoData.description}"); processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); break; case codeType.Bin: - cmp_barcode.showOutput("badge badge-success", $"Valid BN Code: {decoData.description}"); + cmp_barcode.showOutput(cssClass.success, $"Valid BN Code: {decoData.description}"); processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); break; case codeType.SecScreen: - cmp_barcode.showOutput("badge badge-success", $"Valid Screen Code: {decoData.description}"); + cmp_barcode.showOutput(cssClass.success, $"Valid Screen Code: {decoData.description}"); processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt); break; default: - cmp_barcode.showOutput("text-danger", $"Unknown Data: {decoData.rawData} --> no action"); + cmp_barcode.showOutput(cssClass.danger, $"Unknown Data: {decoData.rawData} --> no action"); resetSelection(false); break; } diff --git a/NKC_WF/site/GlobalSearch.aspx.cs b/NKC_WF/site/GlobalSearch.aspx.cs index 13497be..b294570 100644 --- a/NKC_WF/site/GlobalSearch.aspx.cs +++ b/NKC_WF/site/GlobalSearch.aspx.cs @@ -76,49 +76,49 @@ namespace NKC_WF.site switch (decoData.codeType) { case codeType.UNK: - cmp_barcode.showOutput("text-danger", $"Unknown Data: {decoData.rawData} --> no action"); + cmp_barcode.showOutput(cssClass.danger, $"Unknown Data: {decoData.rawData} --> no action"); doShowResults = false; break; case codeType.Item: - cmp_barcode.showOutput("badge badge-success", $"Valid IT Code: {decoData.rawData}"); + cmp_barcode.showOutput(cssClass.success, $"Valid IT Code: {decoData.rawData}"); cmp_searchItems.itemDtmx = decoData.rawData; doShowResults = true; break; case codeType.ItemGeneric: - cmp_barcode.showOutput("badge badge-success", $"Valid IG Code: {decoData.rawData}"); + cmp_barcode.showOutput(cssClass.success, $"Valid IG Code: {decoData.rawData}"); cmp_searchItems.itemDtmx = decoData.rawData; doShowResults = true; break; case codeType.OtherItem: - cmp_barcode.showOutput("badge badge-success", $"Valid Generic PART Code: {decoData.rawData}"); + cmp_barcode.showOutput(cssClass.success, $"Valid Generic PART Code: {decoData.rawData}"); doShowResults = false; break; case codeType.Material: - cmp_barcode.showOutput("badge badge-warning", $"Material - ignored: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"Material - ignored: {decoData.description}"); doShowResults = false; break; case codeType.Sheet: - cmp_barcode.showOutput("badge badge-warning", $"Sheet - ignored: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"Sheet - ignored: {decoData.description}"); doShowResults = false; break; case codeType.Stack: - cmp_barcode.showOutput("badge badge-warning", $"BUNK - ignored: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"BUNK - ignored: {decoData.description}"); doShowResults = false; break; case codeType.Batch: - cmp_barcode.showOutput("badge badge-warning", $"Batch - ignored: {decoData.description}"); + cmp_barcode.showOutput(cssClass.warning, $"Batch - ignored: {decoData.description}"); doShowResults = false; break; case codeType.Cart: - cmp_barcode.showOutput("badge badge-success", $"Cart - ignored: {decoData.description}"); + cmp_barcode.showOutput(cssClass.success, $"Cart - ignored: {decoData.description}"); doShowResults = false; break; case codeType.Bin: - cmp_barcode.showOutput("badge badge-success", $"Bin - ignored: {decoData.description}"); + cmp_barcode.showOutput(cssClass.success, $"Bin - ignored: {decoData.description}"); doShowResults = false; break; default: - cmp_barcode.showOutput("text-danger", $"Unknown Data: {decoData.rawData} --> no action"); + cmp_barcode.showOutput(cssClass.danger, $"Unknown Data: {decoData.rawData} --> no action"); doShowResults = false; break; }