diff --git a/Projects/WebGIM/GIM_data/bin/GIM_data.dll b/Projects/WebGIM/GIM_data/bin/GIM_data.dll index db68006..615feda 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_site/Web.config b/Projects/WebGIM/GIM_site/Web.config index e92c2eb..1e04c25 100644 --- a/Projects/WebGIM/GIM_site/Web.config +++ b/Projects/WebGIM/GIM_site/Web.config @@ -102,7 +102,7 @@ - + diff --git a/Projects/WebGIM/GIM_site/WebConfigSomaschini_AppSettings.config b/Projects/WebGIM/GIM_site/WebConfigSomaschini_AppSettings.config index 85afe53..ac5bac1 100644 --- a/Projects/WebGIM/GIM_site/WebConfigSomaschini_AppSettings.config +++ b/Projects/WebGIM/GIM_site/WebConfigSomaschini_AppSettings.config @@ -18,7 +18,7 @@ - + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx index 751ee30..db7550e 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx @@ -1,6 +1,7 @@ -<%@ Control Language="C#" AutoEventWireup="true" - Inherits="mod_dettaglioIntervento" Codebehind="mod_dettaglioIntervento.ascx.cs" %> -<%@ Register Src="~/WebUserControls/mod_interventoOpMtz.ascx" TagName="mod_interventoOpMtz" TagPrefix="uc1" %> +<%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_dettaglioIntervento" + CodeBehind="mod_dettaglioIntervento.ascx.cs" %> +<%@ Register Src="~/WebUserControls/mod_interventoOpMtz.ascx" TagName="mod_interventoOpMtz" + TagPrefix="uc1" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> <%@ Register Src="~/WebUserControls/mod_dataOra.ascx" TagName="mod_dataOra" TagPrefix="uc2" %>
@@ -9,6 +10,7 @@
+
@@ -260,7 +262,7 @@ - + [lblTurnoLav] @@ -620,7 +622,7 @@ - diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.cs index a511b5e..4f80fb2 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.cs @@ -49,6 +49,7 @@ public partial class mod_dettaglioIntervento : System.Web.UI.UserControl btnCancel.Text = traduci("btnCancel"); btnCompilaMtz.Text = traduci("btnCompilaMtz"); btnEditFull.Text = traduci("btnEditFull"); + cbeCancel.ConfirmText = traduci("confermaAnnullaEdit"); } /// /// wrapper alla traduzione diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.designer.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.designer.cs index ebd8546..91a6948 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.designer.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.designer.cs @@ -30,6 +30,15 @@ public partial class mod_dettaglioIntervento { /// protected global::System.Web.UI.WebControls.Button btnCancel; + /// + /// cbeCancel control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::AjaxControlToolkit.ConfirmButtonExtender cbeCancel; + /// /// btnCompilaMtz control. /// diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs index 2615600..62ccd6b 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); } /// /// prende in carico e stampa la scheda selezionata diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_menuTop.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_menuTop.ascx index 99e9edd..1d54dce 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_menuTop.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_menuTop.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_menuTop" Codebehind="mod_menuTop.ascx.cs" %> +<%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_menuTop" CodeBehind="mod_menuTop.ascx.cs" %> @@ -14,8 +14,10 @@ diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_menuTop.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_menuTop.ascx.cs index b1d7fa1..94397f5 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_menuTop.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_menuTop.ascx.cs @@ -91,6 +91,7 @@ public partial class mod_menuTop : ApplicationUserControl { if (!Page.IsPostBack) { + lnkHelp.ToolTip = traduci("ApriManualeHelp"); // solo se user è auth... if (user_std.UtSn.isAuth) { diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_menuTop.ascx.designer.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_menuTop.ascx.designer.cs index 3b7e1f4..2cd2e2e 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_menuTop.ascx.designer.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_menuTop.ascx.designer.cs @@ -39,6 +39,15 @@ public partial class mod_menuTop { /// protected global::System.Web.UI.WebControls.Label lblTitle; + /// + /// btnUpdate control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton btnUpdate; + /// /// lblDateTime control. /// @@ -49,13 +58,22 @@ public partial class mod_menuTop { protected global::System.Web.UI.WebControls.Label lblDateTime; /// - /// btnUpdate control. + /// lnkHelp control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.LinkButton btnUpdate; + protected global::System.Web.UI.WebControls.HyperLink lnkHelp; + + /// + /// imgHelp control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Image imgHelp; /// /// lnkShowHide control. diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.cs index ffdaa66..b677d7e 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.cs @@ -65,7 +65,7 @@ public partial class mod_reportInterventi : System.Web.UI.UserControl /// private string formattaUrl(reportRichiesto tipo, intervalloDate periodo) { - 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 ~ + 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); // effettuo controlli valori checkBox if (chkShowMtzPrev.Checked) { diff --git a/Projects/WebGIM/GIM_site/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/bin/GIM_data.dll index db68006..615feda 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 12843f4..44f4289 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/help/mobs/mm_206/Immagine 14.jpg b/Projects/WebGIM/GIM_site/help/mobs/mm_206/Immagine 14.jpg deleted file mode 100644 index 10ed1ad..0000000 Binary files a/Projects/WebGIM/GIM_site/help/mobs/mm_206/Immagine 14.jpg and /dev/null differ diff --git a/Projects/WebGIM/GIM_site/images/help_16.png b/Projects/WebGIM/GIM_site/images/help_16.png new file mode 100644 index 0000000..8fb731a Binary files /dev/null and b/Projects/WebGIM/GIM_site/images/help_16.png differ diff --git a/Projects/WebGIM/GIM_site/images/help_22.png b/Projects/WebGIM/GIM_site/images/help_22.png new file mode 100644 index 0000000..e3baaa9 Binary files /dev/null and b/Projects/WebGIM/GIM_site/images/help_22.png differ diff --git a/Projects/WebGIM/GIM_site/images/help_32.png b/Projects/WebGIM/GIM_site/images/help_32.png new file mode 100644 index 0000000..9135c63 Binary files /dev/null and b/Projects/WebGIM/GIM_site/images/help_32.png differ diff --git a/Projects/WebGIM/GIM_site/images/sfondo.jpg b/Projects/WebGIM/GIM_site/images/sfondo.jpg deleted file mode 100644 index 479246c..0000000 Binary files a/Projects/WebGIM/GIM_site/images/sfondo.jpg and /dev/null differ diff --git a/Projects/WebGIM/GIM_site/images/sfondoBody.jpg b/Projects/WebGIM/GIM_site/images/sfondoBody.jpg deleted file mode 100644 index e19ffe2..0000000 Binary files a/Projects/WebGIM/GIM_site/images/sfondoBody.jpg and /dev/null differ diff --git a/Projects/WebGIM/GIM_site/logs/20100121.txt b/Projects/WebGIM/GIM_site/logs/20100121.txt deleted file mode 100644 index de86093..0000000 --- a/Projects/WebGIM/GIM_site/logs/20100121.txt +++ /dev/null @@ -1,35 +0,0 @@ -21/01/2010 17:37:19 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente -21/01/2010 17:37:19 [INFO] - Accodata la richiesta di manutenzione (programmata) num 364 -21/01/2010 17:37:19 [INFO] - Accodata la richiesta di manutenzione (programmata) num 365 -21/01/2010 17:37:19 [INFO] - Accodata la richiesta di manutenzione (programmata) num 366 -21/01/2010 17:37:19 [INFO] - Accodata la richiesta di manutenzione (programmata) num 367 -21/01/2010 17:37:19 [INFO] - Accodata la richiesta di manutenzione (programmata) num 368 -21/01/2010 17:37:19 [INFO] - Accodata la richiesta di manutenzione (programmata) num 369 -21/01/2010 17:37:19 [INFO] - Accodata la richiesta di manutenzione (programmata) num 370 -21/01/2010 17:37:19 [INFO] - Accodata la richiesta di manutenzione (programmata) num 371 -21/01/2010 17:37:19 [INFO] - Accodata la richiesta di manutenzione (programmata) num 372 -21/01/2010 17:37:19 [INFO] - Accodata la richiesta di manutenzione (programmata) num 373 -21/01/2010 17:37:19 [INFO] - Accodata la richiesta di manutenzione (programmata) num 374 -21/01/2010 17:37:19 [INFO] - Accodata la richiesta di manutenzione (programmata) num 375 -21/01/2010 17:37:19 [INFO] - Accodata la richiesta di manutenzione (programmata) num 376 -21/01/2010 17:37:19 [INFO] - Accodata la richiesta di manutenzione (programmata) num 377 -21/01/2010 17:37:19 [INFO] - Accodata la richiesta di manutenzione (programmata) num 378 -21/01/2010 17:37:19 [INFO] - Accodata la richiesta di manutenzione (programmata) num 379 -21/01/2010 17:38:28 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente -21/01/2010 17:38:44 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente -21/01/2010 18:01:52 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente -21/01/2010 18:13:14 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente -21/01/2010 18:25:07 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente -21/01/2010 18:28:46 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente -21/01/2010 18:33:19 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente -21/01/2010 18:39:05 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente -21/01/2010 18:43:27 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente -21/01/2010 18:44:46 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente -21/01/2010 18:45:01 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente -21/01/2010 18:48:20 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente -21/01/2010 18:48:35 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente -21/01/2010 18:53:12 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente -21/01/2010 18:58:09 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente -21/01/2010 19:00:24 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente -21/01/2010 19:02:02 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente -21/01/2010 19:03:48 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente diff --git a/Projects/WebGIM/GIM_site/obj/Debug/GIM_site.dll b/Projects/WebGIM/GIM_site/obj/Debug/GIM_site.dll index 1b06353..e3df4bb 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 39cbbb8..78c4b7d 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 0858d50..012a5ad 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)); } protected void btnPrint_Click(object sender, EventArgs e) diff --git a/Projects/WebGIM/WebGIM.suo b/Projects/WebGIM/WebGIM.suo index d36b7c7..7b8eb21 100644 Binary files a/Projects/WebGIM/WebGIM.suo and b/Projects/WebGIM/WebGIM.suo differ
- + + +