diff --git a/MP-TAB/WebUserControls/BaseUserControl.cs b/MP-TAB/WebUserControls/BaseUserControl.cs index ceff6a97..944b0a42 100644 --- a/MP-TAB/WebUserControls/BaseUserControl.cs +++ b/MP-TAB/WebUserControls/BaseUserControl.cs @@ -86,7 +86,6 @@ namespace MoonProTablet.WebUserControls /// public bool enableTabSetPzPallet = memLayer.ML.cdvb("enableTabSetPzPallet"); - #endregion Public Fields #region Public Events diff --git a/MP-TAB/WebUserControls/mod_elencoControlli.ascx b/MP-TAB/WebUserControls/mod_elencoControlli.ascx index 0ffea553..7062cad4 100644 --- a/MP-TAB/WebUserControls/mod_elencoControlli.ascx +++ b/MP-TAB/WebUserControls/mod_elencoControlli.ascx @@ -1,54 +1,59 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_elencoControlli.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_elencoControlli" %> <%@ Register Src="~/WebUserControls/mod_selPeriodo.ascx" TagPrefix="uc1" TagName="mod_selPeriodo" %> +<%@ Register Src="~/WebUserControls/cmp_selOdlOrd.ascx" TagPrefix="uc1" TagName="cmp_selOdlOrd" %> +
-
- - - - - -
-
-
- Art: - -
-
- ODL: - -
-
-
- - -
-
-
- -
-
- - - -
-
-
- Nota: +
+ + + + + + +
+
+
+ Art: + +
+
+ ODL: + +
+
+
+ + +
+
+
+ + +
+
+ + + +
+
+
+ Nota: -
-
- - - - - - - - - - - - -
+
+
+ + + + + + + + + + + + + +
diff --git a/MP-TAB/WebUserControls/mod_elencoControlli.ascx.designer.cs b/MP-TAB/WebUserControls/mod_elencoControlli.ascx.designer.cs index 3afa25d2..25b26e2e 100644 --- a/MP-TAB/WebUserControls/mod_elencoControlli.ascx.designer.cs +++ b/MP-TAB/WebUserControls/mod_elencoControlli.ascx.designer.cs @@ -7,11 +7,22 @@ // //------------------------------------------------------------------------------ -namespace MoonProTablet.WebUserControls { - - - public partial class mod_elencoControlli { - +namespace MoonProTablet.WebUserControls +{ + + + public partial class mod_elencoControlli + { + + /// + /// Controllo cmp_selOdlOrd. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MoonProTablet.WebUserControls.cmp_selOdlOrd cmp_selOdlOrd; + /// /// Controllo mod_selPeriodo. /// @@ -20,7 +31,7 @@ namespace MoonProTablet.WebUserControls { /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::MoonProTablet.WebUserControls.mod_selPeriodo mod_selPeriodo; - + /// /// Controllo grView. /// @@ -29,7 +40,7 @@ namespace MoonProTablet.WebUserControls { /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.GridView grView; - + /// /// Controllo ods. /// diff --git a/MP-TAB/WebUserControls/mod_elencoScarti.ascx.cs b/MP-TAB/WebUserControls/mod_elencoScarti.ascx.cs index 9684ef3f..2aad2f6f 100644 --- a/MP-TAB/WebUserControls/mod_elencoScarti.ascx.cs +++ b/MP-TAB/WebUserControls/mod_elencoScarti.ascx.cs @@ -1,4 +1,5 @@ -using System; +using SteamWare; +using System; using System.Collections.Generic; using System.Linq; using System.Web; @@ -11,7 +12,15 @@ namespace MoonProTablet.WebUserControls { protected void Page_Load(object sender, EventArgs e) { - + if(!Page.IsPostBack) + { + intervalloDate newIntervallo = new intervalloDate() + { + fine = DateTime.Today.AddDays(1), + inizio = DateTime.Today.AddDays(-7) + }; + mod_selPeriodo.intervalloAnalisi = newIntervallo; + } } public void doUpdate() diff --git a/MapoDb/DS_ProdTempi.xsd b/MapoDb/DS_ProdTempi.xsd index 94ada05e..380a3b8e 100644 --- a/MapoDb/DS_ProdTempi.xsd +++ b/MapoDb/DS_ProdTempi.xsd @@ -2078,6 +2078,7 @@ FROM v_RegistroControlli + diff --git a/MapoDb/DS_ProdTempi.xss b/MapoDb/DS_ProdTempi.xss index dbe2ef2b..7042ce4b 100644 --- a/MapoDb/DS_ProdTempi.xss +++ b/MapoDb/DS_ProdTempi.xss @@ -7,29 +7,29 @@ - - + + - + - - + + - + - + - - + + - - - + + + - + \ No newline at end of file diff --git a/MapoDb/DS_ProdTempi1.Designer.cs b/MapoDb/DS_ProdTempi1.Designer.cs index d2e46e90..2bea3808 100644 --- a/MapoDb/DS_ProdTempi1.Designer.cs +++ b/MapoDb/DS_ProdTempi1.Designer.cs @@ -27309,6 +27309,7 @@ FROM MappaStatoExpl"; this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[1].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[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxMacchina", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxODL", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataFrom", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataTo", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@showMulti", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -27358,7 +27359,7 @@ FROM MappaStatoExpl"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual DS_ProdTempi.RegistroControlliDataTable getFilt(string IdxMacchina, global::System.Nullable DataFrom, global::System.Nullable DataTo, global::System.Nullable showMulti) { + public virtual DS_ProdTempi.RegistroControlliDataTable getFilt(string IdxMacchina, global::System.Nullable IdxODL, global::System.Nullable DataFrom, global::System.Nullable DataTo, global::System.Nullable showMulti) { this.Adapter.SelectCommand = this.CommandCollection[1]; if ((IdxMacchina == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; @@ -27366,24 +27367,30 @@ FROM MappaStatoExpl"; else { this.Adapter.SelectCommand.Parameters[1].Value = ((string)(IdxMacchina)); } - if ((DataFrom.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[2].Value = ((System.DateTime)(DataFrom.Value)); + if ((IdxODL.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((int)(IdxODL.Value)); } else { this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; } - if ((DataTo.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[3].Value = ((System.DateTime)(DataTo.Value)); + if ((DataFrom.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[3].Value = ((System.DateTime)(DataFrom.Value)); } else { this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; } - if ((showMulti.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[4].Value = ((bool)(showMulti.Value)); + if ((DataTo.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[4].Value = ((System.DateTime)(DataTo.Value)); } else { this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; } + if ((showMulti.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[5].Value = ((bool)(showMulti.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[5].Value = global::System.DBNull.Value; + } DS_ProdTempi.RegistroControlliDataTable dataTable = new DS_ProdTempi.RegistroControlliDataTable(); this.Adapter.Fill(dataTable); return dataTable;