diff --git a/WebSites/WebGIM/App_Code/DS_utility.xsd b/WebSites/WebGIM/App_Code/DS_utility.xsd index 6cc168d..33b7fae 100644 --- a/WebSites/WebGIM/App_Code/DS_utility.xsd +++ b/WebSites/WebGIM/App_Code/DS_utility.xsd @@ -382,6 +382,44 @@ WHERE (conditio = @conditio) + + + + + + SELECT codImpianto, nomeImpianto, codMacchina, nomeMacchina, data, descrizione, descrPriorita, isFermo, descrTipo, idxPending +FROM v_mtzProgPendingExp +ORDER BY data + + + + + + + + + + + + + + + + + + + + + + SELECT codImpianto, codMacchina, data, descrPriorita, descrTipo, descrizione, idxPending, isFermo, nomeImpianto, nomeMacchina FROM v_mtzProgPendingExp WHERE (data <= @dataMax) ORDER BY data + + + + + + + + @@ -393,8 +431,8 @@ WHERE (conditio = @conditio) - - + + @@ -407,23 +445,23 @@ WHERE (conditio = @conditio) - - + + - + - - + + @@ -436,8 +474,8 @@ WHERE (conditio = @conditio) - - + + @@ -450,23 +488,23 @@ WHERE (conditio = @conditio) - - + + - + - - + + @@ -477,32 +515,12 @@ WHERE (conditio = @conditio) - - - - - - - - - - - - - - - - - - - - - + @@ -516,11 +534,31 @@ WHERE (conditio = @conditio) + + + + + + + + + + + + + + + + + + + + - - + + @@ -533,21 +571,21 @@ WHERE (conditio = @conditio) - + - + - + @@ -560,6 +598,66 @@ WHERE (conditio = @conditio) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -574,13 +672,6 @@ WHERE (conditio = @conditio) - - - - - - - @@ -595,120 +686,67 @@ WHERE (conditio = @conditio) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + + + - + - - - - - - - + + + + + + + - - - - + + + + - + - + - + @@ -721,8 +759,8 @@ WHERE (conditio = @conditio) - - + + @@ -735,14 +773,14 @@ WHERE (conditio = @conditio) - + - + @@ -752,6 +790,64 @@ WHERE (conditio = @conditio) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -803,5 +899,9 @@ WHERE (conditio = @conditio) + + + + \ No newline at end of file diff --git a/WebSites/WebGIM/App_Code/DS_utility.xss b/WebSites/WebGIM/App_Code/DS_utility.xss index 27e3f88..6096f97 100644 --- a/WebSites/WebGIM/App_Code/DS_utility.xss +++ b/WebSites/WebGIM/App_Code/DS_utility.xss @@ -4,23 +4,24 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebSites/WebGIM/Bin/SteamWare.dll b/WebSites/WebGIM/Bin/SteamWare.dll index 590b7a4..681549b 100644 Binary files a/WebSites/WebGIM/Bin/SteamWare.dll and b/WebSites/WebGIM/Bin/SteamWare.dll differ diff --git a/WebSites/WebGIM/ExcelExportMtzPrevPending.aspx b/WebSites/WebGIM/ExcelExportMtzPrevPending.aspx new file mode 100644 index 0000000..061d1c4 --- /dev/null +++ b/WebSites/WebGIM/ExcelExportMtzPrevPending.aspx @@ -0,0 +1,45 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeFile="ExcelExportMtzPrevPending.aspx.cs" + EnableEventValidation="false" Inherits="ExcelExportMtzPrevPending" %> + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + diff --git a/WebSites/WebGIM/ExcelExportMtzPrevPending.aspx.cs b/WebSites/WebGIM/ExcelExportMtzPrevPending.aspx.cs new file mode 100644 index 0000000..899d4ad --- /dev/null +++ b/WebSites/WebGIM/ExcelExportMtzPrevPending.aspx.cs @@ -0,0 +1,90 @@ +using System; +using System.Collections.Generic; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using SteamWare; +using System.Web.UI.HtmlControls; + +public partial class ExcelExportMtzPrevPending : System.Web.UI.Page +{ + /// + /// evento dati associati a controllo + /// + /// + /// + protected void grView_DataBound(object sender, EventArgs e) + { + if (grView.Rows.Count > 0) + { + LinkButton lb; + // aggiorno gli headers + foreach (TableCell cella in grView.HeaderRow.Cells) + { + try + { + lb = (LinkButton)cella.Controls[0]; + lb.Text = traduci(lb.Text); + } + catch + { } + } + } + } + /// + /// wrapper traduzione + /// + /// + /// + public string traduci(object lemma) + { + return user_std.UtSn.Traduci(lemma.ToString()); + } + + public override void VerifyRenderingInServerForm(Control control) + { + + // Confirms that an HtmlForm control is rendered for the specified ASP.NET server control at run time. + + } + + private void doExport() + { + Response.Clear(); + Response.AddHeader("content-disposition", "attachment; filename=InterventiProgrammati.xls"); + Response.Charset = ""; + // If you want the option to open the Excel file without saving than + // comment out the line below + Response.Cache.SetCacheability(HttpCacheability.NoCache); + Response.ContentType = "application/vnd.xls"; + System.IO.StringWriter stringWrite = new System.IO.StringWriter(); + System.Web.UI.HtmlTextWriter htmlWrite = new HtmlTextWriter(stringWrite); + grView.RenderControl(htmlWrite); + Response.Write(stringWrite.ToString()); + Response.End(); + + } + + #region area protected + + + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + aggiornamento(); + doExport(); + } + } + + #endregion + + + public void aggiornamento() + { + grView.AllowPaging = false; + ods.DataBind(); + } + + +} diff --git a/WebSites/WebGIM/mod_elencoRichieste.ascx b/WebSites/WebGIM/mod_elencoRichieste.ascx index 9a2a1e0..0a8b680 100644 --- a/WebSites/WebGIM/mod_elencoRichieste.ascx +++ b/WebSites/WebGIM/mod_elencoRichieste.ascx @@ -55,7 +55,12 @@ - + + + + + + diff --git a/WebSites/WebGIM/mod_mtzPrevPending.ascx b/WebSites/WebGIM/mod_mtzPrevPending.ascx new file mode 100644 index 0000000..c2a9caf --- /dev/null +++ b/WebSites/WebGIM/mod_mtzPrevPending.ascx @@ -0,0 +1,41 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="mod_mtzPrevPending.ascx.cs" + Inherits="mod_mtzPrevPending" %> +<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/WebSites/WebGIM/mod_mtzPrevPending.ascx.cs b/WebSites/WebGIM/mod_mtzPrevPending.ascx.cs new file mode 100644 index 0000000..82cbd7a --- /dev/null +++ b/WebSites/WebGIM/mod_mtzPrevPending.ascx.cs @@ -0,0 +1,49 @@ +using System; +using System.Collections.Generic; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using SteamWare; + +public partial class mod_mtzPrevPending : ApplicationUserControl +{ + public event EventHandler eh_resetSelezione; + /// + /// evento dati associati a controllo + /// + /// + /// + protected void grView_DataBound(object sender, EventArgs e) + { + if (grView.Rows.Count > 0) + { + LinkButton lb; + // aggiorno gli headers + foreach (TableCell cella in grView.HeaderRow.Cells) + { + try + { + lb = (LinkButton)cella.Controls[0]; + lb.Text = traduci(lb.Text); + } + catch + { } + } + int totRecord = grView.Rows.Count + grView.PageSize * (grView.PageCount - 1); + lblNumRec.Text = string.Format("{0} records of ~ {1}", grView.Rows.Count, totRecord); + } + else + { + lblNumRec.Text = ""; + } + } + protected override void Page_Load(object sender, EventArgs e) + { + base.Page_Load(sender, e); + if (!Page.IsPostBack) + { + hlExportExcel.Text = traduci("hlExportExcel"); + hlExportExcel.NavigateUrl = "./ExcelExportMtzPrevPending.aspx"; + } + } +} \ No newline at end of file diff --git a/WebSites/WebGIM/mtzProg.aspx b/WebSites/WebGIM/mtzProg.aspx index b966e78..d322a46 100644 --- a/WebSites/WebGIM/mtzProg.aspx +++ b/WebSites/WebGIM/mtzProg.aspx @@ -1,11 +1,24 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/AjaxSearch.master" AutoEventWireup="true" CodeFile="mtzProg.aspx.cs" Inherits="mtzProg" %> +<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> <%@ Register Src="mod_elencoMtzProg.ascx" TagName="mod_elencoMtzProg" TagPrefix="uc1" %> <%@ Register Src="mod_dettMtzProg.ascx" TagName="mod_dettMtzProg" TagPrefix="uc2" %> <%@ Register Src="mod_fixCal.ascx" TagName="mod_fixCal" TagPrefix="uc3" %> +<%@ Register src="mod_mtzPrevPending.ascx" tagname="mod_mtzPrevPending" tagprefix="uc4" %> - - - + + + + + + + + + + + + + + diff --git a/WebSites/WebGIM/mtzProg.aspx.cs b/WebSites/WebGIM/mtzProg.aspx.cs index 0d0c888..9f14e5e 100644 --- a/WebSites/WebGIM/mtzProg.aspx.cs +++ b/WebSites/WebGIM/mtzProg.aspx.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using SteamWare; public partial class mtzProg : System.Web.UI.Page { @@ -10,6 +11,22 @@ 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); + traduciObj(); + } + + private void traduciObj() + { + ((AjaxControlToolkit.TabPanel)TabContainer1.FindControl("TabProgrammaMtz")).HeaderText = traduci("TabProgrammaMtz"); + ((AjaxControlToolkit.TabPanel)TabContainer1.FindControl("TabScadenzeMtz")).HeaderText = traduci("TabScadenzeMtz"); + } + /// + /// wrapper traduzione + /// + /// + /// + public string traduci(object lemma) + { + return user_std.UtSn.Traduci(lemma.ToString()); } void mod_dettMtzProg1_eh_newInserted(object sender, EventArgs e)