diff --git a/Projects/WebGIM/GIM_data/DS_utility.Designer.cs b/Projects/WebGIM/GIM_data/DS_utility.Designer.cs index 637091c..5ed84fc 100644 --- a/Projects/WebGIM/GIM_data/DS_utility.Designer.cs +++ b/Projects/WebGIM/GIM_data/DS_utility.Designer.cs @@ -4910,6 +4910,8 @@ namespace GIM_data { [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] public partial class v_mtzProgPendingExpDataTable : global::System.Data.TypedTableBase { + private global::System.Data.DataColumn columnidxPending; + private global::System.Data.DataColumn columncodImpianto; private global::System.Data.DataColumn columnnomeImpianto; @@ -4928,7 +4930,11 @@ namespace GIM_data { private global::System.Data.DataColumn columndescrTipo; - private global::System.Data.DataColumn columnidxPending; + private global::System.Data.DataColumn columnidxTipo; + + private global::System.Data.DataColumn columnidxMacchina; + + private global::System.Data.DataColumn columnidxImpianto; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public v_mtzProgPendingExpDataTable() { @@ -4960,6 +4966,13 @@ namespace GIM_data { this.InitVars(); } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public global::System.Data.DataColumn idxPendingColumn { + get { + return this.columnidxPending; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public global::System.Data.DataColumn codImpiantoColumn { get { @@ -5024,9 +5037,23 @@ namespace GIM_data { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public global::System.Data.DataColumn idxPendingColumn { + public global::System.Data.DataColumn idxTipoColumn { get { - return this.columnidxPending; + return this.columnidxTipo; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public global::System.Data.DataColumn idxMacchinaColumn { + get { + return this.columnidxMacchina; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public global::System.Data.DataColumn idxImpiantoColumn { + get { + return this.columnidxImpianto; } } @@ -5059,9 +5086,10 @@ namespace GIM_data { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public v_mtzProgPendingExpRow Addv_mtzProgPendingExpRow(string codImpianto, string nomeImpianto, string codMacchina, string nomeMacchina, System.DateTime data, string descrizione, string descrPriorita, bool isFermo, string descrTipo, int idxPending) { + public v_mtzProgPendingExpRow Addv_mtzProgPendingExpRow(int idxPending, string codImpianto, string nomeImpianto, string codMacchina, string nomeMacchina, System.DateTime data, string descrizione, string descrPriorita, bool isFermo, string descrTipo, int idxTipo, int idxMacchina, int idxImpianto) { v_mtzProgPendingExpRow rowv_mtzProgPendingExpRow = ((v_mtzProgPendingExpRow)(this.NewRow())); object[] columnValuesArray = new object[] { + idxPending, codImpianto, nomeImpianto, codMacchina, @@ -5071,18 +5099,14 @@ namespace GIM_data { descrPriorita, isFermo, descrTipo, - idxPending}; + idxTipo, + idxMacchina, + idxImpianto}; rowv_mtzProgPendingExpRow.ItemArray = columnValuesArray; this.Rows.Add(rowv_mtzProgPendingExpRow); return rowv_mtzProgPendingExpRow; } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public v_mtzProgPendingExpRow FindByidxPending(int idxPending) { - return ((v_mtzProgPendingExpRow)(this.Rows.Find(new object[] { - idxPending}))); - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public override global::System.Data.DataTable Clone() { v_mtzProgPendingExpDataTable cln = ((v_mtzProgPendingExpDataTable)(base.Clone())); @@ -5097,6 +5121,7 @@ namespace GIM_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] internal void InitVars() { + this.columnidxPending = base.Columns["idxPending"]; this.columncodImpianto = base.Columns["codImpianto"]; this.columnnomeImpianto = base.Columns["nomeImpianto"]; this.columncodMacchina = base.Columns["codMacchina"]; @@ -5106,11 +5131,15 @@ namespace GIM_data { this.columndescrPriorita = base.Columns["descrPriorita"]; this.columnisFermo = base.Columns["isFermo"]; this.columndescrTipo = base.Columns["descrTipo"]; - this.columnidxPending = base.Columns["idxPending"]; + this.columnidxTipo = base.Columns["idxTipo"]; + this.columnidxMacchina = base.Columns["idxMacchina"]; + this.columnidxImpianto = base.Columns["idxImpianto"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] private void InitClass() { + this.columnidxPending = new global::System.Data.DataColumn("idxPending", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnidxPending); this.columncodImpianto = new global::System.Data.DataColumn("codImpianto", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columncodImpianto); this.columnnomeImpianto = new global::System.Data.DataColumn("nomeImpianto", typeof(string), null, global::System.Data.MappingType.Element); @@ -5129,19 +5158,22 @@ namespace GIM_data { base.Columns.Add(this.columnisFermo); this.columndescrTipo = new global::System.Data.DataColumn("descrTipo", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columndescrTipo); - this.columnidxPending = new global::System.Data.DataColumn("idxPending", typeof(int), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnidxPending); - this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { - this.columnidxPending}, true)); + this.columnidxTipo = new global::System.Data.DataColumn("idxTipo", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnidxTipo); + this.columnidxMacchina = new global::System.Data.DataColumn("idxMacchina", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnidxMacchina); + this.columnidxImpianto = new global::System.Data.DataColumn("idxImpianto", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnidxImpianto); + this.columnidxPending.AllowDBNull = false; this.columncodImpianto.MaxLength = 50; this.columnnomeImpianto.MaxLength = 50; this.columncodMacchina.MaxLength = 50; - this.columnnomeMacchina.MaxLength = 50; + this.columnnomeMacchina.MaxLength = 250; this.columndescrizione.MaxLength = 500; this.columndescrPriorita.MaxLength = 50; this.columndescrTipo.MaxLength = 50; - this.columnidxPending.AllowDBNull = false; - this.columnidxPending.Unique = true; + this.columnidxTipo.AllowDBNull = false; + this.columnidxMacchina.AllowDBNull = false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -6695,6 +6727,16 @@ namespace GIM_data { this.tablev_mtzProgPendingExp = ((v_mtzProgPendingExpDataTable)(this.Table)); } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public int idxPending { + get { + return ((int)(this[this.tablev_mtzProgPendingExp.idxPendingColumn])); + } + set { + this[this.tablev_mtzProgPendingExp.idxPendingColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string codImpianto { get { @@ -6831,12 +6873,37 @@ namespace GIM_data { } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public int idxPending { + public int idxTipo { get { - return ((int)(this[this.tablev_mtzProgPendingExp.idxPendingColumn])); + return ((int)(this[this.tablev_mtzProgPendingExp.idxTipoColumn])); } set { - this[this.tablev_mtzProgPendingExp.idxPendingColumn] = value; + this[this.tablev_mtzProgPendingExp.idxTipoColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public int idxMacchina { + get { + return ((int)(this[this.tablev_mtzProgPendingExp.idxMacchinaColumn])); + } + set { + this[this.tablev_mtzProgPendingExp.idxMacchinaColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public int idxImpianto { + get { + try { + return ((int)(this[this.tablev_mtzProgPendingExp.idxImpiantoColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'idxImpianto\' in table \'v_mtzProgPendingExp\' is DBNull.", e); + } + } + set { + this[this.tablev_mtzProgPendingExp.idxImpiantoColumn] = value; } } @@ -6929,6 +6996,16 @@ namespace GIM_data { public void SetdescrTipoNull() { this[this.tablev_mtzProgPendingExp.descrTipoColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public bool IsidxImpiantoNull() { + return this.IsNull(this.tablev_mtzProgPendingExp.idxImpiantoColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public void SetidxImpiantoNull() { + this[this.tablev_mtzProgPendingExp.idxImpiantoColumn] = global::System.Convert.DBNull; + } } /// @@ -9695,6 +9772,7 @@ namespace GIM_data.DS_utilityTableAdapters { global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); tableMapping.SourceTable = "Table"; tableMapping.DataSetTable = "v_mtzProgPendingExp"; + tableMapping.ColumnMappings.Add("idxPending", "idxPending"); tableMapping.ColumnMappings.Add("codImpianto", "codImpianto"); tableMapping.ColumnMappings.Add("nomeImpianto", "nomeImpianto"); tableMapping.ColumnMappings.Add("codMacchina", "codMacchina"); @@ -9704,7 +9782,9 @@ namespace GIM_data.DS_utilityTableAdapters { tableMapping.ColumnMappings.Add("descrPriorita", "descrPriorita"); tableMapping.ColumnMappings.Add("isFermo", "isFermo"); tableMapping.ColumnMappings.Add("descrTipo", "descrTipo"); - tableMapping.ColumnMappings.Add("idxPending", "idxPending"); + tableMapping.ColumnMappings.Add("idxTipo", "idxTipo"); + tableMapping.ColumnMappings.Add("idxMacchina", "idxMacchina"); + tableMapping.ColumnMappings.Add("idxImpianto", "idxImpianto"); this._adapter.TableMappings.Add(tableMapping); } @@ -9719,9 +9799,9 @@ namespace GIM_data.DS_utilityTableAdapters { this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT codImpianto, nomeImpianto, codMacchina, nomeMacchina, data, descrizion" + - "e, descrPriorita, isFermo, descrTipo, idxPending\r\nFROM v_mtzProgPendingE" + - "xp\r\nORDER BY data"; + this._commandCollection[0].CommandText = "SELECT idxPending, codImpianto, nomeImpianto, codMacchina, nomeMacchina, data, de" + + "scrizione, descrPriorita, isFermo, descrTipo, idxTipo, idxMacchina, idxImpianto " + + "FROM dbo.v_mtzProgPendingExp"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; diff --git a/Projects/WebGIM/GIM_data/DS_utility.xsc b/Projects/WebGIM/GIM_data/DS_utility.xsc index 5f28270..551fc56 100644 --- a/Projects/WebGIM/GIM_data/DS_utility.xsc +++ b/Projects/WebGIM/GIM_data/DS_utility.xsc @@ -1 +1,9 @@ - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/Projects/WebGIM/GIM_data/DS_utility.xsd b/Projects/WebGIM/GIM_data/DS_utility.xsd index 818ce3a..ba9a9e4 100644 --- a/Projects/WebGIM/GIM_data/DS_utility.xsd +++ b/Projects/WebGIM/GIM_data/DS_utility.xsd @@ -4,7 +4,7 @@ - + @@ -386,16 +386,15 @@ WHERE (conditio = @conditio) - - SELECT codImpianto, nomeImpianto, codMacchina, nomeMacchina, data, descrizione, descrPriorita, isFermo, descrTipo, idxPending -FROM v_mtzProgPendingExp -ORDER BY data + + SELECT idxPending, codImpianto, nomeImpianto, codMacchina, nomeMacchina, data, descrizione, descrPriorita, isFermo, descrTipo, idxTipo, idxMacchina, idxImpianto FROM dbo.v_mtzProgPendingExp + @@ -405,7 +404,9 @@ ORDER BY data - + + + @@ -431,8 +432,8 @@ ORDER BY data - - + + @@ -445,23 +446,23 @@ ORDER BY data - - + + - + - - + + @@ -474,8 +475,8 @@ ORDER BY data - - + + @@ -486,75 +487,6 @@ ORDER BY data - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -565,198 +497,11 @@ ORDER BY data + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -770,29 +515,150 @@ ORDER BY data - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -815,12 +681,148 @@ ORDER BY data + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -844,7 +846,9 @@ ORDER BY data - + + + @@ -899,9 +903,5 @@ ORDER BY data - - - - \ No newline at end of file diff --git a/Projects/WebGIM/GIM_data/DS_utility.xss b/Projects/WebGIM/GIM_data/DS_utility.xss index 8891e4a..bb4d9dd 100644 --- a/Projects/WebGIM/GIM_data/DS_utility.xss +++ b/Projects/WebGIM/GIM_data/DS_utility.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -21,7 +21,7 @@ - + \ No newline at end of file diff --git a/Projects/WebGIM/GIM_data/bin/GIM_data.dll b/Projects/WebGIM/GIM_data/bin/GIM_data.dll index b26744f..c604eee 100644 Binary files a/Projects/WebGIM/GIM_data/bin/GIM_data.dll and b/Projects/WebGIM/GIM_data/bin/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_data/bin/SteamWare.dll b/Projects/WebGIM/GIM_data/bin/SteamWare.dll index 06f64a3..7da3b75 100644 Binary files a/Projects/WebGIM/GIM_data/bin/SteamWare.dll and b/Projects/WebGIM/GIM_data/bin/SteamWare.dll differ diff --git a/Projects/WebGIM/GIM_site/ExcelExportMtzPrevPending.aspx b/Projects/WebGIM/GIM_site/ExcelExportMtzPrevPending.aspx index 5fb2d28..d06cda0 100644 --- a/Projects/WebGIM/GIM_site/ExcelExportMtzPrevPending.aspx +++ b/Projects/WebGIM/GIM_site/ExcelExportMtzPrevPending.aspx @@ -37,6 +37,10 @@ OldValuesParameterFormatString="original_{0}" FilterExpression=" (codImpianto LIKE '%{0}%') OR (nomeImpianto LIKE '%{0}%') OR (codMacchina LIKE '%{0}%') OR (nomeMacchina LIKE '%{0}%') OR (descrizione LIKE '%{0}%') OR (descrPriorita LIKE '%{0}%') OR (descrTipo LIKE '%{0}%') "> + + diff --git a/Projects/WebGIM/GIM_site/ExcelExportMtzPrevPending.aspx.cs b/Projects/WebGIM/GIM_site/ExcelExportMtzPrevPending.aspx.cs index 899d4ad..7cd9a5d 100644 --- a/Projects/WebGIM/GIM_site/ExcelExportMtzPrevPending.aspx.cs +++ b/Projects/WebGIM/GIM_site/ExcelExportMtzPrevPending.aspx.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -using SteamWare; using System.Web.UI.HtmlControls; +using SteamWare; public partial class ExcelExportMtzPrevPending : System.Web.UI.Page { @@ -83,7 +83,25 @@ public partial class ExcelExportMtzPrevPending : System.Web.UI.Page public void aggiornamento() { grView.AllowPaging = false; + checkFixOds(); ods.DataBind(); + grView.DataBind(); + } + + /// + /// sistemo filtraggio con valori selezionati + /// + private void checkFixOds() + { + ods.FilterExpression = "( (codImpianto LIKE '%{0}%') OR (nomeImpianto LIKE '%{0}%') OR (codMacchina LIKE '%{0}%') OR (nomeMacchina LIKE '%{0}%') OR (descrizione LIKE '%{0}%') OR (descrPriorita LIKE '%{0}%') OR (descrTipo LIKE '%{0}%') )"; + if (memLayer.ML.isInSessionObject("idxTipo_filt")) + { + ods.FilterExpression += " AND (idxTipo = {1})"; + } + if (memLayer.ML.isInSessionObject("idxMacchina_filt")) + { + ods.FilterExpression += " AND (idxMacchina = {2})"; + } } diff --git a/Projects/WebGIM/GIM_site/GIM_site.csproj b/Projects/WebGIM/GIM_site/GIM_site.csproj index 377acde..2343b70 100644 --- a/Projects/WebGIM/GIM_site/GIM_site.csproj +++ b/Projects/WebGIM/GIM_site/GIM_site.csproj @@ -466,6 +466,13 @@ mod_famiglieMacchine.ascx + + mod_filtraMtzProg.ascx + ASPXCodeBehind + + + mod_filtraMtzProg.ascx + mod_filtro.ascx ASPXCodeBehind @@ -963,6 +970,7 @@ + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx index 1b695cd..b2c75c3 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx @@ -1,19 +1,28 @@ <%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_dettMtzProg" Codebehind="mod_dettMtzProg.ascx.cs" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> - +<%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %> +
@@ -22,7 +31,11 @@
- + +
+
+ +

+ DataValueField="value" CssClass="textEv_1" OnDataBound="ddlPrior_DataBound" /> diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx.cs index bba4203..e90b1ed 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx.cs @@ -86,4 +86,47 @@ public partial class mod_dettMtzProg : System.Web.UI.UserControl { ddlPrior.SelectedIndex = 2; } + + protected override void OnInit(EventArgs e) + { + base.OnInit(e); + if (!Page.IsPostBack) + { + mod_filtroImpianto.ods = odsImpianti; + } + } + + /// + /// chiamato post modifica valore check/selezione nel selettore filtro impianto + /// + /// + /// + public void eh_selectedImpianto(object sender, EventArgs e) + { + checkFixOds(); + } + + private void checkFixOds() + { + if (mod_filtroImpianto.valoreInt != 0) + { + // resetto la selezione... + listMacchine.SelectedIndex = -1; + // cambio filtro su ods macchine mostrate... + if (mod_filtroImpianto.valoreInt > 0) + { + odsMacchine.FilterExpression = "(label LIKE '%{0}%') AND conditio = " + mod_filtroImpianto.valore; + odsMacchine.DataBind(); + } + } + else + { + odsMacchine.FilterExpression = "(label LIKE '%{0}%')"; + odsMacchine.DataBind(); + } + } + protected void txtCercaMacchine_TextChanged(object sender, EventArgs e) + { + checkFixOds(); + } } diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx.designer.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx.designer.cs index 3ab7f2c..31be36d 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx.designer.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettMtzProg.ascx.designer.cs @@ -21,6 +21,24 @@ public partial class mod_dettMtzProg { /// protected global::System.Web.UI.WebControls.Label lblInsNewIntPro; + /// + /// mod_filtroImpianto control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_filtro mod_filtroImpianto; + + /// + /// odsImpianti control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsImpianti; + /// /// lblDescrMtzPro control. /// @@ -57,6 +75,15 @@ public partial class mod_dettMtzProg { /// protected global::System.Web.UI.WebControls.Label lblMacchineInteressate; + /// + /// lblTxtCerca control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblTxtCerca; + /// /// txtCercaMacchine control. /// diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx index c4aba56..ef0690f 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx @@ -3,42 +3,6 @@ <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> <%@ Register Src="~/WebUserControls/mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %>
-
+

+
+
+ + + +

+ CssClass="textEv_1Left" />
- - - - -
-
- -
-
- - - -
- 		-
- -
-
- - - -
-
- - - - - - -
-
@@ -110,10 +74,13 @@ DeleteMethod="Delete" InsertMethod="Insert" UpdateMethod="Update"> - + + + <%-- + PropertyName="valoreInt" Type="Int32" />--%> diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx.cs index a775f98..771d34b 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx.cs @@ -24,8 +24,8 @@ public partial class mod_elencoMtzProg : ApplicationUserControl { base.traduciObj(); btnShowNew.Text = traduci("btnShowNew"); - lblFiltMacchina.Text = traduci("lblFiltMacchina"); - lblFiltTipo.Text = traduci("lblFiltTipo"); + //lblFiltMacchina.Text = traduci("lblFiltMacchina"); + //lblFiltTipo.Text = traduci("lblFiltTipo"); } /// @@ -54,6 +54,7 @@ public partial class mod_elencoMtzProg : ApplicationUserControl /// public void doUpdate() { + checkFixOds(); grView.DataBind(); } /// @@ -205,14 +206,6 @@ public partial class mod_elencoMtzProg : ApplicationUserControl { base.OnInit(e); _idxGridView = "idxIntPro"; - if (!Page.IsPostBack) - { - mod_filtroImpianto.ods = odsImpianti; - mod_filtroMacchina.ods = odsMacchine; - mod_filtroTipo.ods = odsTipo; - } - mod_filtroTipo.eh_selValore += new EventHandler(mod_filtroTipo_eh_selValore); - mod_filtroMacchina.eh_selValore += new EventHandler(mod_filtroMacchina_eh_selValore); } void mod_filtroMacchina_eh_selValore(object sender, EventArgs e) @@ -231,39 +224,14 @@ public partial class mod_elencoMtzProg : ApplicationUserControl private void checkFixOds() { ods.FilterExpression = "( codMacchina LIKE '%{0}%' OR nomeMacchina LIKE '%{0}%' OR descrizione LIKE '%{0}%' )"; - if (mod_filtroTipo.valoreInt != 0) + if (memLayer.ML.isInSessionObject("idxTipo_filt")) { ods.FilterExpression += " AND (idxTipo = {1})"; } - if (mod_filtroMacchina.valoreInt != 0) + if (memLayer.ML.isInSessionObject("idxMacchina_filt")) { ods.FilterExpression += " AND (idxMacchina = {2})"; } ods.DataBind(); } - /// - /// chiamato post modifica valore check/selezione nel selettore filtro impianto - /// - /// - /// - public void eh_selectedImpianto(object sender, EventArgs e) - { - if (mod_filtroImpianto.valoreInt != 0) - { - if (!mod_filtroMacchina.Visible) - { - mod_filtroMacchina.Visible = true; - } - else - { - mod_filtroMacchina.reset(); - } - mod_filtroMacchina.ods = odsMacchine; - } - else - { - mod_filtroMacchina.reset(); - mod_filtroMacchina.Visible = false; - } - } } diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx.designer.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx.designer.cs index 3f3ec30..ec1cf4b 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx.designer.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx.designer.cs @@ -12,78 +12,6 @@ public partial class mod_elencoMtzProg { - /// - /// lblFiltTipo control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblFiltTipo; - - /// - /// mod_filtroTipo control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::mod_filtro mod_filtroTipo; - - /// - /// odsTipo control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ObjectDataSource odsTipo; - - /// - /// lblFiltMacchina control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblFiltMacchina; - - /// - /// mod_filtroImpianto control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::mod_filtro mod_filtroImpianto; - - /// - /// odsImpianti control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ObjectDataSource odsImpianti; - - /// - /// mod_filtroMacchina control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::mod_filtro mod_filtroMacchina; - - /// - /// odsMacchine control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ObjectDataSource odsMacchine; - /// /// btnShowNew control. /// diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx index ac4fb1c..f9d3a2e 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx @@ -1,7 +1,8 @@ <%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_elencoRichieste" Codebehind="mod_elencoRichieste.ascx.cs" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> -<%@ Register Src="~/WebUserControls/mod_periodoAnalisi.ascx" TagName="mod_periodoAnalisi" TagPrefix="uc1" %> +<%@ Register Src="~/WebUserControls/mod_periodoAnalisi.ascx" TagName="mod_periodoAnalisi" + TagPrefix="uc1" %>
+ DataKeyNames="numIntMtz" DataSourceID="ods" OnRowDataBound="grView_RowDataBound" + OnPageIndexChanged="grView_PageIndexChanged"> @@ -57,7 +57,7 @@ - + @@ -66,17 +66,29 @@ - + + + + + + + + + + + + + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs index 2481e33..31081e2 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs @@ -274,7 +274,7 @@ public partial class mod_elencoRichieste : ApplicationUserControl /// public string formattaUrl(object idx) { - return String.Format("./ExportPdf.aspx?tipo={0}&idx={1}", Convert.ToInt32(reportRichiesto.RichiestaIntervento), idx); + return String.Format("./ExportPdf.aspx?tipo={0}&idx={1}", Convert.ToInt32(reportRichiesto.RichiestaIntervento), idx); // !!! verificare se . o ~ } /// /// prende in carico e stampa la scheda selezionata @@ -370,5 +370,23 @@ public partial class mod_elencoRichieste : ApplicationUserControl { checkFixOds(); } + /// + /// determina se sia o meno un intervento di mtz programmata + /// + /// + /// + public bool isMtzProg(object _idxAmbitoGuasto) + { + bool answ = false; + try + { + int idxAmbito = Convert.ToInt32(_idxAmbitoGuasto); + if (idxAmbito == 7) answ = true; + } + catch + { } + return answ; + } + #endregion } diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx new file mode 100644 index 0000000..884f64a --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx @@ -0,0 +1,40 @@ +<%@ Control Language="C#" AutoEventWireup="true" Inherits="WebUserControls_mod_filtraMtzProg" Codebehind="mod_filtraMtzProg.ascx.cs" %> +<%@ Register src="mod_filtro.ascx" tagname="mod_filtro" tagprefix="uc1" %> +
+ + + + + +
+
+ +
+
+ + + +
+ 		+
+ +
+
+ + + +
+
+ + + + + + +
+
+
\ No newline at end of file diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx.cs new file mode 100644 index 0000000..1a0b3ff --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx.cs @@ -0,0 +1,111 @@ +using System; +using System.Collections.Generic; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using SteamWare; + +public partial class WebUserControls_mod_filtraMtzProg : ApplicationUserControl +{ + /// + /// evento che segnala la disponibilità di un nuovo stato di filtraggio salvato in sessione... + /// + public event EventHandler eh_newFiltroSel; + + // variabile per gridview - potrebbe non servire più FARE!!! + protected string _idxGridView; + + /// + /// inizializzazione valori di default + /// + /// + protected override void OnInit(EventArgs e) + { + base.OnInit(e); + _idxGridView = "idxIntPro"; + if (!Page.IsPostBack) + { + mod_filtroImpianto.ods = odsImpianti; + mod_filtroMacchina.ods = odsMacchine; + mod_filtroTipo.ods = odsTipo; + } + mod_filtroTipo.eh_selValore += new EventHandler(mod_filtroTipo_eh_selValore); + mod_filtroMacchina.eh_selValore += new EventHandler(mod_filtroMacchina_eh_selValore); + mod_filtroImpianto.eh_selValore += new EventHandler(mod_filtroImpianto_eh_selValore); + } + + void mod_filtroImpianto_eh_selValore(object sender, EventArgs e) + { + // salvo in sessione il valore selezionato... + if (mod_filtroImpianto.valoreInt == 0) + { + memLayer.ML.emptySessionVal("idxMacchina_filt"); + } + // chiamo procedura che innalza l'evento + raiseEvent(); + } + + /// + /// chiamato post modifica valore check/selezione nel selettore filtro impianto + /// + /// + /// + public void eh_selectedImpianto(object sender, EventArgs e) + { + if (mod_filtroImpianto.valoreInt != 0) + { + if (!mod_filtroMacchina.Visible) + { + mod_filtroMacchina.Visible = true; + } + else + { + mod_filtroMacchina.reset(); + } + mod_filtroMacchina.ods = odsMacchine; + } + else + { + mod_filtroMacchina.reset(); + mod_filtroMacchina.Visible = false; + } + } + + void mod_filtroMacchina_eh_selValore(object sender, EventArgs e) + { + // salvo in sessione il valore selezionato... + if (mod_filtroMacchina.valoreInt != 0) + { + memLayer.ML.setSessionVal("idxMacchina_filt", mod_filtroMacchina.valoreInt); + } + else + { + memLayer.ML.emptySessionVal("idxMacchina_filt"); + } + // chiamo procedura che innalza l'evento + raiseEvent(); + } + void mod_filtroTipo_eh_selValore(object sender, EventArgs e) + { + // salvo in sessione il valore selezionato... + if (mod_filtroTipo.valoreInt != 0) + { + memLayer.ML.setSessionVal("idxTipo_filt", mod_filtroTipo.valoreInt); + } + else + { + memLayer.ML.emptySessionVal("idxTipo_filt"); + } + // chiamo procedura che innalza l'evento + raiseEvent(); + } + + private void raiseEvent() + { + if (eh_newFiltroSel != null) + { + eh_newFiltroSel(this, new EventArgs()); + } + } + +} diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx.designer.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx.designer.cs new file mode 100644 index 0000000..53de72d --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx.designer.cs @@ -0,0 +1,86 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.4927 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + + + +public partial class WebUserControls_mod_filtraMtzProg { + + /// + /// lblFiltTipo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblFiltTipo; + + /// + /// mod_filtroTipo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_filtro mod_filtroTipo; + + /// + /// odsTipo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsTipo; + + /// + /// lblFiltMacchina control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblFiltMacchina; + + /// + /// mod_filtroImpianto control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_filtro mod_filtroImpianto; + + /// + /// odsImpianti control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsImpianti; + + /// + /// mod_filtroMacchina control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_filtro mod_filtroMacchina; + + /// + /// odsMacchine control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsMacchine; +} diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_menuTop.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_menuTop.ascx.cs index 95ff71b..b1d7fa1 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_menuTop.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_menuTop.ascx.cs @@ -94,7 +94,7 @@ public partial class mod_menuTop : ApplicationUserControl // solo se user è auth... if (user_std.UtSn.isAuth) { - lnkShowHide.Text = user_std.UtSn.Traduci(SteamWare.memLayer.ML.confReadString("lnkShowHide")); + lnkShowHide.Text = user_std.UtSn.Traduci("lnkShowHide"); lblTitle.Text = user_std.UtSn.Traduci(SteamWare.memLayer.ML.confReadString("titleApp")); if (_titleString != "") { diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx index b3c9999..abe56ec 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx @@ -4,7 +4,7 @@
-
+
@@ -36,6 +36,10 @@ OldValuesParameterFormatString="original_{0}" FilterExpression=" (codImpianto LIKE '%{0}%') OR (nomeImpianto LIKE '%{0}%') OR (codMacchina LIKE '%{0}%') OR (nomeMacchina LIKE '%{0}%') OR (descrizione LIKE '%{0}%') OR (descrPriorita LIKE '%{0}%') OR (descrTipo LIKE '%{0}%') "> + +
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx.cs index db6180d..f3b1429 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx.cs @@ -7,6 +7,7 @@ using SteamWare; public partial class mod_mtzPrevPending : ApplicationUserControl { + public event EventHandler eh_resetSelezione; /// /// evento dati associati a controllo /// @@ -42,8 +43,7 @@ public partial class mod_mtzPrevPending : ApplicationUserControl if (!Page.IsPostBack) { hlExportExcel.Text = traduci("hlExportExcel"); - hlExportExcel.NavigateUrl = "./ExcelExportMtzPrevPending.aspx"; - // vedo di rigenerare la coda... + hlExportExcel.NavigateUrl = "~/ExcelExportMtzPrevPending.aspx"; // verifico se devo generare degli interventi di MTZ programmata.. try { @@ -55,4 +55,30 @@ public partial class mod_mtzPrevPending : ApplicationUserControl } } } + + /// + /// aggiorno il controllo + /// + public void doUpdate() + { + checkFixOds(); + //grView.DataBind(); + } + + /// + /// sistemo filtraggio con valori selezionati + /// + private void checkFixOds() + { + ods.FilterExpression = "( codMacchina LIKE '%{0}%' OR nomeMacchina LIKE '%{0}%' OR descrizione LIKE '%{0}%' )"; + if (memLayer.ML.isInSessionObject("idxTipo_filt")) + { + ods.FilterExpression += " AND (idxTipo = {1})"; + } + if (memLayer.ML.isInSessionObject("idxMacchina_filt")) + { + ods.FilterExpression += " AND (idxMacchina = {2})"; + } + ods.DataBind(); + } } \ No newline at end of file diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.cs index 358d405..d2bb20a 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.cs @@ -55,7 +55,7 @@ public partial class mod_reportInterventi : System.Web.UI.UserControl } private string formattaUrl(reportRichiesto tipo, intervalloDate periodo) { - return String.Format("./ExportPdf.aspx?tipo={0}&inizio={1}&fine={2}&username={3}", Convert.ToInt32(tipo), periodo.inizio, periodo.fine, user_std.UtSn.userNameAD); + return String.Format("./ExportPdf.aspx?tipo={0}&inizio={1}&fine={2}&username={3}", Convert.ToInt32(tipo), periodo.inizio, periodo.fine, user_std.UtSn.userNameAD); // !!! verificare se . o ~ } #region gestione selettori valori multipli diff --git a/Projects/WebGIM/GIM_site/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/bin/GIM_data.dll index b26744f..c604eee 100644 Binary files a/Projects/WebGIM/GIM_site/bin/GIM_data.dll and b/Projects/WebGIM/GIM_site/bin/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_site/bin/GIM_site.dll b/Projects/WebGIM/GIM_site/bin/GIM_site.dll index fc438a1..6a39559 100644 Binary files a/Projects/WebGIM/GIM_site/bin/GIM_site.dll and b/Projects/WebGIM/GIM_site/bin/GIM_site.dll differ diff --git a/Projects/WebGIM/GIM_site/bin/SteamWare.dll b/Projects/WebGIM/GIM_site/bin/SteamWare.dll index 06f64a3..7da3b75 100644 Binary files a/Projects/WebGIM/GIM_site/bin/SteamWare.dll and b/Projects/WebGIM/GIM_site/bin/SteamWare.dll differ diff --git a/Projects/WebGIM/GIM_site/mtzProg.aspx b/Projects/WebGIM/GIM_site/mtzProg.aspx index 083c14a..73da806 100644 --- a/Projects/WebGIM/GIM_site/mtzProg.aspx +++ b/Projects/WebGIM/GIM_site/mtzProg.aspx @@ -5,7 +5,9 @@ <%@ Register Src="~/WebUserControls/mod_dettMtzProg.ascx" TagName="mod_dettMtzProg" TagPrefix="uc2" %> <%@ Register Src="~/WebUserControls/mod_fixCal.ascx" TagName="mod_fixCal" TagPrefix="uc3" %> <%@ Register Src="~/WebUserControls/mod_mtzPrevPending.ascx" tagname="mod_mtzPrevPending" tagprefix="uc4" %> +<%@ Register src="~/WebUserControls/mod_filtraMtzProg.ascx" tagname="mod_filtraMtzProg" tagprefix="uc5" %> + diff --git a/Projects/WebGIM/GIM_site/mtzProg.aspx.cs b/Projects/WebGIM/GIM_site/mtzProg.aspx.cs index 9f14e5e..7cdde8e 100644 --- a/Projects/WebGIM/GIM_site/mtzProg.aspx.cs +++ b/Projects/WebGIM/GIM_site/mtzProg.aspx.cs @@ -11,9 +11,26 @@ public partial class mtzProg : System.Web.UI.Page { mod_elencoMtzProg1.eh_newReq += new EventHandler(mod_elencoMtzProg1_eh_newReq); mod_dettMtzProg1.eh_newInserted += new EventHandler(mod_dettMtzProg1_eh_newInserted); + mod_filtraMtzProg1.eh_newFiltroSel += new EventHandler(mod_filtraMtzProg1_eh_newFiltroSel); traduciObj(); } + /// + /// è stato chiamato evento "nuovo filtro" e quindi aggiorno + /// + /// + /// + void mod_filtraMtzProg1_eh_newFiltroSel(object sender, EventArgs e) + { + // richiamo update delle varie parti del mio modulo + + // update della visualizzazione normale + mod_elencoMtzProg1.doUpdate(); + + // update della visualizzazione pre-export in excel + mod_mtzPrevPending1.doUpdate(); + } + private void traduciObj() { ((AjaxControlToolkit.TabPanel)TabContainer1.FindControl("TabProgrammaMtz")).HeaderText = traduci("TabProgrammaMtz"); diff --git a/Projects/WebGIM/GIM_site/mtzProg.aspx.designer.cs b/Projects/WebGIM/GIM_site/mtzProg.aspx.designer.cs index 4212c7a..99ffb06 100644 --- a/Projects/WebGIM/GIM_site/mtzProg.aspx.designer.cs +++ b/Projects/WebGIM/GIM_site/mtzProg.aspx.designer.cs @@ -12,6 +12,15 @@ public partial class mtzProg { + /// + /// mod_filtraMtzProg1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::WebUserControls_mod_filtraMtzProg mod_filtraMtzProg1; + /// /// TabContainer1 control. /// diff --git a/Projects/WebGIM/GIM_site/obj/Debug/GIM_site.csproj.FileListAbsolute.txt b/Projects/WebGIM/GIM_site/obj/Debug/GIM_site.csproj.FileListAbsolute.txt index b296d26..f251c45 100644 --- a/Projects/WebGIM/GIM_site/obj/Debug/GIM_site.csproj.FileListAbsolute.txt +++ b/Projects/WebGIM/GIM_site/obj/Debug/GIM_site.csproj.FileListAbsolute.txt @@ -1,6 +1,3 @@ -c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\obj\Debug\ResolveAssemblyReference.cache -c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\obj\Debug\RdlCompile.cache -c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\obj\Debug\RdlCompile.compiled c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\GIM_site.dll c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\GIM_site.pdb c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\AjaxControlToolkit.dll @@ -29,5 +26,8 @@ c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\ru\Aj c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\tr-TR\AjaxControlToolkit.resources.dll c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\zh-CHS\AjaxControlToolkit.resources.dll c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\zh-CHT\AjaxControlToolkit.resources.dll +c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\obj\Debug\ResolveAssemblyReference.cache +c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\obj\Debug\RdlCompile.cache +c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\obj\Debug\RdlCompile.compiled c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\obj\Debug\GIM_site.dll c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\obj\Debug\GIM_site.pdb diff --git a/Projects/WebGIM/GIM_site/obj/Debug/GIM_site.dll b/Projects/WebGIM/GIM_site/obj/Debug/GIM_site.dll index fc438a1..6a39559 100644 Binary files a/Projects/WebGIM/GIM_site/obj/Debug/GIM_site.dll and b/Projects/WebGIM/GIM_site/obj/Debug/GIM_site.dll differ diff --git a/Projects/WebGIM/GIM_site/obj/Debug/ResolveAssemblyReference.cache b/Projects/WebGIM/GIM_site/obj/Debug/ResolveAssemblyReference.cache index 90a5db0..78e994b 100644 Binary files a/Projects/WebGIM/GIM_site/obj/Debug/ResolveAssemblyReference.cache and b/Projects/WebGIM/GIM_site/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/Projects/WebGIM/GIM_site/report_impianti.aspx.cs b/Projects/WebGIM/GIM_site/report_impianti.aspx.cs index f98982a..2db43bf 100644 --- a/Projects/WebGIM/GIM_site/report_impianti.aspx.cs +++ b/Projects/WebGIM/GIM_site/report_impianti.aspx.cs @@ -33,7 +33,7 @@ public partial class report_impianti : System.Web.UI.Page private string formattaUrl() { - return String.Format("./ExportPdf.aspx?tipo={0}", Convert.ToInt32(reportRichiesto.ElencoMacchine)); + return String.Format("./ExportPdf.aspx?tipo={0}", Convert.ToInt32(reportRichiesto.ElencoMacchine)); // !!! verificare se . o ~ } protected void btnPrint_Click(object sender, EventArgs e)