diff --git a/ETS_Data/DataProxy_ProjEts.cs b/ETS_Data/DataProxy_ProjEts.cs index a64a43c..704ef01 100644 --- a/ETS_Data/DataProxy_ProjEts.cs +++ b/ETS_Data/DataProxy_ProjEts.cs @@ -161,6 +161,22 @@ namespace ETS_Data #endif return answ; } + /// + /// calcola se una commessa sia attiva (da idxFase) + /// + /// + /// + public bool commessaAttiva(int idxFase) + { + bool answ = false; + try + { + answ = taAF.getByIdx(idxFase)[0].Attivo; + } + catch + { } + return answ; + } #endregion } diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commForn.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commForn.ascx index c87270d..c8f1b3b 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commForn.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commForn.ascx @@ -15,13 +15,13 @@ + ToolTip="Aggiungi una nuovo Ordine Fornitore per la commessa" Width="200px" Visible='<%# commessaAttiva %>' /> + ImageUrl="../images/edit_m.png" Visible='<%# commessaAttiva %>' /> @@ -36,7 +36,7 @@ -
+
@@ -57,10 +57,10 @@ -
+
-
+
@@ -97,7 +97,7 @@
- +
@@ -127,7 +127,7 @@ + ImageUrl="../images/elimina_s.png" ToolTip="Delete" OnClientClick="return confirm('Confermi eliminazione record?')" Visible='<%# commessaAttiva %>' /> + ImageUrl="~/images/new_m.png" Visible='<%# commessaAttiva %>' /> diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commForn.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commForn.ascx.cs index bbca21f..9bbe233 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commForn.ascx.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commForn.ascx.cs @@ -139,6 +139,16 @@ namespace PROJ_ETS.WebUserControls e.InputParameters["rifOrdineForn"] = ""; } } + /// + /// boolean se la commessa è attiva (fase madre...) + /// + public bool commessaAttiva + { + get + { + return DataProxy_ProjEts.DP.commessaAttiva(utils.obj.IntSessionObj("idxFase_sel")); + } + } } } \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commInteg.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commInteg.ascx index 330f4f6..94e83ce 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commInteg.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commInteg.ascx @@ -15,13 +15,13 @@ + ToolTip="Aggiungi una integrazione alla commessa" Width="200px" Visible='<%# commessaAttiva %>' /> + ImageUrl="../images/edit_m.png" Visible='<%# commessaAttiva %>' /> @@ -138,7 +138,7 @@ + ImageUrl="../images/elimina_s.png" ToolTip="Delete" OnClientClick="return confirm('Confermi eliminazione record?')" Visible='<%# commessaAttiva %>' /> + ImageUrl="~/images/new_m.png" Visible='<%# commessaAttiva %>' /> diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commInteg.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commInteg.ascx.cs index 69620c0..789fc22 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commInteg.ascx.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commInteg.ascx.cs @@ -146,5 +146,15 @@ namespace PROJ_ETS.WebUserControls e.InputParameters["rifOrdine"] = ""; } } + /// + /// boolean se la commessa è attiva (fase madre...) + /// + public bool commessaAttiva + { + get + { + return DataProxy_ProjEts.DP.commessaAttiva(utils.obj.IntSessionObj("idxFase_sel")); + } + } } } \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx index 3606df3..c49ef11 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx @@ -131,7 +131,7 @@
<%----%> - +
@@ -289,15 +289,10 @@ - <%-- - - --%> - <%----%> - <%----%> diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.cs index b94ee86..49396d5 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.cs @@ -123,5 +123,15 @@ namespace PROJ_ETS.WebUserControls // redirect Response.Redirect("Progetti"); } + /// + /// boolean se la commessa è attiva (fase madre...) + /// + public bool commessaAttiva + { + get + { + return DataProxy_ProjEts.DP.commessaAttiva(utils.obj.IntSessionObj("idxFase_sel")); + } + } } } \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx index f25499a..88d38bd 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx @@ -22,7 +22,7 @@ - + diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx.cs index d40052e..2b7974f 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx.cs @@ -184,5 +184,15 @@ namespace PROJ_ETS.WebUserControls { pnlBdgtOre.Visible = false; } + /// + /// boolean se la commessa è attiva (fase madre...) + /// + public bool commessaAttiva + { + get + { + return DataProxy_ProjEts.DP.commessaAttiva(utils.obj.IntSessionObj("idxFase_sel")); + } + } } } \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll index 3079361..002859e 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 5980ba8..e79a600 100644 Binary files a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll differ