diff --git a/PROJ-ETS/PROJ-ETS/FasiCommessa.aspx.cs b/PROJ-ETS/PROJ-ETS/FasiCommessa.aspx.cs
index 1ba852b..1e510cf 100644
--- a/PROJ-ETS/PROJ-ETS/FasiCommessa.aspx.cs
+++ b/PROJ-ETS/PROJ-ETS/FasiCommessa.aspx.cs
@@ -4,6 +4,7 @@ using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
+using ETS_Data;
namespace PROJ_ETS
{
@@ -11,7 +12,32 @@ namespace PROJ_ETS
{
protected void Page_Load(object sender, EventArgs e)
{
+ if (!Page.IsPostBack)
+ {
+ updateFaseComm();
+ }
+ mod_filtroComm1.eh_nuovoValore += mod_filtroComm1_eh_nuovoValore;
+ }
+ void mod_filtroComm1_eh_nuovoValore(object sender, EventArgs e)
+ {
+ updateFaseComm();
+ }
+ ///
+ /// ricalcola fase commessa
+ ///
+ private void updateFaseComm()
+ {
+#if false
+ idxFaseComm = DataProxy_ProjEts.DP.taAF.getByIdx(idxFase)[0].idxFaseAncest;
+ // se diventa "0" uso fase direttamente..
+ if (idxFaseComm == 0)
+ {
+ idxFaseComm = idxFase;
+ }
+#endif
+ // aggiorno visualizzazione
+ mod_fasi1.doUpdate();
}
}
}
\ No newline at end of file
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs
index 6830d57..faa89ec 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs
@@ -582,7 +582,8 @@ namespace PROJ_ETS.WebUserControls
protected void grView_RowUpdating(object sender, GridViewUpdateEventArgs e)
{
// salvo progetto sel
- utils.obj.setSessionVal("idxFase_sel", e.Keys["idxFase"]);
+ int idxFase = Convert.ToInt32(e.Keys["idxFase"]);
+ utils.obj.setSessionVal("idxFase_sel", idxFase);
// quale comando?
string _comando = "";
if (utils.obj.isInSessionObject("nextObjCommand"))
@@ -612,9 +613,10 @@ namespace PROJ_ETS.WebUserControls
{ }
utils.obj.setSessionVal("idxCli_sel", idxCli);
utils.obj.setSessionVal("nomeCli_sel", nomeCli);
- Response.Redirect("DatiCommessa");
// blocco update!
e.Cancel = true;
+ // redirect
+ Response.Redirect("DatiCommessa");
break;
case "dettFasi":
// salvo idxCli...
@@ -633,6 +635,9 @@ namespace PROJ_ETS.WebUserControls
{ }
utils.obj.setSessionVal("idxCli_sel", idxCli);
utils.obj.setSessionVal("nomeCli_sel", nomeCli);
+ // devo salvare fase ancestor!!!
+ int idxFaseAncest = DataProxy_ProjEts.DP.taAF.getByIdx(idxFase)[0].idxFaseAncest;
+ utils.obj.setSessionVal("idxFase_sel", idxFaseAncest);
// blocco update!
e.Cancel = true;
// redirect
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx.cs
index cf4b0f8..dcc1f37 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx.cs
@@ -618,10 +618,8 @@ namespace PROJ_ETS.WebUserControls
// salvo fase e proj sel
int idxFase = Convert.ToInt32(e.Keys["idxFase"]);
int idxProj = DataProxy_ProjEts.DP.taAF.getByIdx(idxFase)[0].idxProgetto;
- int idxFaseAncest = DataProxy_ProjEts.DP.taAF.getByIdx(idxFase)[0].idxFaseAncest;
utils.obj.setSessionVal("idxProgetto_sel", idxProj);
utils.obj.setSessionVal("idxFase_sel", idxFase);
- utils.obj.setSessionVal("idxFaseAncest_sel", idxFaseAncest);
// quale comando?
string _comando = "";
if (utils.obj.isInSessionObject("nextObjCommand"))
@@ -673,6 +671,9 @@ namespace PROJ_ETS.WebUserControls
{ }
utils.obj.setSessionVal("idxCli_sel", idxCli);
utils.obj.setSessionVal("nomeCli_sel", nomeCli);
+ // devo salvare fase ancestor!!!
+ int idxFaseAncest = DataProxy_ProjEts.DP.taAF.getByIdx(idxFase)[0].idxFaseAncest;
+ utils.obj.setSessionVal("idxFase_sel", idxFaseAncest);
// blocco update!
e.Cancel = true;
// redirect
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx
index 3f734b5..8ac70b4 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx
@@ -25,7 +25,7 @@
-
+
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx.cs
index 6b32636..b15c865 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx.cs
@@ -12,5 +12,12 @@ namespace PROJ_ETS.WebUserControls
protected void Page_Load(object sender, EventArgs e)
{
}
+ ///
+ /// effettua update controllo
+ ///
+ public void doUpdate()
+ {
+ grViewFasi.DataBind();
+ }
}
}
\ 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 f1f9f06..ec29af4 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 6b42c1b..dae62fb 100644
Binary files a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll differ