diff --git a/NKC_WF/Site.Master b/NKC_WF/Site.Master index c4417e6..f163b0b 100644 --- a/NKC_WF/Site.Master +++ b/NKC_WF/Site.Master @@ -29,7 +29,7 @@
- + <%--To learn more about bundling scripts in ScriptManager see https://go.microsoft.com/fwlink/?LinkID=301884 --%> <%--Framework Scripts--%> diff --git a/NKC_WF/WebUserControls/cmp_barcode.ascx b/NKC_WF/WebUserControls/cmp_barcode.ascx index 89e3e98..331c1d8 100644 --- a/NKC_WF/WebUserControls/cmp_barcode.ascx +++ b/NKC_WF/WebUserControls/cmp_barcode.ascx @@ -1,15 +1,15 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_barcode.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_barcode" %> - - -
-
-
-
-
- - + + +
+
+
+
+
+ +
diff --git a/NKC_WF/WebUserControls/cmp_barcode.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_barcode.ascx.designer.cs index a07e06d..ce49233 100644 --- a/NKC_WF/WebUserControls/cmp_barcode.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_barcode.ascx.designer.cs @@ -14,15 +14,6 @@ namespace NKC_WF.WebUserControls public partial class cmp_barcode { - /// - /// UpdateProgressDisplay control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.UpdateProgress UpdateProgressDisplay; - /// /// uplBCode control. /// @@ -32,6 +23,15 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.UpdatePanel uplBCode; + /// + /// UpdateProgressDisplay control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdateProgress UpdateProgressDisplay; + /// /// txtBarcode control. /// diff --git a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx index 2ea709d..9734247 100644 --- a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx +++ b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx @@ -7,7 +7,7 @@ -
+
@@ -18,22 +18,20 @@ - <%-- +
+
+ -
-
-
+
+

Processing...

+
+
+
+
- --%> - - -
-

Processing

-
- - +
@@ -91,5 +89,6 @@
<%: traduci("ResetSheetPickup") %>
+
diff --git a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs index e36fe76..4c3dae1 100644 --- a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs @@ -258,8 +258,6 @@ namespace NKC_WF.WebUserControls bool doRaiseEv = false; // processo evento.. lastCmd = cmp_barcode.inputAcquired.ToUpper(); - // start processing - pnlProc.Visible = true; //Thread.Sleep(1000); doRaiseEv = processLastCmd(doRaiseEv); // reset comando @@ -271,8 +269,6 @@ namespace NKC_WF.WebUserControls { resetMessageDivs(); } - // end processing - pnlProc.Visible = false; } private void Cmp_barcode_eh_doReset(object sender, EventArgs e) @@ -759,8 +755,6 @@ namespace NKC_WF.WebUserControls /// protected void lbtScrapped_Click(object sender, EventArgs e) { - // start processing - pnlProc.Visible = true; // resetto item selezionato... DLMan.taIL.updateStatus(itemIdSelected, 990, PlaceCodFix); lgInfo($"cmp_unloadSmart | SCRAP | Status --> 990 | itemIdSelected: {itemIdSelected} | PlaceCod: {PlaceCodFix}"); @@ -772,8 +766,6 @@ namespace NKC_WF.WebUserControls lastCmd = lastValidCmd; processLastCmd(false); resetButtons(); - // end processing - pnlProc.Visible = false; } protected void Page_Load(object sender, EventArgs e) diff --git a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.designer.cs index 9222137..0789ac3 100644 --- a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.designer.cs @@ -104,24 +104,6 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.WebControls.HiddenField hfShowSecOp; - /// - /// uplProcessing control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.UpdatePanel uplProcessing; - - /// - /// pnlProc control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl pnlProc; - /// /// divItemDet control. ///