diff --git a/Projects/WebGIM/GIM_data/sql/GIM_0006.sql b/Projects/WebGIM/GIM_data/sql/GIM_0006.sql index 2b71ef4..d507ccc 100644 --- a/Projects/WebGIM/GIM_data/sql/GIM_0006.sql +++ b/Projects/WebGIM/GIM_data/sql/GIM_0006.sql @@ -75,8 +75,11 @@ commit go - - +/* aggiorno: se Ambito Guasto è 7 allora è mtz Prog... */ +UPDATE InterventiMtz +SET scheduled = 1 +WHERE (idxAmbito = 7) +GO -- registro versione... diff --git a/Projects/WebGIM/GIM_site/GIM_site.csproj b/Projects/WebGIM/GIM_site/GIM_site.csproj index 1eef726..52e38be 100644 --- a/Projects/WebGIM/GIM_site/GIM_site.csproj +++ b/Projects/WebGIM/GIM_site/GIM_site.csproj @@ -664,6 +664,7 @@ + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs index 31081e2..2615600 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); // !!! verificare se . o ~ + 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 diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx index d387d7e..4dc95a8 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx @@ -1,11 +1,13 @@ -<%@ Control Language="C#" AutoEventWireup="true" - Inherits="mod_reportInterventi" Codebehind="mod_reportInterventi.ascx.cs" %> +<%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_reportInterventi" + CodeBehind="mod_reportInterventi.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" %>
-
+
@@ -64,7 +66,15 @@ SelectMethod="GetData" TypeName="GIM_data.DS_applicazioneTableAdapters.AnagStatiTableAdapter">
+
+ +
+
+
+
@@ -74,7 +84,7 @@

- @@ -83,7 +93,7 @@

- diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.cs index d2bb20a..3e356b9 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.cs @@ -46,6 +46,10 @@ public partial class mod_reportInterventi : System.Web.UI.UserControl lnkGuidaPerReport.Text = traduci("lnkGuidaPerReport"); lblReportInterventi.Text = traduci("lblReportInterventi"); lblReportMTBFMTTR.Text = traduci("lblReportMTBFMTTR"); + chkShowOnlyMacchFerma.Text = traduci("chkShowOnlyMacchFerma"); + chkShowMtzPrev.Text = traduci("chkShowMtzPrev"); + hlElencoInterventi_Pdf.ToolTip = traduci("hlElencoInterventi_Pdf"); + hlMTBF_MTTR_Pdf.ToolTip = traduci("hlMTBF_MTTR_Pdf"); } private void setDefaultValues() { @@ -53,9 +57,33 @@ public partial class mod_reportInterventi : System.Web.UI.UserControl hlElencoInterventi_Pdf.NavigateUrl = formattaUrl(reportRichiesto.ElencoInterventi, mod_periodoAnalisi1.intervalloAnalisi); hlMTBF_MTTR_Pdf.NavigateUrl = formattaUrl(reportRichiesto.MTBF_MTTR, mod_periodoAnalisi1.intervalloAnalisi); } + /// + /// costruisce un URL valido e formattato a partire da quanto filtrato... + /// + /// + /// + /// 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); // !!! verificare se . o ~ + string answ =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 ~ + // effettuo controlli valori checkBox + if (chkShowMtzPrev.Checked) + { + answ += "&mtzPrev=1"; + } + else + { + answ += "&mtzPrev=0"; + } + if (chkShowOnlyMacchFerma.Checked) + { + answ += "&onlyMacchFerm=1"; + } + else + { + answ += "&onlyMacchFerm=0"; + } + return answ; } #region gestione selettori valori multipli @@ -183,8 +211,31 @@ public partial class mod_reportInterventi : System.Web.UI.UserControl } } } + #endregion + #region checkbox + /// + /// evento check mtz pre + /// + /// + /// + protected void chkShowMtzPrev_CheckedChanged(object sender, EventArgs e) + { + setDefaultValues(); + } + /// + /// evento check su macchian ferma + /// + /// + /// + protected void chkShowOnlyMacchFerma_CheckedChanged(object sender, EventArgs e) + { + setDefaultValues(); + } + + #endregion + #endregion diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.designer.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.designer.cs index 0bb73f3..842342d 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.designer.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.designer.cs @@ -120,6 +120,24 @@ public partial class mod_reportInterventi { /// protected global::System.Web.UI.WebControls.ObjectDataSource ods; + /// + /// chkShowOnlyMacchFerma control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.CheckBox chkShowOnlyMacchFerma; + + /// + /// chkShowMtzPrev control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.CheckBox chkShowMtzPrev; + /// /// lblReportInterventi control. /// diff --git a/Projects/WebGIM/GIM_site/bin/GIM_site.dll b/Projects/WebGIM/GIM_site/bin/GIM_site.dll index 6a39559..2d60118 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/images/mtzProg.png b/Projects/WebGIM/GIM_site/images/mtzProg.png new file mode 100644 index 0000000..cd75e5b Binary files /dev/null and b/Projects/WebGIM/GIM_site/images/mtzProg.png differ diff --git a/Projects/WebGIM/GIM_site/obj/Debug/GIM_site.dll b/Projects/WebGIM/GIM_site/obj/Debug/GIM_site.dll index 6a39559..2d60118 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/report_impianti.aspx.cs b/Projects/WebGIM/GIM_site/report_impianti.aspx.cs index 2db43bf..0858d50 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)); // !!! verificare se . o ~ + return String.Format("~/ExportPdf.aspx?tipo={0}", Convert.ToInt32(reportRichiesto.ElencoMacchine)); // !!! verificare se . o ~ } protected void btnPrint_Click(object sender, EventArgs e)