From eb574b402a5e2b9a32244ed1ac844e7c654f1985 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Mon, 19 Feb 2018 16:21:24 +0100
Subject: [PATCH] COmpletato fix ricerca collaudi

---
 CMS_SC/Collaudi.aspx                          | 30 +++++++++++++++----
 CMS_SC/Collaudi.aspx.cs                       | 17 +++++++++++
 CMS_SC/Collaudi.aspx.designer.cs              | 27 +++++++++++++++++
 CMS_SC/WebUserControls/mod_StatoCollaudi.ascx |  5 +++-
 CMS_SC/WebUserControls/mod_collaudi.ascx      |  2 +-
 5 files changed, 74 insertions(+), 7 deletions(-)

diff --git a/CMS_SC/Collaudi.aspx b/CMS_SC/Collaudi.aspx
index 4c24159..9050ab4 100644
--- a/CMS_SC/Collaudi.aspx
+++ b/CMS_SC/Collaudi.aspx
@@ -15,17 +15,37 @@
         <div class="card">
           <div class="card-header">
             <div class="row">
-              <div class="col-12">
+              <div class="col-5">
                 <h6 class="card-title text-uppercase"><%: traduci("StatoCollaudi") %></h6>
               </div>
-              <div class="col-4">
+              <div class="col-7">
+                <div class="input-group mb-2">
+                  <div class="input-group-prepend">
+                    <div class="input-group-text">
+                      <asp:LinkButton runat="server" ID="lbSearch">
+                      <i class="fa fa-search"></i>
+                      </asp:LinkButton>
+                    </div>
+                  </div>
+                  <asp:TextBox runat="server" ID="txtSearchMatr" CssClass="searchinput form-control form-control-sm text-info font-weight-bold" placeholder="Ricerca Matricola" AutoPostBack="True" OnTextChanged="txtSearchMatr_TextChanged" />
+                  <div class="input-group-append">
+                    <asp:LinkButton runat="server" ID="lbReset" OnClick="lbReset_Click" CssClass="input-group-text">
+                    <i class="fa fa-ban"></i>
+                    </asp:LinkButton>
+                  </div>
+                </div>
+              </div>
+              <div class="col-5">
                 <asp:DropDownList runat="server" ID="ddlFase" DataSourceID="odsFase" DataTextField="label" DataValueField="value" AutoPostBack="True" CssClass="form-control form-control-sm" OnSelectedIndexChanged="ddlFase_SelectedIndexChanged" OnDataBound="ddlFase_DataBound">
                 </asp:DropDownList>
                 <asp:ObjectDataSource ID="odsFase" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="CMS_SC_Data.DS_UtilityTableAdapters.v_selFasiTableAdapter"></asp:ObjectDataSource>
               </div>
-              <div class="col-8">
-                <asp:DropDownList runat="server" ID="ddlDossier" DataSourceID="odsDossier" DataTextField="label" DataValueField="value" CssClass="form-control form-control-sm" AutoPostBack="True" OnSelectedIndexChanged="ddlDossier_SelectedIndexChanged"></asp:DropDownList>
-                <asp:ObjectDataSource ID="odsDossier" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByConditio" TypeName="CMS_SC_Data.DS_UtilityTableAdapters.v_selElencoDossierTableAdapter">
+              <div class="col-7">
+                <asp:DropDownList runat="server" ID="ddlDossier" DataSourceID="odsDossier" DataTextField="label" DataValueField="value" CssClass="form-control form-control-sm text-info" AutoPostBack="True" OnSelectedIndexChanged="ddlDossier_SelectedIndexChanged"></asp:DropDownList>
+                <asp:ObjectDataSource ID="odsDossier" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByConditio" TypeName="CMS_SC_Data.DS_UtilityTableAdapters.v_selElencoDossierTableAdapter" FilterExpression=" label LIKE '%{0}%' ">
+                  <FilterParameters>
+                    <asp:ControlParameter DefaultValue="*" Name="ricerca" ControlID="txtSearchMatr" PropertyName="Text" />
+                  </FilterParameters>
                   <SelectParameters>
                     <asp:ControlParameter ControlID="ddlFase" Name="conditio" PropertyName="SelectedValue" Type="String" />
                   </SelectParameters>
