diff --git a/ETS_Data/Ds_ProjEts.Designer.cs b/ETS_Data/Ds_ProjEts.Designer.cs index 7da48d0..d444e40 100644 --- a/ETS_Data/Ds_ProjEts.Designer.cs +++ b/ETS_Data/Ds_ProjEts.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18046 +// Runtime Version:4.0.30319.18051 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -2753,6 +2753,12 @@ namespace ETS_Data { private global::System.Data.DataColumn columntotOre; + private global::System.Data.DataColumn columnAnnoCommessa; + + private global::System.Data.DataColumn columnNumeroCommessa; + + private global::System.Data.DataColumn columnnickComm; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public AnagCommFasiDataTable() { @@ -2922,6 +2928,30 @@ namespace ETS_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn AnnoCommessaColumn { + get { + return this.columnAnnoCommessa; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn NumeroCommessaColumn { + get { + return this.columnNumeroCommessa; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn nickCommColumn { + get { + return this.columnnickComm; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -2975,7 +3005,10 @@ namespace ETS_Data { decimal budgetMoney, string codClasse, string codExt, - decimal totOre) { + decimal totOre, + int AnnoCommessa, + int NumeroCommessa, + string nickComm) { AnagCommFasiRow rowAnagCommFasiRow = ((AnagCommFasiRow)(this.NewRow())); object[] columnValuesArray = new object[] { idxProgetto, @@ -2994,7 +3027,10 @@ namespace ETS_Data { budgetMoney, codClasse, codExt, - totOre}; + totOre, + AnnoCommessa, + NumeroCommessa, + nickComm}; rowAnagCommFasiRow.ItemArray = columnValuesArray; this.Rows.Add(rowAnagCommFasiRow); return rowAnagCommFasiRow; @@ -3041,6 +3077,9 @@ namespace ETS_Data { this.columncodClasse = base.Columns["codClasse"]; this.columncodExt = base.Columns["codExt"]; this.columntotOre = base.Columns["totOre"]; + this.columnAnnoCommessa = base.Columns["AnnoCommessa"]; + this.columnNumeroCommessa = base.Columns["NumeroCommessa"]; + this.columnnickComm = base.Columns["nickComm"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3080,6 +3119,12 @@ namespace ETS_Data { base.Columns.Add(this.columncodExt); this.columntotOre = new global::System.Data.DataColumn("totOre", typeof(decimal), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columntotOre); + this.columnAnnoCommessa = new global::System.Data.DataColumn("AnnoCommessa", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnAnnoCommessa); + this.columnNumeroCommessa = new global::System.Data.DataColumn("NumeroCommessa", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumeroCommessa); + this.columnnickComm = new global::System.Data.DataColumn("nickComm", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnnickComm); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidxFase}, true)); this.columnidxFase.AutoIncrement = true; @@ -3103,6 +3148,8 @@ namespace ETS_Data { this.columncodExt.ReadOnly = true; this.columncodExt.MaxLength = 50; this.columntotOre.ReadOnly = true; + this.columnnickComm.ReadOnly = true; + this.columnnickComm.MaxLength = 255; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -5280,6 +5327,54 @@ namespace ETS_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public int AnnoCommessa { + get { + try { + return ((int)(this[this.tableAnagCommFasi.AnnoCommessaColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'AnnoCommessa\' in table \'AnagCommFasi\' is DBNull.", e); + } + } + set { + this[this.tableAnagCommFasi.AnnoCommessaColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public int NumeroCommessa { + get { + try { + return ((int)(this[this.tableAnagCommFasi.NumeroCommessaColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'NumeroCommessa\' in table \'AnagCommFasi\' is DBNull.", e); + } + } + set { + this[this.tableAnagCommFasi.NumeroCommessaColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string nickComm { + get { + try { + return ((string)(this[this.tableAnagCommFasi.nickCommColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'nickComm\' in table \'AnagCommFasi\' is DBNull.", e); + } + } + set { + this[this.tableAnagCommFasi.nickCommColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsidxProgettoNull() { @@ -5423,6 +5518,42 @@ namespace ETS_Data { public void SettotOreNull() { this[this.tableAnagCommFasi.totOreColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsAnnoCommessaNull() { + return this.IsNull(this.tableAnagCommFasi.AnnoCommessaColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetAnnoCommessaNull() { + this[this.tableAnagCommFasi.AnnoCommessaColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsNumeroCommessaNull() { + return this.IsNull(this.tableAnagCommFasi.NumeroCommessaColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetNumeroCommessaNull() { + this[this.tableAnagCommFasi.NumeroCommessaColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsnickCommNull() { + return this.IsNull(this.tableAnagCommFasi.nickCommColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetnickCommNull() { + this[this.tableAnagCommFasi.nickCommColumn] = global::System.Convert.DBNull; + } } /// @@ -8450,6 +8581,9 @@ namespace ETS_Data.Ds_ProjEtsTableAdapters { tableMapping.ColumnMappings.Add("codClasse", "codClasse"); tableMapping.ColumnMappings.Add("codExt", "codExt"); tableMapping.ColumnMappings.Add("totOre", "totOre"); + tableMapping.ColumnMappings.Add("AnnoCommessa", "AnnoCommessa"); + tableMapping.ColumnMappings.Add("NumeroCommessa", "NumeroCommessa"); + tableMapping.ColumnMappings.Add("nickComm", "nickComm"); this._adapter.TableMappings.Add(tableMapping); } @@ -8469,7 +8603,7 @@ namespace ETS_Data.Ds_ProjEtsTableAdapters { this._commandCollection[0].CommandText = "dbo.stp_ACF_getByIdxProjStatus"; this._commandCollection[0].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[0].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[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxProgetto", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@searchText", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@showCommArch", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@showCommZeroH", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); @@ -8511,13 +8645,13 @@ namespace ETS_Data.Ds_ProjEtsTableAdapters { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] - public virtual int Fill(Ds_ProjEts.AnagCommFasiDataTable dataTable, global::System.Nullable idxProgetto, global::System.Nullable showCommArch, global::System.Nullable showCommZeroH) { + public virtual int Fill(Ds_ProjEts.AnagCommFasiDataTable dataTable, string searchText, global::System.Nullable showCommArch, global::System.Nullable showCommZeroH) { this.Adapter.SelectCommand = this.CommandCollection[0]; - if ((idxProgetto.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[1].Value = ((int)(idxProgetto.Value)); + if ((searchText == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(searchText)); } if ((showCommArch.HasValue == true)) { this.Adapter.SelectCommand.Parameters[2].Value = ((bool)(showCommArch.Value)); @@ -8542,13 +8676,13 @@ namespace ETS_Data.Ds_ProjEtsTableAdapters { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] - public virtual Ds_ProjEts.AnagCommFasiDataTable GetData(global::System.Nullable idxProgetto, global::System.Nullable showCommArch, global::System.Nullable showCommZeroH) { + public virtual Ds_ProjEts.AnagCommFasiDataTable GetData(string searchText, global::System.Nullable showCommArch, global::System.Nullable showCommZeroH) { this.Adapter.SelectCommand = this.CommandCollection[0]; - if ((idxProgetto.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[1].Value = ((int)(idxProgetto.Value)); + if ((searchText == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(searchText)); } if ((showCommArch.HasValue == true)) { this.Adapter.SelectCommand.Parameters[2].Value = ((bool)(showCommArch.Value)); diff --git a/ETS_Data/Ds_ProjEts.xsd b/ETS_Data/Ds_ProjEts.xsd index 985361c..8c8582c 100644 --- a/ETS_Data/Ds_ProjEts.xsd +++ b/ETS_Data/Ds_ProjEts.xsd @@ -593,13 +593,13 @@ - + dbo.stp_ACF_getByIdxProjStatus - + @@ -625,6 +625,9 @@ + + + @@ -1023,6 +1026,15 @@ + + + + + + + + + diff --git a/PROJ-ETS/PROJ-ETS/Commesse.aspx b/PROJ-ETS/PROJ-ETS/Commesse.aspx index 545d29e..33e9e5c 100644 --- a/PROJ-ETS/PROJ-ETS/Commesse.aspx +++ b/PROJ-ETS/PROJ-ETS/Commesse.aspx @@ -6,7 +6,8 @@
- + +
+ /// salvo ricerca + ///
+ /// + /// + protected void txtCerca_TextChanged(object sender, EventArgs e) + { + utils.obj.setSessionVal("valoreCercato", txtCerca.Text.Trim()); + } } } \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/Commesse.aspx.designer.cs b/PROJ-ETS/PROJ-ETS/Commesse.aspx.designer.cs index b2d2b86..3c368b8 100644 --- a/PROJ-ETS/PROJ-ETS/Commesse.aspx.designer.cs +++ b/PROJ-ETS/PROJ-ETS/Commesse.aspx.designer.cs @@ -13,13 +13,22 @@ namespace PROJ_ETS { public partial class Commesse { /// - /// filtroCli control. + /// lblCerca control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::PROJ_ETS.WebUserControls.mod_autocomplete filtroCli; + protected global::System.Web.UI.WebControls.Label lblCerca; + + /// + /// txtCerca control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtCerca; /// /// chkShowChiusi control. diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx index 9034d42..21eb659 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx @@ -18,8 +18,8 @@    - + @@ -114,7 +114,7 @@ Width="6em" Visible='<%# Bind("enableTime") %>'> / - + @@ -136,8 +136,8 @@   - + @@ -155,27 +155,12 @@ + SelectMethod="GetData" TypeName="ETS_Data.Ds_ProjEtsTableAdapters.AnagCommFasiTableAdapter" DeleteMethod="deleteQuery" UpdateMethod="updateQuery" OnUpdating="ods_Updating"> - - - - - - - - - - - - - - - + diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll index 9767112..b100958 100644 Binary files a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll and b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll differ diff --git a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll index b9d85d1..9f79437 100644 Binary files a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll differ