diff --git a/PROJ-ETS/PROJ-ETS/Web.config b/PROJ-ETS/PROJ-ETS/Web.config
index 82824ee..830b9dd 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_commesseFull.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx.cs
index d0fa6e4..21cc710 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx.cs
@@ -597,8 +597,8 @@ namespace PROJ_ETS.WebUserControls
///
/// intercetto eventuale update fittizio x rimandare a pagina dett fasi
///
- ///
- ///
+ /// The source of the event.
+ /// The instance containing the event data.
protected void grView_RowUpdating(object sender, GridViewUpdateEventArgs e)
{
// salvo fase e proj sel
@@ -637,8 +637,17 @@ namespace PROJ_ETS.WebUserControls
utils.obj.setSessionVal("nomeCli_sel", nomeCli);
// blocco update!
e.Cancel = true;
- // redirect
- Response.Redirect("DatiCommessa");
+ // se รจ CC...
+ if (isCurrentCC(idxFase))
+ {
+ // redirect a dati commessa
+ Response.Redirect("DatiCommessa");
+ }
+ else
+ {
+ // redirect a Riepilogo Commessa
+ Response.Redirect("RiepilogoCommessa");
+ }
break;
case "dettFasi":
// salvo idxCli...
@@ -695,6 +704,27 @@ namespace PROJ_ETS.WebUserControls
}
}
///
+ /// risponde alla domanda se l'utente sia CC della commessa indicata dalla fase
+ ///
+ ///
+ ///
+ public bool isCurrentCC(int idxFase)
+ {
+ bool answ = false;
+ string CapoCommessa = "";
+ try
+ {
+ CapoCommessa = DataProxy_ProjEts.DP.taDC.GetData(idxFase)[0].CapoCommessa;
+ }
+ catch
+ { }
+ if (user_std.UtSn.currUserNomeCognome == CapoCommessa || user_std.UtSn.currUserCognomeNome == CapoCommessa)
+ {
+ answ = true;
+ }
+ return answ;
+ }
+ ///
/// effettua update
///
public void doUpdate()
diff --git a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll
index 8912e65..f456da6 100644
Binary files a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll differ
diff --git a/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip b/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip
index 4850fe8..46b1eb5 100644
Binary files a/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip and b/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip differ