diff --git a/PROJ-ETS/PROJ-ETS/FasiCommessa.aspx b/PROJ-ETS/PROJ-ETS/FasiCommessa.aspx index ace3402..657ff08 100644 --- a/PROJ-ETS/PROJ-ETS/FasiCommessa.aspx +++ b/PROJ-ETS/PROJ-ETS/FasiCommessa.aspx @@ -1,7 +1,7 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Progetti.master" AutoEventWireup="true" CodeBehind="FasiCommessa.aspx.cs" Inherits="PROJ_ETS.FasiCommessa" %> +<%@ Register src="WebUserControls/mod_fasi.ascx" tagname="mod_fasi" tagprefix="uc1" %> + -

- WorkInProgress -

+
diff --git a/PROJ-ETS/PROJ-ETS/FasiCommessa.aspx.designer.cs b/PROJ-ETS/PROJ-ETS/FasiCommessa.aspx.designer.cs index 080fb16..9eb7bfc 100644 --- a/PROJ-ETS/PROJ-ETS/FasiCommessa.aspx.designer.cs +++ b/PROJ-ETS/PROJ-ETS/FasiCommessa.aspx.designer.cs @@ -3,15 +3,22 @@ // This code was generated by a tool. // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ -namespace PROJ_ETS -{ - - - public partial class FasiCommessa - { +namespace PROJ_ETS { + + + public partial class FasiCommessa { + + /// + /// mod_fasi1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::PROJ_ETS.WebUserControls.mod_fasi mod_fasi1; } } diff --git a/PROJ-ETS/PROJ-ETS/Images/NavigaSub_l.png b/PROJ-ETS/PROJ-ETS/Images/NavigaSub_l.png new file mode 100644 index 0000000..439f9f5 Binary files /dev/null and b/PROJ-ETS/PROJ-ETS/Images/NavigaSub_l.png differ diff --git a/PROJ-ETS/PROJ-ETS/Images/NavigaSub_m.png b/PROJ-ETS/PROJ-ETS/Images/NavigaSub_m.png new file mode 100644 index 0000000..a3b0cc3 Binary files /dev/null and b/PROJ-ETS/PROJ-ETS/Images/NavigaSub_m.png differ diff --git a/PROJ-ETS/PROJ-ETS/Images/NavigaSub_s.png b/PROJ-ETS/PROJ-ETS/Images/NavigaSub_s.png new file mode 100644 index 0000000..df79492 Binary files /dev/null and b/PROJ-ETS/PROJ-ETS/Images/NavigaSub_s.png differ diff --git a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj index faf0faf..0b9cecb 100644 --- a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj +++ b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj @@ -222,6 +222,9 @@ + + + @@ -279,6 +282,7 @@ + diff --git a/PROJ-ETS/PROJ-ETS/Scratch/imgDemoFasi.png b/PROJ-ETS/PROJ-ETS/Scratch/imgDemoFasi.png new file mode 100644 index 0000000..4bd20d0 Binary files /dev/null and b/PROJ-ETS/PROJ-ETS/Scratch/imgDemoFasi.png differ diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx index 29a95d3..22fe85d 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx @@ -24,10 +24,16 @@ - - - +
+ + +
+
+ + +
@@ -50,7 +56,7 @@
+ Font-Bold="true" />
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs index 48eed5f..6830d57 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs @@ -557,7 +557,7 @@ namespace PROJ_ETS.WebUserControls } /// - /// salvo in session che il prox comando è ettaglio commesse... + /// salvo in session che il prox comando è dettaglio commesse... /// /// /// @@ -566,6 +566,15 @@ namespace PROJ_ETS.WebUserControls utils.obj.setSessionVal("nextObjCommand", "dettComm"); } /// + /// salvo in session che il prox comando è dettaglio fasi... + /// + /// + /// + protected void imgDettFasi_Click(object sender, ImageClickEventArgs e) + { + utils.obj.setSessionVal("nextObjCommand", "dettFasi"); + } + /// /// intercetto eventuale update fittizio x rimandare a pagina dett fasi /// /// @@ -582,12 +591,12 @@ namespace PROJ_ETS.WebUserControls utils.obj.emptySessionVal("nextObjCommand"); } // verifico il tipo di richiesta (clona o update normale) + int idxCli = 0; + string nomeCli = ""; switch (_comando) { case "dettComm": // salvo idxCli... - int idxCli = 0; - string nomeCli = ""; try { idxCli = DataProxy_ProjEts.DP.taAP.getByIdxPrj(utils.obj.IntSessionObj("idxProgetto_sel"))[0].idxCliente; @@ -607,6 +616,28 @@ namespace PROJ_ETS.WebUserControls // blocco update! e.Cancel = true; break; + case "dettFasi": + // salvo idxCli... + try + { + idxCli = DataProxy_ProjEts.DP.taAP.getByIdxPrj(utils.obj.IntSessionObj("idxProgetto_sel"))[0].idxCliente; + } + catch + { } + // cerco di recuperare nome cliente... + try + { + nomeCli = DataProxy_ProjEts.DP.taSelCli.getByValue(idxCli)[0].label; + } + catch + { } + utils.obj.setSessionVal("idxCli_sel", idxCli); + utils.obj.setSessionVal("nomeCli_sel", nomeCli); + // blocco update! + e.Cancel = true; + // redirect + Response.Redirect("FasiCommessa"); + break; default: // faccio update! break; diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx index da73cb2..65cb760 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx @@ -25,11 +25,17 @@ - - - +
+ + +
+
+ + +
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx.cs index 5c2b95e..82d6e0d 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesseFull.ascx.cs @@ -582,7 +582,7 @@ namespace PROJ_ETS.WebUserControls } /// - /// salvo in session che il prox comando è ettaglio commesse... + /// salvo in session che il prox comando è dettaglio commesse... /// /// /// @@ -591,6 +591,15 @@ namespace PROJ_ETS.WebUserControls utils.obj.setSessionVal("nextObjCommand", "dettComm"); } /// + /// salvo in session che il prox comando è dettaglio fasi... + /// + /// + /// + protected void imgDettFasi_Click(object sender, ImageClickEventArgs e) + { + utils.obj.setSessionVal("nextObjCommand", "dettFasi"); + } + /// /// salvo in session che il prox comando è ettaglio commesse... /// /// @@ -645,6 +654,28 @@ namespace PROJ_ETS.WebUserControls // redirect Response.Redirect("DatiCommessa"); break; + case "dettFasi": + // salvo idxCli... + try + { + idxCli = DataProxy_ProjEts.DP.taAP.getByIdxPrj(utils.obj.IntSessionObj("idxProgetto_sel"))[0].idxCliente; + } + catch + { } + // cerco di recuperare nome cliente... + try + { + nomeCli = DataProxy_ProjEts.DP.taSelCli.getByValue(idxCli)[0].label; + } + catch + { } + utils.obj.setSessionVal("idxCli_sel", idxCli); + utils.obj.setSessionVal("nomeCli_sel", nomeCli); + // blocco update! + e.Cancel = true; + // redirect + Response.Redirect("FasiCommessa"); + break; case "goProj": // salvo idxCli... try diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx index e3fa2a8..5a2ca2b 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx @@ -1,2 +1,9 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_fasi.ascx.cs" Inherits="PROJ_ETS.WebUserControls.mod_fasi" %> -Elenco Fasi della SINGOLA commessa \ No newline at end of file + +Elenco Fasi della SINGOLA commessa:
+ \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx.designer.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx.designer.cs index 3c2b6a7..4ec06ef 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx.designer.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx.designer.cs @@ -3,15 +3,22 @@ // This code was generated by a tool. // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ -namespace PROJ_ETS.WebUserControls -{ - - - public partial class mod_fasi - { +namespace PROJ_ETS.WebUserControls { + + + public partial class mod_fasi { + + /// + /// imgDemo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Image imgDemo; } } diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll index b43d66a..b0c728b 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 47eee8c..6bfa3a0 100644 Binary files a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll differ