Start new dev version

Jenkinsfile

@@ -11,7 +11,7 @@ pipeline {
       steps {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=290']) {
+        withEnv(['NEXT_BUILD_NUMBER=291']) {
           // env.versionNumber = VersionNumber(versionNumberString : '0.10.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '0.10.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.versionNumberBeta = VersionNumber(versionNumberString : '0.10.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')

NKC_WF/WebUserControls/cmp_painting.ascx.cs

@@ -18,7 +18,6 @@ namespace NKC_WF.WebUserControls
             set
             {
                 hfLastBCode.Value = value;
-                //lastValidCmd = value;
             }
         }
         /// <summary>
@@ -46,7 +45,7 @@ namespace NKC_WF.WebUserControls
         /// <param name="e"></param>
         protected void Page_Load(object sender, EventArgs e)
         {
-            if(!Page.IsPostBack)
+            if (!Page.IsPostBack)
             {
                 // pulisco dir temp dai file dei cartellini stampati
                 reportPrinter.obj.pulisciDir();
@@ -69,11 +68,9 @@ namespace NKC_WF.WebUserControls
         private void Cmp_barcode_eh_doRefresh(object sender, EventArgs e)
         {
             bool doRaiseEv = false;
-            // processo evento..
             lastCmd = cmp_barcode.inputAcquired.ToUpper();
             doRaiseEv = processLastCmd(doRaiseEv);
-            // aggiorno...
-            doUpdate(); 
+            doUpdate();
         }
 
         private bool processLastCmd(bool doRaiseEv)
@@ -131,7 +128,7 @@ namespace NKC_WF.WebUserControls
                         // ora confronto cmd con ultimo valido
                         if (lastValidCmd != lastCmd)
                         {
-                        cmp_barcode.showOutput("badge badge-success", $"Valid BN Code: {decoData.description}");
+                            cmp_barcode.showOutput("badge badge-success", $"Valid BN Code: {decoData.description}");
                             // salvo
                             lastValidCmd = lastCmd;
                         }

NKC_WF/WebUserControls/cmp_stackBuilding.ascx

@@ -4,53 +4,53 @@
 
 
 <div class="row">
-  <div class="col-12">
-    <h3>BUNK BUILDING</h3>
-  </div>
-  <div class="col-12 text-center">
-    <div class="row mb-1" runat="server" id="divPrint">
-      <div class="col-lg-3">
-      </div>
-      <div class="col-12 col-lg-6">
-        <asp:LinkButton runat="server" ID="lbtPrint" CssClass="btn btn-success btn-block" OnClick="lbtPrint_Click">
-          PRINT <i class="fa fa-print" aria-hidden="true"></i>
-        </asp:LinkButton>
-      </div>
-      <div class="col-lg-3">
-      </div>
+    <div class="col-12">
+        <h3>BUNK BUILDING</h3>
     </div>
-    <div class="row">
-      <div class="col-12">
-        <asp:HiddenField runat="server" ID="hfBarcode" />
-        <uc1:cmp_barcode runat="server" ID="cmp_barcode" />
-      </div>
-      <div class="col-12 mb-2">
-        <asp:CheckBox runat="server" ID="chkRedux" Checked="true" Text="Summary" AutoPostBack="true" />
-        <asp:Repeater ID="repCtrl" runat="server" DataSourceID="ods">
-          <ItemTemplate>
-            <div class="row text-center my-1">
-              <div class="col-1 px-0 col-lg-3 px-lg-2 text-right">
-                <asp:Label runat="server" ID="lblNext" CssClass="text-primary px-1" Width="100%" Visible='<%#  Eval("IsNext").ToString()=="1" %>'><span class="d-none d-lg-inline">NEXT </span><i class="fa fa-arrow-circle-right" aria-hidden="true"></i></asp:Label>
-                <asp:Label runat="server" ID="lblDone" CssClass="text-success px-1" Visible='<%#  Eval("Prepared").ToString()!="" %>'><span class="d-none d-lg-inline"><%#  Eval("Prepared","{0:ddd yyyy-MM-dd HH:mm}") %></span><i class="fa fa-check-circle" aria-hidden="true"></i></asp:Label>
-              </div>
-              <div runat="server" id="divMain" class='<%# "col-11 col-lg-9 " + cssByPrepared(Eval("Prepared"),Eval("IsNext")) %>'>
-                <div class="row">
-                  <div class="col-1 px-1 col-md-2 px-md-2 small"><%# Eval("SheetIndex") %></div>
-                  <div class="col-8 col-md-8 px-md-2 text-truncate"><%#  Eval("MatDesc") %></div>
-                  <div class="col-3 col-md-2"><b><%# Eval("MatExtCode") %></b></div>
-                </div>
-              </div>
+    <div class="col-12 text-center">
+        <div class="row mb-1" runat="server" id="divPrint">
+            <div class="col-lg-3">
             </div>
-          </ItemTemplate>
-        </asp:Repeater>
-        <asp:HiddenField ID="hfStackId" runat="server" />
-        <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByStackRedux" TypeName="AppData.DS_AppTableAdapters.SheetListTableAdapter">
-          <SelectParameters>
-            <asp:ControlParameter ControlID="hfStackId" DefaultValue="0" Name="StackID" PropertyName="Value" Type="Int32" />
-            <asp:ControlParameter ControlID="chkRedux" DefaultValue="0" Name="Redux" PropertyName="Checked" Type="Boolean" />
-          </SelectParameters>
-        </asp:ObjectDataSource>
-      </div>
+            <div class="col-12 col-lg-6">
+                <asp:LinkButton runat="server" ID="lbtPrint" CssClass="btn btn-success btn-block" OnClick="lbtPrint_Click">
+          PRINT <i class="fa fa-print" aria-hidden="true"></i>
+                </asp:LinkButton>
+            </div>
+            <div class="col-lg-3">
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-12">
+                <uc1:cmp_barcode runat="server" ID="cmp_barcode" />
+                <asp:HiddenField runat="server" ID="hfLastBCode" />
+            </div>
+            <div class="col-12 mb-2">
+                <asp:CheckBox runat="server" ID="chkRedux" Checked="true" Text="Summary" AutoPostBack="true" />
+                <asp:Repeater ID="repCtrl" runat="server" DataSourceID="ods">
+                    <ItemTemplate>
+                        <div class="row text-center my-1">
+                            <div class="col-1 px-0 col-lg-3 px-lg-2 text-right">
+                                <asp:Label runat="server" ID="lblNext" CssClass="text-primary px-1" Width="100%" Visible='<%#  Eval("IsNext").ToString()=="1" %>'><span class="d-none d-lg-inline">NEXT </span><i class="fa fa-arrow-circle-right" aria-hidden="true"></i></asp:Label>
+                                <asp:Label runat="server" ID="lblDone" CssClass="text-success px-1" Visible='<%#  Eval("Prepared").ToString()!="" %>'><span class="d-none d-lg-inline"><%#  Eval("Prepared","{0:ddd yyyy-MM-dd HH:mm}") %></span><i class="fa fa-check-circle" aria-hidden="true"></i></asp:Label>
+                            </div>
+                            <div runat="server" id="divMain" class='<%# "col-11 col-lg-9 " + cssByPrepared(Eval("Prepared"),Eval("IsNext")) %>'>
+                                <div class="row">
+                                    <div class="col-1 px-1 col-md-2 px-md-2 small"><%# Eval("SheetIndex") %></div>
+                                    <div class="col-8 col-md-8 px-md-2 text-truncate"><%#  Eval("MatDesc") %></div>
+                                    <div class="col-3 col-md-2"><b><%# Eval("MatExtCode") %></b></div>
+                                </div>
+                            </div>
+                        </div>
+                    </ItemTemplate>
+                </asp:Repeater>
+                <asp:HiddenField ID="hfStackId" runat="server" />
+                <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByStackRedux" TypeName="AppData.DS_AppTableAdapters.SheetListTableAdapter">
+                    <SelectParameters>
+                        <asp:ControlParameter ControlID="hfStackId" DefaultValue="0" Name="StackID" PropertyName="Value" Type="Int32" />
+                        <asp:ControlParameter ControlID="chkRedux" DefaultValue="0" Name="Redux" PropertyName="Checked" Type="Boolean" />
+                    </SelectParameters>
+                </asp:ObjectDataSource>
+            </div>
+        </div>
     </div>
-  </div>
 </div>

NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs

@@ -1,19 +1,31 @@
 using AppData;
 using NKC_SDK;
 using System;
+using System.Diagnostics;
 using System.Web.UI;
 
 namespace NKC_WF.WebUserControls
 {
     public partial class cmp_stackBuilding : BaseUserControl
     {
+        /// <summary>
+        /// Comando barcode letto
+        /// </summary>
+        protected string lastCmd
+        {
+            get
+            {
+                return hfLastBCode.Value;
+            }
+            set
+            {
+                hfLastBCode.Value = value;
+            }
+        }
         protected void Page_Load(object sender, EventArgs e)
         {
             if (!Page.IsPostBack)
             {
-                // svuoto input barcode...
-                cmp_barcode.inputAcquired = "";
-                lastCmd = "";
                 // pulisco dir temp dai file dei cartellini stampati
                 reportPrinter.obj.pulisciDir();
             }
@@ -30,35 +42,31 @@ namespace NKC_WF.WebUserControls
             divPrint.Visible = (nextTbl.Count == 0);
         }
 
-        /// <summary>
-        /// Comando barcode letto
-        /// </summary>
-        protected string lastCmd
-        {
-            get
-            {
-                return hfBarcode.Value;
-            }
-            set
-            {
-                hfBarcode.Value = value;
-            }
-        }
 
         private void Cmp_barcode_eh_doRefresh(object sender, EventArgs e)
         {
-            // processo evento..
+            bool doRaiseEv = false;
             lastCmd = cmp_barcode.inputAcquired.ToUpper();
+            processLastCmd(doRaiseEv);
+            doUpdate();
+        }
+
+        private bool processLastCmd(bool doRaiseEv)
+        {
+            // verifico il datamatrix dei BIN da pitturare
+            if (string.IsNullOrEmpty(lastCmd)) doRaiseEv = true;
             // processiamo barcode letto
             decodedData decoData = DataLayer.man.decodeBcode(lastCmd);
             switch (decoData.codeType)
             {
                 case codeType.UNK:
                     cmp_barcode.showOutput("text-danger", "Unknown Data");
+                    doRaiseEv = true;
                     break;
                 case codeType.Item:
                 case codeType.ItemGeneric:
                     cmp_barcode.showOutput("text-warning", "Item - ignored");
+                    doRaiseEv = true;
                     break;
                 case codeType.Material:
                     // verifico SE il materiale SIA quello dello sheet richiesto dallo stack/bunk corrente...
@@ -86,20 +94,20 @@ namespace NKC_WF.WebUserControls
                     break;
                 case codeType.Sheet:
                     cmp_barcode.showOutput("badge badge-warning", "Sheet - ignored");
+                    doRaiseEv = true;
                     break;
                 case codeType.Stack:
                     cmp_barcode.showOutput("badge badge-warning", "Stack - ignored");
+                    doRaiseEv = true;
                     break;
                 case codeType.Batch:
                     cmp_barcode.showOutput("badge badge-warning", "Batch - ignored");
+                    doRaiseEv = true;
                     break;
                 default:
                     break;
             }
-            // reset comando
-            cmp_barcode.resetInput();
-            // aggiorno...
-            doUpdate();
+            return doRaiseEv;
         }
 
         public void doUpdate()

NKC_WF/WebUserControls/cmp_stackBuilding.ascx.designer.cs

@@ -11,79 +11,79 @@ namespace NKC_WF.WebUserControls
 {
 
 
-  public partial class cmp_stackBuilding
-  {
+    public partial class cmp_stackBuilding
+    {
 
-    /// <summary>
-    /// Controllo divPrint.
-    /// </summary>
-    /// <remarks>
-    /// Campo generato automaticamente.
-    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-    /// </remarks>
-    protected global::System.Web.UI.HtmlControls.HtmlGenericControl divPrint;
+        /// <summary>
+        /// Controllo divPrint.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divPrint;
 
-    /// <summary>
-    /// Controllo lbtPrint.
-    /// </summary>
-    /// <remarks>
-    /// Campo generato automaticamente.
-    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-    /// </remarks>
-    protected global::System.Web.UI.WebControls.LinkButton lbtPrint;
+        /// <summary>
+        /// Controllo lbtPrint.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.LinkButton lbtPrint;
 
-    /// <summary>
-    /// Controllo hfBarcode.
-    /// </summary>
-    /// <remarks>
-    /// Campo generato automaticamente.
-    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-    /// </remarks>
-    protected global::System.Web.UI.WebControls.HiddenField hfBarcode;
+        /// <summary>
+        /// Controllo cmp_barcode.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::NKC_WF.WebUserControls.cmp_barcode cmp_barcode;
 
-    /// <summary>
-    /// Controllo cmp_barcode.
-    /// </summary>
-    /// <remarks>
-    /// Campo generato automaticamente.
-    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-    /// </remarks>
-    protected global::NKC_WF.WebUserControls.cmp_barcode cmp_barcode;
+        /// <summary>
+        /// Controllo hfLastBCode.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.HiddenField hfLastBCode;
 
-    /// <summary>
-    /// Controllo chkRedux.
-    /// </summary>
-    /// <remarks>
-    /// Campo generato automaticamente.
-    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-    /// </remarks>
-    protected global::System.Web.UI.WebControls.CheckBox chkRedux;
+        /// <summary>
+        /// Controllo chkRedux.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.CheckBox chkRedux;
 
-    /// <summary>
-    /// Controllo repCtrl.
-    /// </summary>
-    /// <remarks>
-    /// Campo generato automaticamente.
-    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-    /// </remarks>
-    protected global::System.Web.UI.WebControls.Repeater repCtrl;
+        /// <summary>
+        /// Controllo repCtrl.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Repeater repCtrl;
 
-    /// <summary>
-    /// Controllo hfStackId.
-    /// </summary>
-    /// <remarks>
-    /// Campo generato automaticamente.
-    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-    /// </remarks>
-    protected global::System.Web.UI.WebControls.HiddenField hfStackId;
+        /// <summary>
+        /// Controllo hfStackId.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.HiddenField hfStackId;
 
-    /// <summary>
-    /// Controllo ods.
-    /// </summary>
-    /// <remarks>
-    /// Campo generato automaticamente.
-    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-    /// </remarks>
-    protected global::System.Web.UI.WebControls.ObjectDataSource ods;
-  }
+        /// <summary>
+        /// Controllo ods.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.ObjectDataSource ods;
+    }
 }