diff --git a/ETS_Data/Ds_ProjEts.Designer.cs b/ETS_Data/Ds_ProjEts.Designer.cs index d444e40..4d2b835 100644 --- a/ETS_Data/Ds_ProjEts.Designer.cs +++ b/ETS_Data/Ds_ProjEts.Designer.cs @@ -8604,6 +8604,7 @@ namespace ETS_Data.Ds_ProjEtsTableAdapters { 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("@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("@showFasi", 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("@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(); @@ -8645,7 +8646,7 @@ 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, string searchText, global::System.Nullable showCommArch, global::System.Nullable showCommZeroH) { + public virtual int Fill(Ds_ProjEts.AnagCommFasiDataTable dataTable, string searchText, global::System.Nullable showFasi, global::System.Nullable showCommArch, global::System.Nullable showCommZeroH) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((searchText == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; @@ -8653,18 +8654,24 @@ namespace ETS_Data.Ds_ProjEtsTableAdapters { else { this.Adapter.SelectCommand.Parameters[1].Value = ((string)(searchText)); } - if ((showCommArch.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[2].Value = ((bool)(showCommArch.Value)); + if ((showFasi.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((bool)(showFasi.Value)); } else { this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; } - if ((showCommZeroH.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[3].Value = ((bool)(showCommZeroH.Value)); + if ((showCommArch.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[3].Value = ((bool)(showCommArch.Value)); } else { this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; } + if ((showCommZeroH.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[4].Value = ((bool)(showCommZeroH.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -8676,7 +8683,7 @@ 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(string searchText, global::System.Nullable showCommArch, global::System.Nullable showCommZeroH) { + public virtual Ds_ProjEts.AnagCommFasiDataTable GetData(string searchText, global::System.Nullable showFasi, global::System.Nullable showCommArch, global::System.Nullable showCommZeroH) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((searchText == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; @@ -8684,18 +8691,24 @@ namespace ETS_Data.Ds_ProjEtsTableAdapters { else { this.Adapter.SelectCommand.Parameters[1].Value = ((string)(searchText)); } - if ((showCommArch.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[2].Value = ((bool)(showCommArch.Value)); + if ((showFasi.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((bool)(showFasi.Value)); } else { this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; } - if ((showCommZeroH.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[3].Value = ((bool)(showCommZeroH.Value)); + if ((showCommArch.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[3].Value = ((bool)(showCommArch.Value)); } else { this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; } + if ((showCommZeroH.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[4].Value = ((bool)(showCommZeroH.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; + } Ds_ProjEts.AnagCommFasiDataTable dataTable = new Ds_ProjEts.AnagCommFasiDataTable(); this.Adapter.Fill(dataTable); return dataTable; diff --git a/ETS_Data/Ds_ProjEts.xsd b/ETS_Data/Ds_ProjEts.xsd index 8c8582c..973a8f5 100644 --- a/ETS_Data/Ds_ProjEts.xsd +++ b/ETS_Data/Ds_ProjEts.xsd @@ -600,6 +600,7 @@ + @@ -688,7 +689,7 @@ - + @@ -731,7 +732,7 @@ - + @@ -781,7 +782,7 @@ - + @@ -869,7 +870,7 @@ - + @@ -913,7 +914,7 @@ - + @@ -958,7 +959,7 @@ - + @@ -1067,10 +1068,10 @@ - - - - + + + + \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/Commesse.aspx b/PROJ-ETS/PROJ-ETS/Commesse.aspx index 33e9e5c..030ff39 100644 --- a/PROJ-ETS/PROJ-ETS/Commesse.aspx +++ b/PROJ-ETS/PROJ-ETS/Commesse.aspx @@ -14,7 +14,10 @@ AutoPostBack="True" Checked="false" AccessKey="a" TextAlign="Left" />
- + +
+
+
diff --git a/PROJ-ETS/PROJ-ETS/Commesse.aspx.cs b/PROJ-ETS/PROJ-ETS/Commesse.aspx.cs index 72ae761..29766ce 100644 --- a/PROJ-ETS/PROJ-ETS/Commesse.aspx.cs +++ b/PROJ-ETS/PROJ-ETS/Commesse.aspx.cs @@ -51,6 +51,20 @@ namespace PROJ_ETS } } /// + /// determina se siano visibili le fasi delle commesse + /// + public bool showFasi + { + get + { + return utils.obj.BoolSessionObj("showFasi"); + } + set + { + utils.obj.setSessionVal("showFasi", value); + } + } + /// /// determina se mostrare commesse archiviate /// /// @@ -71,6 +85,16 @@ namespace PROJ_ETS mod_commesseFull1.doUpdate(); } /// + /// cambia impsotazione show/hide fasi... + /// + /// + /// + protected void chkShowFasi_CheckedChanged(object sender, EventArgs e) + { + showFasi = chkShowFasi.Checked; + mod_commesseFull1.doUpdate(); + } + /// /// salvo ricerca /// /// diff --git a/PROJ-ETS/PROJ-ETS/Commesse.aspx.designer.cs b/PROJ-ETS/PROJ-ETS/Commesse.aspx.designer.cs index 3c368b8..6c73e47 100644 --- a/PROJ-ETS/PROJ-ETS/Commesse.aspx.designer.cs +++ b/PROJ-ETS/PROJ-ETS/Commesse.aspx.designer.cs @@ -48,6 +48,15 @@ namespace PROJ_ETS { /// protected global::System.Web.UI.WebControls.CheckBox chkShowVuoti; + /// + /// chkShowFasi control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.CheckBox chkShowFasi; + /// /// mod_periodoAnalisi1 control. /// diff --git a/PROJ-ETS/PROJ-ETS/Progetti.aspx b/PROJ-ETS/PROJ-ETS/Progetti.aspx index 559ede3..78a1b78 100644 --- a/PROJ-ETS/PROJ-ETS/Progetti.aspx +++ b/PROJ-ETS/PROJ-ETS/Progetti.aspx @@ -11,7 +11,7 @@
- +
diff --git a/PROJ-ETS/PROJ-ETS/Progetti.aspx.cs b/PROJ-ETS/PROJ-ETS/Progetti.aspx.cs index 34f2432..23ee4f2 100644 --- a/PROJ-ETS/PROJ-ETS/Progetti.aspx.cs +++ b/PROJ-ETS/PROJ-ETS/Progetti.aspx.cs @@ -18,6 +18,7 @@ namespace PROJ_ETS utils.obj.setSessionVal("showCommZeroH", 1); utils.obj.emptySessionVal("idxCli_sel"); utils.obj.emptySessionVal("nomeCli_sel"); + utils.obj.emptySessionVal("valoreCercato"); } mod_progetti1.eh_selValore +=mod_progetti1_eh_selValore; mod_progetti1.eh_resetSelezione+=mod_progetti1_eh_resetSelezione; diff --git a/PROJ-ETS/PROJ-ETS/SpostaCommesse.aspx.cs b/PROJ-ETS/PROJ-ETS/SpostaCommesse.aspx.cs index b41a82d..abc1e83 100644 --- a/PROJ-ETS/PROJ-ETS/SpostaCommesse.aspx.cs +++ b/PROJ-ETS/PROJ-ETS/SpostaCommesse.aspx.cs @@ -16,6 +16,7 @@ namespace PROJ_ETS { utils.obj.setSessionVal("showCommArch", 1); utils.obj.setSessionVal("showCommZeroH", 1); + utils.obj.emptySessionVal("valoreCercato"); } } } diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx index 7a30c9b..29a95d3 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx @@ -25,7 +25,7 @@ - + @@ -83,41 +83,23 @@ - <%----%> - <%----%> - <%----%> - <%----%> - <%----%> - <%----%> @@ -156,7 +138,7 @@ CommandArgument='<%# Eval("idxFase") %>' OnClick="btnNew_Click" ToolTip="Aggiungi Fase a commessa" Visible='<%# isAncestor(Eval("idxFaseAncest")) %>' />   + ImageUrl="../images/elimina_m.png" ToolTip="Delete" Visible='<%# delEnabled(Eval("idxFase")) && showEdit %>' OnClientClick="return confirm('Confermi eliminazione record?')" />
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs index 47dfcd5..48eed5f 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs @@ -623,6 +623,10 @@ namespace PROJ_ETS.WebUserControls /// determina se mostrare lente di selezione in righe tabella /// public bool showSelect { get; set; } + /// + /// determina se mostrare edit in righe tabella + /// + public bool showEdit { get; set; } #endregion } diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx index 21eb659..2be4f69 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx @@ -161,6 +161,7 @@ + diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_spostaComm.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_spostaComm.ascx index d0a8d73..391eec2 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_spostaComm.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_spostaComm.ascx @@ -28,7 +28,7 @@ - +

Destinazione

@@ -47,7 +47,7 @@
- + diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll index b100958..4ce7540 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 9f79437..47845c8 100644 Binary files a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll differ