From a9ecb260fb9a9fff935ae716dfc5bdf33c0c9c7f Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 14 Jul 2021 08:30:42 +0200
Subject: [PATCH] FIx next bunk da posizione macchina!

---
 AppData/DS_App.Designer.cs                    |  9 +++-
 AppData/DS_App.xsd                            |  1 +
 .../WebUserControls/cmp_stackNextloading.ascx | 37 +++++++------
 .../cmp_stackNextloading.ascx.designer.cs     | 52 +++++++++----------
 4 files changed, 55 insertions(+), 44 deletions(-)

diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs
index 7081945..5429784 100644
--- a/AppData/DS_App.Designer.cs
+++ b/AppData/DS_App.Designer.cs
@@ -28916,6 +28916,7 @@ namespace AppData.DS_AppTableAdapters {
             this._commandCollection[6].CommandText = "dbo.stp_Stacks_getNext";
             this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PlaceCod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[7] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[7].Connection = this.Connection;
             this._commandCollection[7].CommandText = "dbo.stp_Stacks_insert";
@@ -29039,8 +29040,14 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
-        public virtual DS_App.StackListDataTable getNext() {
+        public virtual DS_App.StackListDataTable getNext(string PlaceCod) {
             this.Adapter.SelectCommand = this.CommandCollection[6];
+            if ((PlaceCod == null)) {
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(PlaceCod));
+            }
             DS_App.StackListDataTable dataTable = new DS_App.StackListDataTable();
             this.Adapter.Fill(dataTable);
             return dataTable;
diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd
index 13bdaa4..7b778c2 100644
--- a/AppData/DS_App.xsd
+++ b/AppData/DS_App.xsd
@@ -438,6 +438,7 @@ FROM v_StackList</CommandText>
                     <CommandText>dbo.stp_Stacks_getNext</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@PlaceCod" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
diff --git a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx
index 9e57969..0cd68db 100644
--- a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx
+++ b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx
@@ -9,7 +9,7 @@
                 <b><%: traduci("NoCurrentBunk") %></b>
             </div>
             <div class="col-6 text-right text-secondary">
-                 <%: traduci("Waiting") %>
+                <%: traduci("Waiting") %>
             </div>
         </div>
     </EmptyDataTemplate>
@@ -18,40 +18,40 @@
             <ItemTemplate>
                 <div class="row border border-success rounded">
                     <div class="col-12 col-lg-4 text-left text-secondary" runat="server" visible='<%# Eval("NumSheets").ToString() == Eval("NumSheetsWorked").ToString()  %>'>
-                        <b> <%: traduci("Previous") %></b> <%: traduci("Bunk") %> <b>
+                        <b><%: traduci("Previous") %></b> <%: traduci("Bunk") %> <b>
                             <asp:Label ID="Label1" runat="server" Text='<%# Eval("StackDtmx") %>' /></b>
                         (<asp:Label ID="Label2" runat="server" Text='<%# Eval("StackIndex") %>' />)
                     </div>
                     <div class="col-12 col-lg-4 text-left text-success" runat="server" visible='<%# Eval("NumSheets").ToString() != Eval("NumSheetsWorked").ToString()  %>'>
-                        <b> <%: traduci("Current") %></b> <%: traduci("Bunk") %> <b>
+                        <b><%: traduci("Current") %></b> <%: traduci("Bunk") %> <b>
                             <asp:Label ID="StackIDLabel" runat="server" Text='<%# Eval("StackDtmx") %>' /></b>
                         (<asp:Label ID="StackIndexLabel" runat="server" Text='<%# Eval("StackIndex") %>' />)
                     </div>
                     <div class="col-12 col-lg-5 text-center px-0">
                         <div class="row textCondens">
                             <div class="col-3 pr-0">
-                                 <%: traduci("Sheets") %><b><asp:Label ID="NumSheetsLabel" runat="server" Text='<%# Eval("NumSheets") %>' /></b>
+                                <%: traduci("Sheets") %><b><asp:Label ID="NumSheetsLabel" runat="server" Text='<%# Eval("NumSheets") %>' /></b>
                             </div>
                             <div class="col-3 px-0">
-                                 <%: traduci("Printed") %> <b>
+                                <%: traduci("Printed") %> <b>
                                     <asp:Label ID="NumSheetsPrintedLabel" runat="server" Text='<%# Eval("NumSheetsPrinted") %>' /></b>
                             </div>
                             <div class="col-3 px-0">
-                                 <%: traduci("Worked") %><b>
+                                <%: traduci("Worked") %><b>
                                     <asp:Label ID="NumSheetsWorkedLabel" runat="server" Text='<%# Eval("NumSheetsWorked") %>' /></b>
                             </div>
                             <div class="col-3 pl-0 text-danger">
-                                 <%: traduci("ToRedo") %> <b>
+                                <%: traduci("ToRedo") %> <b>
                                     <asp:Label ID="NumSheetsToRedoLabel" runat="server" Text='<%# Eval("NumSheetsToRedo") %>' /></b>
                             </div>
                         </div>
                     </div>
                     <div class="col-12 col-lg-3 text-right text-secondary" runat="server" visible='<%# Eval("NumSheets").ToString() == Eval("NumSheetsWorked").ToString()  %>'>
-                         <%: traduci("Items") %><b>
+                        <%: traduci("Items") %><b>
                             <asp:Label ID="lblNumItems" runat="server" Text='<%# Eval("NumItems") %>' /></b>
                     </div>
                     <div class="d-none d-lg-block col-lg-3 text-right text-success" runat="server" visible='<%# Eval("NumSheets").ToString() != Eval("NumSheetsWorked").ToString()  %>'>
-                         <%: traduci("Items") %><b>
+                        <%: traduci("Items") %><b>
                             <asp:Label ID="Label3" runat="server" Text='<%# Eval("NumItems") %>' /></b>
                     </div>
                 </div>
@@ -68,17 +68,17 @@
     <ItemTemplate>
         <div class="row border border-primary rounded">
             <div class="col-12 col-lg-4 text-left text-primary">
-                <b> <%: traduci("Next") %></b> # <%: traduci("Bunk") %> <b>
+                <b><%: traduci("Next") %></b> # <%: traduci("Bunk") %> <b>
                     <asp:Label ID="StackIDLabel" runat="server" Text='<%# Eval("StackDtmx") %>' /></b>
                 (<asp:Label ID="StackIndexLabel" runat="server" Text='<%# Eval("StackIndex") %>' />)
             </div>
             <div class="col-12 col-lg-4 text-center textCondens">
-                 <%: traduci("Sheets") %><b><asp:Label ID="NumSheetsLabel" runat="server" Text='<%# Eval("NumSheets") %>' /></b> | printed: <b>
+                <%: traduci("Sheets") %><b><asp:Label ID="NumSheetsLabel" runat="server" Text='<%# Eval("NumSheets") %>' /></b> | printed: <b>
                     <asp:Label ID="NumSheetsPrintedLabel" runat="server" Text='<%# Eval("NumSheetsPrinted") %>' /></b> | worked: <b>
                         <asp:Label ID="NumSheetsWorkedLabel" runat="server" Text='<%# Eval("NumSheetsWorked") %>' /></b>
             </div>
             <div class="col-12 col-lg-4 text-right text-primary">
-                 <%: traduci("Items") %><b>
+                <%: traduci("Items") %><b>
                     <asp:Label ID="lblNumItems" runat="server" Text='<%# Eval("NumItems") %>' /></b>
             </div>
         </div>
@@ -86,10 +86,10 @@
     <EmptyDataTemplate>
         <div class="row border border-primary rounded">
             <div class="col-6 text-left text-secondary">
-                <b> <%: traduci("NoNextBunk") %></b>
+                <b><%: traduci("NoNextBunk") %></b>
             </div>
             <div class="col-6 text-right text-secondary">
-                 <%: traduci("BatchComplete") %>
+                <%: traduci("BatchComplete") %>
             </div>
         </div>
     </EmptyDataTemplate>
@@ -99,10 +99,13 @@
         <asp:ControlParameter ControlID="hfBatchID" DefaultValue="0" Name="BatchID" PropertyName="Value" Type="Int32" />
     </SelectParameters>
 </asp:ObjectDataSource>
-<asp:ObjectDataSource ID="odsNext" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getNext" TypeName="AppData.DS_AppTableAdapters.StackListTableAdapter"></asp:ObjectDataSource>
+<asp:ObjectDataSource ID="odsNext" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getNext" TypeName="AppData.DS_AppTableAdapters.StackListTableAdapter">
+    <SelectParameters>
+        <asp:QueryStringParameter DefaultValue="#" Name="PlaceCod" QueryStringField="mach" Type="String" />
+    </SelectParameters>
+</asp:ObjectDataSource>
 <div class="row">
     <div class="col-12">
         <asp:LinkButton runat="server" ID="lbtCollectRedoOnEnd" CssClass="btn btn-warning btn-block" OnClick="lbtCollectRedoOnEnd_Click"><i class="fa fa-recycle" aria-hidden="true"></i> <%: traduci("CollectRedoOnEnd") %><i class="fa fa-recycle" aria-hidden="true"></i></asp:LinkButton>
     </div>
-</div>
-
+</div>
\ No newline at end of file
diff --git a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx.designer.cs
index 444cd3a..ba5e43b 100644
--- a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx.designer.cs
+++ b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx.designer.cs
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
-// <generato automaticamente>
-//     Codice generato da uno strumento.
+// <auto-generated>
+//     This code was generated by a tool.
 //
-//     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
-//     il codice viene rigenerato. 
-// </generato automaticamente>
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace NKC_WF.WebUserControls
@@ -15,65 +15,65 @@ namespace NKC_WF.WebUserControls
     {
 
         /// <summary>
-        /// Controllo hfBatchID.
+        /// hfBatchID control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hfBatchID;
 
         /// <summary>
-        /// Controllo grViewCurrent.
+        /// grViewCurrent control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.GridView grViewCurrent;
 
         /// <summary>
-        /// Controllo lbtCollectRedo.
+        /// lbtCollectRedo control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lbtCollectRedo;
 
         /// <summary>
-        /// Controllo frmViewNext.
+        /// frmViewNext control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.FormView frmViewNext;
 
         /// <summary>
-        /// Controllo odsCurr.
+        /// odsCurr control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.ObjectDataSource odsCurr;
 
         /// <summary>
-        /// Controllo odsNext.
+        /// odsNext control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.ObjectDataSource odsNext;
 
         /// <summary>
-        /// Controllo lbtCollectRedoOnEnd.
+        /// lbtCollectRedoOnEnd control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lbtCollectRedoOnEnd;
     }