diff --git a/Projects/WebGIM/GIM_data/bin/GIM_data.dll b/Projects/WebGIM/GIM_data/bin/GIM_data.dll index 9eb143b..8524216 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 eccc524..b0e8168 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/WebUserControls/mod_dettaglioIntervento.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx index f4e9166..4a20c48 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx @@ -5,767 +5,791 @@ <%@ Register Src="~/WebUserControls/mod_dataOra.ascx" TagName="mod_dataOra" TagPrefix="uc2" %> <%@ Register Src="~/WebUserControls/mod_impiegoRisorse.ascx" TagPrefix="uc3" TagName="mod_impiegoRisorse" %> -
-
- -
-
- - -
-
- - -
-
- - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - -
- - - - - - - - - - - -
- - - -
- - - -
- - - - - -
- - - - - <%-- - - - - --%> - -
- - - -
- - - -
- - - -
- -
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - -
- - - - - - - - - - - - - -
- - - - -
- -
-
+
+
+
+
- - -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - [lblTurnoLav] - - -
- - - - - - - - - - - -
- - - -
- - - -
- - - - - -
- - - - - <%-- - - - - --%> - -
- - - -
- - - -
- - - -
- -
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - -
- - - - - - - - - - - - - -
- - - - -
- -
-
+
+
- - - - -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +
- - - - - - - - - - - -
- - - - - - - - - - - -
- - - -
- - - - - - -
- - - - - -
- - - - - <%-- + + +
+ + +
+ + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + +
+ + + + + + + + + + + +
+ + + +
+ + + +
+ + + + + +
+ + + + + <%-- --%> - -
- - - - - - - - - - - -
- - - -
-
- - -
- - -
- -
-
- - - -
+ +
+ + + +
+ + + +
+ + + +
+ +
+ +
+
+
+ <%: traduci("RicambiImpiegati") %> +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + + + + + + +
+ + + + +
+ +
+
-
- - - - - - - - + + +
+
+
+
+
- - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + [lblTurnoLav] + + +
+ + + + + + + + + + + +
+ + + +
+ + + +
+ + + + + +
+ + + + + <%-- + + + + --%> + +
+ + + +
+ + + +
+ + + +
+ +
+ +
+
+
+ <%: traduci("RicambiImpiegati") %> +
+
+
+
+ +
+
+ + + + + + + + - - - + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
- <%-- +
+ + + + + + + + + + + + + +
+ + + + +
+ +
+
+ + + +
+ + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + + + + +
+ + + +
+ + + + + + +
+ + + + + +
+ + + + + <%-- + + + + --%> + +
+ + + + + + + + + + + +
+ + + +
+
+ + +
+ + +
+ +
+
+ + + +
+
+
+ <%: traduci("RicambiImpiegati") %> +
+
+
+
+ +
+
+ + + + + + + + + + + + - - - - - - - - - - - - - -
+ + + + + + + + + + + +
+ <%----%> - - - - - - - - - - - - - -
- - - - -
- -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.cs index 7360486..e666ba8 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.cs @@ -25,7 +25,7 @@ public partial class mod_dettaglioIntervento : System.Web.UI.UserControl { btnCancel.Visible = false; } - + } /// /// setup iniziale e di reset dei controlli @@ -36,7 +36,7 @@ public partial class mod_dettaglioIntervento : System.Web.UI.UserControl frmView_default.ChangeMode(FormViewMode.ReadOnly); frmView_default.Visible = true; frmView_full.Visible = false; - btnCancel.Enabled= userCanEditData; + btnCancel.Enabled = userCanEditData; btnCompilaMtz.Enabled = userCanEditData; btnEditFull.Enabled = userCanEditData; } @@ -102,7 +102,7 @@ public partial class mod_dettaglioIntervento : System.Web.UI.UserControl { frmView_default.ChangeMode(FormViewMode.ReadOnly); frmView_default.Visible = true; - frmView_full.Visible = false; + frmView_full.Visible = false; btnCancel.Visible = false; frmView_default.DataBind(); frmView_full.DataBind(); @@ -146,6 +146,17 @@ public partial class mod_dettaglioIntervento : System.Web.UI.UserControl { } + /// + /// determina visibilità modulo ricambi (SE abilitato) + /// + public bool showMR + { + get + { + // FARE!!! check su db + file?... + bool answ = true; - + return answ; + } + } } 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 ccf53cc..3148d0a 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.designer.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.designer.cs @@ -20,24 +20,6 @@ public partial class mod_dettaglioIntervento { /// protected global::System.Web.UI.WebControls.LinkButton btnElenco; - /// - /// btnCancel control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - 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. /// @@ -56,6 +38,24 @@ public partial class mod_dettaglioIntervento { /// protected global::System.Web.UI.WebControls.Button btnEditFull; + /// + /// btnCancel control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + 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; + /// /// frmView_default control. /// diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx index 9808851..15fdf88 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx @@ -72,7 +72,7 @@ -
+
diff --git a/Projects/WebGIM/GIM_site/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/bin/GIM_data.dll index 9eb143b..8524216 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 01fca4b..b7016ab 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 eccc524..b0e8168 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/dettaglioIntervento.aspx b/Projects/WebGIM/GIM_site/dettaglioIntervento.aspx index 23afed5..78d7a15 100644 --- a/Projects/WebGIM/GIM_site/dettaglioIntervento.aspx +++ b/Projects/WebGIM/GIM_site/dettaglioIntervento.aspx @@ -9,7 +9,7 @@ -
+
diff --git a/Projects/WebGIM/GIM_site/sql/GIM_1.5_to_1.6.sql b/Projects/WebGIM/GIM_site/sql/GIM_1.5_to_1.6.sql index 5bb0f30..3a37c0e 100644 --- a/Projects/WebGIM/GIM_site/sql/GIM_1.5_to_1.6.sql +++ b/Projects/WebGIM/GIM_site/sql/GIM_1.5_to_1.6.sql @@ -108,8 +108,8 @@ exec voc.stp_insNewLemma'EditRicManIcon', 'fa fa-pencil' exec voc.stp_insNewLemma'reportInterattivoIcon', 'fa fa-star' exec voc.stp_insNewLemma 'GestOperMtzIcon', 'fa fa-user' UPDATE vocabolario SET traduzione = 'Anagrafiche' WHERE lemma = 'AnagraficheBase' AND Lingua = 'IT' -UPDATE vocabolario SET traduzione = 'Interventions' WHERE lemma = 'RicManArea' AND Lingua = 'IT' -UPDATE vocabolario SET traduzione = 'Interventi' WHERE lemma = 'RicManArea' AND Lingua = 'EN' +UPDATE vocabolario SET traduzione = 'Interventions' WHERE lemma = 'RicManArea' AND Lingua = 'EN' +UPDATE vocabolario SET traduzione = 'Interventi' WHERE lemma = 'RicManArea' AND Lingua = 'IT' exec voc.stp_insNewLemma 'Admin', 'Admin' exec voc.stp_insNewLemma 'AreaMtz', 'Manutenzione' UPDATE vocabolario SET traduzione = 'Maintenance' WHERE lemma = 'AreaMtz' AND Lingua = 'EN' @@ -134,4 +134,5 @@ exec voc.stp_insNewLemma 'chLangIcon', 'fa fa-globe' exec voc.stp_insNewLemma 'lblNewTag', 'Nuova Etichetta' exec voc.stp_insNewLemma 'addNewTag', 'Aggiungi Etichetta' exec voc.stp_insNewLemma 'RecordDuplicato', 'Record Duplicato' +exec voc.stp_insNewLemma 'RicambiImpiegati', 'Ricambi Impiegati'