diff --git a/PROJ-ETS/PROJ-ETS/Commesse.aspx.cs b/PROJ-ETS/PROJ-ETS/Commesse.aspx.cs index dc7365b..cbe93fd 100644 --- a/PROJ-ETS/PROJ-ETS/Commesse.aspx.cs +++ b/PROJ-ETS/PROJ-ETS/Commesse.aspx.cs @@ -14,7 +14,7 @@ namespace PROJ_ETS { if (!Page.IsPostBack) { - utils.obj.setSessionVal("idxProgetto_sel", 0); + utils.obj.emptySessionVal("idxProgetto_sel"); utils.obj.emptySessionVal("idxCli_sel"); utils.obj.emptySessionVal("nomeCli_sel"); utils.obj.emptySessionVal("valoreCercato"); diff --git a/PROJ-ETS/PROJ-ETS/Web.config b/PROJ-ETS/PROJ-ETS/Web.config index cda988f..546219d 100644 --- a/PROJ-ETS/PROJ-ETS/Web.config +++ b/PROJ-ETS/PROJ-ETS/Web.config @@ -26,7 +26,7 @@ - + diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx index 22fe85d..51c91df 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx @@ -141,7 +141,7 @@
+ CommandArgument='<%# Eval("idxFase") %>' OnClick="btnNew_Click" ToolTip="Aggiungi Fase a commessa" Visible='<%# isAncestor(Eval("idxFaseAncest")) && enableNew %>' />   @@ -160,7 +160,7 @@ ToolTip="Cancel" /> - + diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs index faa89ec..ffcef9d 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs @@ -478,7 +478,7 @@ namespace PROJ_ETS.WebUserControls } } /// - /// possibilità creazioen nuovo + /// possibilità creazione nuovo record se vuoto /// public bool _enableNewFromEmpty { get; set; } /// @@ -496,6 +496,24 @@ namespace PROJ_ETS.WebUserControls } } /// + /// possibilità creazione nuovo + /// + public bool _enableNew { get; set; } + /// + /// determina se sia visibile creazione nuova commessa (pulsanti "+" azzurro e verde) + /// + public bool enableNew + { + get + { + return _enableNew; + } + set + { + _enableNew = value; + } + } + /// /// restituisce true se sia possibile creare la commessa generica "0000-anno" /// public bool zeroIsAvailable diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_spostaComm.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_spostaComm.ascx index 391eec2..cc0a7e1 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_spostaComm.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_spostaComm.ascx @@ -28,7 +28,7 @@
- +

Destinazione

@@ -47,7 +47,7 @@
- + diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll index 498b1e8..b23b9c9 100644 Binary files a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll and b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll differ diff --git a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll index 95e4f93..9ff3921 100644 Binary files a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll differ