From 4a32f314e676488ea4bd0a147dbf2febd5efbdd7 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Mon, 31 Aug 2020 10:46:00 +0200
Subject: [PATCH 1/2] update x search + QRCode x CART

---
 NKC_WF/WebUserControls/cmp_PartMIA_byCartID.ascx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/NKC_WF/WebUserControls/cmp_PartMIA_byCartID.ascx b/NKC_WF/WebUserControls/cmp_PartMIA_byCartID.ascx
index c3bd0a1..0a396ea 100644
--- a/NKC_WF/WebUserControls/cmp_PartMIA_byCartID.ascx
+++ b/NKC_WF/WebUserControls/cmp_PartMIA_byCartID.ascx
@@ -17,6 +17,7 @@
             </HeaderTemplate>
             <ItemTemplate>
                 <div class="font-weight-bold textBig">
+                    <asp:Image runat="server" Height="64" Visible='<%# !checkProd %>' ImageUrl='<%# getImgUrl(Eval("ItemDtmx")) %>' CssClass="img-fluid" />
                     <asp:Label ID="ItemDtmxLabel" runat="server" Text='<%# Eval("ItemDtmx") %>' Visible='<%# showFull %>' />
                 </div>
             </ItemTemplate>
@@ -94,7 +95,7 @@
                 </div>
             </ItemTemplate>
         </asp:TemplateField>
-        <asp:TemplateField ShowHeader="False">
+        <asp:TemplateField ShowHeader="False" ItemStyle-Width="3em">
             <ItemTemplate>
                 <asp:LinkButton ID="lbtSetScrap" runat="server" CausesValidation="False" CommandArgument='<%# Eval("ItemID") %>' Visible='<%# checkVisible(Eval("StatusID")) %>' CommandName="Select" CssClass="btn btn-lg btn-block btn-danger" OnClientClick='<%# SteamWare.jsUtils.getCBE("ConfirmSendScrap") %>' ToolTip='<%# traduci("SetScrap") %>'><i class="fa fa-recycle" aria-hidden="true"></i></asp:LinkButton>
             </ItemTemplate>
@@ -104,10 +105,13 @@
         <%: traduci("NoRecord") %>
     </EmptyDataTemplate>
 </asp:GridView>
-<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getMissingByCart" TypeName="AppData.DS_AppTableAdapters.ItemSearchDetailTableAdapter">
+<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getMissingByCart" TypeName="AppData.DS_AppTableAdapters.ItemSearchDetailTableAdapter" FilterExpression=" CartDtmx LIKE '%{0}%' OR BinDtmx LIKE '%{0}%' OR OrderExtCode LIKE '%{0}%' OR ItemExtCode LIKE '%{0}%' OR ItemDesc LIKE '%{0}%' OR ItemDtmx LIKE '%{0}%' OR MatDesc LIKE '%{0}%' OR (CONVERT(MatExtCode, 'System.String') LIKE '%{0}%') ">
     <SelectParameters>
         <asp:ControlParameter ControlID="hfCartID" Name="CartID" PropertyName="Value" Type="Int32" />
     </SelectParameters>
+    <FilterParameters>
+        <asp:SessionParameter SessionField="valoreSearch" DefaultValue="" Type="String" />
+    </FilterParameters>
 </asp:ObjectDataSource>
 <asp:HiddenField ID="hfCartID" runat="server" />
 <asp:HiddenField runat="server" ID="hfShowFull" Value="false" />

From 885f9de44bea72e7f4a861b09561fb3eef00eaa4 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Mon, 31 Aug 2020 10:46:14 +0200
Subject: [PATCH 2/2] update search x missing in action

---
 NKC_WF/BaseUserControl.cs                      | 10 ++++++++++
 NKC_WF/WebUserControls/cmp_menuTop.ascx        |  2 +-
 NKC_WF/WebUserControls/cmp_partMIA.ascx        | 10 +++++++---
 NKC_WF/WebUserControls/cmp_partMIA_byPLID.ascx |  7 +++++--
 NKC_WF/site/PartMIA.aspx.cs                    |  2 +-
 5 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/NKC_WF/BaseUserControl.cs b/NKC_WF/BaseUserControl.cs