diff --git a/CMS_SC/Collaudi.aspx.cs b/CMS_SC/Collaudi.aspx.cs
index a1d68cb..19bf66d 100644
--- a/CMS_SC/Collaudi.aspx.cs
+++ b/CMS_SC/Collaudi.aspx.cs
@@ -530,5 +530,22 @@ namespace CMS_SC
         memLayer.ML.setSessionVal("showDetail", value);
       }
     }
+
+    protected void txtSearchMatr_TextChanged(object sender, EventArgs e)
+    {
+      ddlDossier.SelectedIndex = 0;
+      ddlDossier.DataBind();
+      fixControls();
+      mod_StatoCollaudi.resetSelezione();
+    }
+
+    protected void lbReset_Click(object sender, EventArgs e)
+    {
+      txtSearchMatr.Text = "";
+      ddlDossier.SelectedIndex = 0;
+      ddlDossier.DataBind();
+      fixControls();
+      mod_StatoCollaudi.resetSelezione();
+    }
   }
 }
\ No newline at end of file
diff --git a/CMS_SC/Collaudi.aspx.designer.cs b/CMS_SC/Collaudi.aspx.designer.cs
index 0da16ab..4ff67de 100644
--- a/CMS_SC/Collaudi.aspx.designer.cs
+++ b/CMS_SC/Collaudi.aspx.designer.cs
@@ -21,6 +21,33 @@ namespace CMS_SC {
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divStato;
         
+        /// <summary>
+        /// Controllo lbSearch.
+        /// </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 lbSearch;
+        
+        /// <summary>
+        /// Controllo txtSearchMatr.
+        /// </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.TextBox txtSearchMatr;
+        
+        /// <summary>
+        /// Controllo lbReset.
+        /// </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 lbReset;
+        
         /// <summary>
         /// Controllo ddlFase.
         /// </summary>
diff --git a/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx b/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx
index eb45e6f..743c6b6 100644
--- a/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx
+++ b/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx
@@ -44,7 +44,10 @@
     </asp:TemplateField>
   </Columns>
 </asp:GridView>
-<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByDossFase" TypeName="CMS_SC_Data.DS_ApplicazioneTableAdapters.StatoCollaudiTableAdapter">
+<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByDossFase" TypeName="CMS_SC_Data.DS_ApplicazioneTableAdapters.StatoCollaudiTableAdapter" FilterExpression=" Descrizione LIKE '%{0}%' OR DescrStato LIKE '%{0}%' OR CodScheda LIKE '%{0}%' " >
+  <FilterParameters>
+    <asp:SessionParameter DefaultValue="*" Name="ricerca" SessionField="searchVal" />
+  </FilterParameters>
   <SelectParameters>
     <asp:ControlParameter ControlID="hfIdxDossier" Name="IdxDossier" PropertyName="Value" Type="Int32" />
     <asp:ControlParameter ControlID="hfFase" Name="Fase" PropertyName="Value" Type="String" />
diff --git a/CMS_SC/WebUserControls/mod_collaudi.ascx b/CMS_SC/WebUserControls/mod_collaudi.ascx
index 7da64af..f054fd0 100644
--- a/CMS_SC/WebUserControls/mod_collaudi.ascx
+++ b/CMS_SC/WebUserControls/mod_collaudi.ascx
@@ -130,7 +130,7 @@
 </asp:GridView>
 <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getDataFilt" TypeName="CMS_SC_Data.DS_ApplicazioneTableAdapters.MisureTableAdapter" FilterExpression=" CodSchedaVersNum LIKE '%{0}%' OR CodMisura LIKE '%{0}%' OR NomeMisura LIKE '%{0}%' OR NomePar LIKE '%{0}%' " UpdateMethod="updateMis" OnUpdating="ods_Updating">
   <FilterParameters>
-    <asp:SessionParameter DefaultValue="*" Name="ricerca" SessionField="searchVal" />
+    <asp:SessionParameter DefaultValue="*" Name="ricerca" SessionField="searchValMisure" />
   </FilterParameters>
   <SelectParameters>
     <asp:ControlParameter ControlID="hfIdxDossier" Name="IdxDossier" PropertyName="Value" Type="Int32" />