From 71c1f620eba177d02efb3a508127b4abb45e87ef Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 13 Aug 2020 18:59:14 +0200
Subject: [PATCH] Update friltraggio batchList

---
 NKC_WF/WebUserControls/cmp_batchList.ascx | 7 +------
 NKC_WF/site/OrderManager.aspx             | 2 +-
 NKC_WF/site/OrderManager.aspx.cs          | 1 +
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx b/NKC_WF/WebUserControls/cmp_batchList.ascx
index cbb6807..f7b73e4 100644
--- a/NKC_WF/WebUserControls/cmp_batchList.ascx
+++ b/NKC_WF/WebUserControls/cmp_batchList.ascx
@@ -2,8 +2,6 @@
 <%@ Register Src="~/WebUserControls/cmp_batchDetail.ascx" TagPrefix="uc1" TagName="cmp_batchDetail" %>
 <%@ Register Src="~/WebUserControls/cmp_numRow.ascx" TagPrefix="uc1" TagName="cmp_numRow" %>
 
-
-
 <div class="row">
     <div class="col-12 border border-info table-info rounded py-2" runat="server" id="divDetail">
         <uc1:cmp_batchDetail runat="server" ID="cmp_batchDetail" />
@@ -92,7 +90,7 @@
                 </Columns>
             </asp:GridView>
             <asp:HiddenField ID="hfDeleteEnabled" runat="server" />
-            <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByStatus" TypeName="AppData.DS_AppTableAdapters.BatchListTableAdapter" DeleteMethod="deleteTree" FilterExpression="Status <> 5">
+            <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByStatus" TypeName="AppData.DS_AppTableAdapters.BatchListTableAdapter" DeleteMethod="deleteTree" FilterExpression="Status <> 5">
                 <SelectParameters>
                     <asp:ControlParameter ControlID="ddlStatus" DefaultValue="-1" Name="Status" PropertyName="SelectedValue" Type="Int32" />
                     <asp:SessionParameter Name="SearchVal" SessionField="valoreSearch" Type="String" DefaultValue="" />
@@ -102,9 +100,6 @@
                     <asp:Parameter Name="Original_BatchID" Type="Int32" />
                     <asp:Parameter Name="ForceDelete" Type="Int32" DefaultValue="1" />
                 </DeleteParameters>
-                <FilterParameters>
-                    <asp:SessionParameter SessionField="valoreSearch" DefaultValue="" Type="String" />
-                </FilterParameters>
             </asp:ObjectDataSource>
             <asp:HiddenField runat="server" ID="hfPartValid" />
         </div>
diff --git a/NKC_WF/site/OrderManager.aspx b/NKC_WF/site/OrderManager.aspx
index 1d4b935..43d331f 100644
--- a/NKC_WF/site/OrderManager.aspx
+++ b/NKC_WF/site/OrderManager.aspx
@@ -18,7 +18,7 @@
                         <asp:UpdatePanel ID="UpdatePanel1" runat="server">
                             <ContentTemplate>
                                 <uc1:cmp_batchList runat="server" ID="cmp_batchList" />
-                                <asp:Timer ID="Timer1" runat="server" Interval="2000" OnTick="Timer1_Tick"></asp:Timer>
+                                <asp:Timer ID="Timer1" runat="server" Interval="4000" OnTick="Timer1_Tick"></asp:Timer>
                             </ContentTemplate>
                         </asp:UpdatePanel>
 
diff --git a/NKC_WF/site/OrderManager.aspx.cs b/NKC_WF/site/OrderManager.aspx.cs
index 1d810f8..6f68457 100644
--- a/NKC_WF/site/OrderManager.aspx.cs
+++ b/NKC_WF/site/OrderManager.aspx.cs
@@ -29,6 +29,7 @@ namespace NKC_WF
         {
             if (!Page.IsPostBack)
             {
+                ((SiteMaster)this.Master).showSearch = false;
                 doUpdate();
             }
             cmp_batchList.eh_doRefresh += Cmp_batchList_eh_doRefresh;