index 04d40eb..deda4ed 100644
--- a/NKC_WF/BaseUserControl.cs
+++ b/NKC_WF/BaseUserControl.cs
@@ -19,6 +19,16 @@ namespace NKC_WF
             }
         }
         /// <summary>
+        /// verifica sia ambiente PROD (vs DEV)
+        /// </summary>
+        public bool checkProd
+        {
+            get
+            {
+                return memLayer.ML.CRS("environment") == "PROD";
+            }
+        }
+        /// <summary>
         /// Membro gestione accessi al datalayer (istanza x ogni classe controllo)
         /// </summary>
         protected DataLayer DLMan = new DataLayer();
diff --git a/NKC_WF/WebUserControls/cmp_menuTop.ascx b/NKC_WF/WebUserControls/cmp_menuTop.ascx
index de0cb5c..ea29657 100644
--- a/NKC_WF/WebUserControls/cmp_menuTop.ascx
+++ b/NKC_WF/WebUserControls/cmp_menuTop.ascx
@@ -45,7 +45,7 @@
       </li>
     </ul>
     <div runat="server" id="divSearch" class="form-inline my-2 my-lg-0">
-      <asp:TextBox runat="server" ID="txtSearch" class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search" AutoPostBack="true" OnTextChanged="txtSearch_TextChanged" />
+      <asp:TextBox runat="server" ID="txtSearch" class="form-control mr-sm-2" type="search" placeholder="[S]earch" aria-label="Search" AutoPostBack="true" OnTextChanged="txtSearch_TextChanged" AccessKey="S" />
       <asp:LinkButton runat="server" ID="lbtSearch" class="btn btn-secondary my-2 my-sm-0" type="submit" OnClick="lbtSearch_Click"># <%: traduci ("Search") %> <i class="fa fa-search" aria-hidden="true"></i></asp:LinkButton>
     </div>
   </div>
diff --git a/NKC_WF/WebUserControls/cmp_partMIA.ascx b/NKC_WF/WebUserControls/cmp_partMIA.ascx
index 7a72563..30b310f 100644
--- a/NKC_WF/WebUserControls/cmp_partMIA.ascx
+++ b/NKC_WF/WebUserControls/cmp_partMIA.ascx
@@ -2,7 +2,7 @@
 
 
 
-<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="ItemID" DataSourceID="ods" CssClass="table table-striped table-sm small" AllowPaging="true">
+<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="ItemID" DataSourceID="ods" CssClass="table table-striped table-sm textCondens" AllowPaging="true">
     <Columns>
         <asp:TemplateField HeaderText="PART" SortExpression="ItemExtCode">
             <ItemTemplate>
@@ -18,6 +18,7 @@
             </HeaderTemplate>
             <ItemTemplate>
                 <div class="font-weight-bold textBig">
+                    <asp:Image runat="server" Height="64" Visible='<%# !checkProd %>' ImageUrl='<%# getImgUrl(Eval("ItemDtmx")) %>' CssClass="img-fluid" />
                     <asp:Label ID="ItemDtmxLabel" runat="server" Text='<%# Eval("ItemDtmx") %>' Visible='<%# showFull %>' />
                 </div>
             </ItemTemplate>
@@ -95,7 +96,7 @@
                 </div>
             </ItemTemplate>
         </asp:TemplateField>
-        <asp:TemplateField ShowHeader="False">
+        <asp:TemplateField ShowHeader="False" ItemStyle-Width="3em">
             <ItemTemplate>
                 <asp:LinkButton ID="lbtSetScrap" runat="server" CausesValidation="False" CommandArgument='<%# Eval("ItemID") %>' Visible='<%# checkVisible(Eval("StatusID")) && enableScrap %>' CommandName="Select" CssClass="btn btn-lg btn-block btn-danger" OnClientClick='<%# SteamWare.jsUtils.getCBE("ConfirmSendScrap") %>' ToolTip='<%# traduci("SetScrap") %>'><i class="fa fa-recycle" aria-hidden="true"></i></asp:LinkButton>
             </ItemTemplate>
@@ -105,10 +106,13 @@
         <%: traduci("NoRecord") %>
     </EmptyDataTemplate>
 </asp:GridView>
