UnloadSmart:

- Update barcode e prelievo x avere pronto un updateProgress
2023-10-24 17:07:52 +02:00
parent c122b688a8
commit a6b7235aeb
6 changed files with 31 additions and 58 deletions
@@ -29,7 +29,7 @@
 </head>
 <body class="pt-0">
    <form runat="server">
-        <asp:ScriptManager runat="server" ID="NkcScriptMan">
+        <asp:ScriptManager runat="server" ID="NkcScriptMan" EnablePartialRendering="true">
            <Scripts>
                <%--To learn more about bundling scripts in ScriptManager see https://go.microsoft.com/fwlink/?LinkID=301884 --%>
                <%--Framework Scripts--%>
@@ -1,15 +1,15 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_barcode.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_barcode" %>
-<asp:UpdateProgress ID="UpdateProgressDisplay" runat="server" DisplayAfter="0" DynamicLayout="true">
-    <ProgressTemplate>
-    <div class="d-flex">
-        <div class="progress w-100" style="height:0.5em">
-          <div class="progress-bar progress-bar-striped progress-bar-animated" style="width: 80%"></div>
-        </div>
-    </div>
-    </ProgressTemplate>
-</asp:UpdateProgress>
 <asp:UpdatePanel runat="server" ID="uplBCode">
    <ContentTemplate>
+        <asp:UpdateProgress ID="UpdateProgressDisplay" runat="server" DisplayAfter="0" DynamicLayout="true">
+            <ProgressTemplate>
+                <div class="d-flex">
+                    <div class="progress w-100" style="height: 0.5em">
+                        <div class="progress-bar progress-bar-striped progress-bar-animated" style="width: 80%"></div>
+                    </div>
+                </div>
+            </ProgressTemplate>
+        </asp:UpdateProgress>
        <div class="bigText">
            <asp:TextBox runat="server" ID="txtBarcode" class="form-control" autofocus="true" OnTextChanged="txtBarcode_TextChanged"></asp:TextBox>
            <asp:LinkButton runat="server" ID="lbtReset" OnClick="lbtReset_Click" CssClass="btn btn-block bnt-default">
@@ -14,15 +14,6 @@ namespace NKC_WF.WebUserControls
    public partial class cmp_barcode
    {

-        /// <summary>
-        /// UpdateProgressDisplay control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.UpdateProgress UpdateProgressDisplay;
-
        /// <summary>
        /// uplBCode control.
        /// </summary>
@@ -32,6 +23,15 @@ namespace NKC_WF.WebUserControls
        /// </remarks>
        protected global::System.Web.UI.UpdatePanel uplBCode;

+        /// <summary>
+        /// UpdateProgressDisplay control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.UpdateProgress UpdateProgressDisplay;
+
        /// <summary>
        /// txtBarcode control.
        /// </summary>
@@ -7,7 +7,7 @@
    <asp:HiddenField ID="hfBatchID" runat="server" />
    <asp:HiddenField ID="hfSheetID" runat="server" />
    <asp:HiddenField ID="hfDeviceId" runat="server" />
-    <div class="row mt-0" style="min-height: 22rem;">
+    <div class="row mt-0" style="min-height: 2rem;">
        <div class="col-12 px-0 table-secondary">
            <uc1:cmp_MachSelSmart runat="server" ID="cmp_MachSelSmart" />
        </div>
@@ -18,22 +18,20 @@
            <asp:HiddenField runat="server" ID="hfShowCart" />
            <asp:HiddenField runat="server" ID="hfShowBin" />
            <asp:HiddenField runat="server" ID="hfShowSecOp" />
-            <%--<asp:UpdateProgress ID="UpdateProgressDisplay" runat="server" DisplayAfter="10" DynamicLayout="true">
+        </div>
+        <div class="col-12 my-0">
+            <asp:UpdateProgress ID="UpdateProgressDisplay" runat="server" DisplayAfter="0" DynamicLayout="true">
                <ProgressTemplate>
-                    <div class="d-flex">
-                        <div class="progress w-100" style="height: 1.5em">
-                            <div class="progress-bar progress-bar-striped progress-bar-animated" style="width: 80%"></div>
+                    <div class="alert alert-info">
+                        <h1>Processing...</h1>
+                        <div class="d-flex">
+                            <div class="progress w-100" style="height: 1.5em">
+                                <div class="progress-bar progress-bar-striped progress-bar-animated" style="width: 80%"></div>
+                            </div>
                        </div>
                    </div>
                </ProgressTemplate>
-            </asp:UpdateProgress>--%>
-            <asp:UpdatePanel runat="server" ID="uplProcessing">
-                <ContentTemplate>
-                    <div class="alert alert-primary" runat="server" id="pnlProc" visible="false">
-                        <h1>Processing</h1>
-                    </div>
-                </ContentTemplate>
-            </asp:UpdatePanel>
+            </asp:UpdateProgress>
        </div>
        <div class="col-12 px-0 my-0">
            <div runat="server" id="divItemDet" class="bg-success text-warning small" visible="false">
@@ -91,5 +89,6 @@
        <div class="col-12 px-0">
            <asp:LinkButton runat="server" ID="lbtResetSel" CssClass="btn btn-block btn-warning text-uppercase" OnClick="lbtResetSel_Click"><i class="fa fa-ban" aria-hidden="true"></i> <%: traduci("ResetSheetPickup") %></asp:LinkButton>
        </div>
+        </div>
    </div>
 </div>
@@ -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
        /// <param name="e"></param>
        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)
@@ -104,24 +104,6 @@ namespace NKC_WF.WebUserControls
        /// </remarks>
        protected global::System.Web.UI.WebControls.HiddenField hfShowSecOp;

-        /// <summary>
-        /// uplProcessing control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.UpdatePanel uplProcessing;
-
-        /// <summary>
-        /// pnlProc control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl pnlProc;
-
        /// <summary>
        /// divItemDet control.
        /// </summary>