-<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getMissingByBatch" TypeName="AppData.DS_AppTableAdapters.ItemSearchDetailTableAdapter">
+<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getMissingByBatch" TypeName="AppData.DS_AppTableAdapters.ItemSearchDetailTableAdapter" FilterExpression=" CartDtmx LIKE '%{0}%' OR BinDtmx LIKE '%{0}%' OR OrderExtCode LIKE '%{0}%' OR ItemExtCode LIKE '%{0}%' OR ItemDesc LIKE '%{0}%' OR ItemDtmx LIKE '%{0}%' OR MatDesc LIKE '%{0}%' OR (CONVERT(MatExtCode, 'System.String') LIKE '%{0}%') ">
     <SelectParameters>
         <asp:ControlParameter ControlID="hfBatchID" DefaultValue="0" Name="BatchID" PropertyName="Value" Type="Int32" />
     </SelectParameters>
+    <FilterParameters>
+        <asp:SessionParameter SessionField="valoreSearch" DefaultValue="" Type="String" />
+    </FilterParameters>
 </asp:ObjectDataSource>
 <asp:HiddenField ID="hfBatchID" runat="server" />
 <asp:HiddenField ID="hfShowFull" runat="server" />
diff --git a/NKC_WF/WebUserControls/cmp_partMIA_byPLID.ascx b/NKC_WF/WebUserControls/cmp_partMIA_byPLID.ascx
index a0de040..ba44f9a 100644
--- a/NKC_WF/WebUserControls/cmp_partMIA_byPLID.ascx
+++ b/NKC_WF/WebUserControls/cmp_partMIA_byPLID.ascx
@@ -94,7 +94,7 @@
                 </div>
             </ItemTemplate>
         </asp:TemplateField>
-        <asp:TemplateField ShowHeader="False">
+        <asp:TemplateField ShowHeader="False" ItemStyle-Width="3em">
             <ItemTemplate>
                 <asp:LinkButton ID="lbtSetScrap" runat="server" CausesValidation="False" CommandArgument='<%# Eval("ItemID") %>' Visible='<%# checkVisible(Eval("StatusID")) %>' CommandName="Select" CssClass="btn btn-lg btn-block btn-danger" OnClientClick='<%# SteamWare.jsUtils.getCBE("ConfirmSendScrap") %>' ToolTip='<%# traduci("SetScrap") %>'><i class="fa fa-recycle" aria-hidden="true"></i></asp:LinkButton>
             </ItemTemplate>
@@ -104,10 +104,13 @@
         <%: traduci("NoRecord") %>
     </EmptyDataTemplate>
 </asp:GridView>
-<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getMissingByPLID" TypeName="AppData.DS_AppTableAdapters.ItemSearchDetailTableAdapter">
+<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getMissingByPLID" TypeName="AppData.DS_AppTableAdapters.ItemSearchDetailTableAdapter" FilterExpression=" CartDtmx LIKE '%{0}%' OR BinDtmx LIKE '%{0}%' OR OrderExtCode LIKE '%{0}%' OR ItemExtCode LIKE '%{0}%' OR ItemDesc LIKE '%{0}%' OR ItemDtmx LIKE '%{0}%' OR MatDesc LIKE '%{0}%' OR (CONVERT(MatExtCode, 'System.String') LIKE '%{0}%') ">
     <SelectParameters>
         <asp:ControlParameter ControlID="hfPLID" Name="PackListID" PropertyName="Value" Type="Int32" DefaultValue="0" />
     </SelectParameters>
+    <FilterParameters>
+        <asp:SessionParameter SessionField="valoreSearch" DefaultValue="" Type="String" />
+    </FilterParameters>
 </asp:ObjectDataSource>
 <asp:HiddenField ID="hfPLID" runat="server" />
 <asp:HiddenField runat="server" ID="hfShowFull" Value="false" />
diff --git a/NKC_WF/site/PartMIA.aspx.cs b/NKC_WF/site/PartMIA.aspx.cs
index 9806d1e..0a6067e 100644
--- a/NKC_WF/site/PartMIA.aspx.cs
+++ b/NKC_WF/site/PartMIA.aspx.cs
@@ -54,7 +54,7 @@ namespace NKC_WF.site
         {
             if (!Page.IsPostBack)
             {
-                ((SiteMaster)this.Master).showSearch = false;
+                ((SiteMaster)this.Master).showSearch = true;
                 doUpdate();
                 cmp_numRow.eh_doRefresh += cmp_numRow_eh_doRefresh;
             }