diff --git a/ETS_Data/obj/Debug/ETS_Data.dll b/ETS_Data/obj/Debug/ETS_Data.dll index 0ef28cc..aea1691 100644 Binary files a/ETS_Data/obj/Debug/ETS_Data.dll and b/ETS_Data/obj/Debug/ETS_Data.dll differ diff --git a/PROJ-ETS/PROJ-ETS/DatiCommessa.aspx b/PROJ-ETS/PROJ-ETS/DatiCommessa.aspx index 29e234f..06b26ea 100644 --- a/PROJ-ETS/PROJ-ETS/DatiCommessa.aspx +++ b/PROJ-ETS/PROJ-ETS/DatiCommessa.aspx @@ -1,4 +1,6 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Progetti.master" AutoEventWireup="true" CodeBehind="DatiCommessa.aspx.cs" Inherits="PROJ_ETS.DatiCommessa" %> + +<%@ Register Src="WebUserControls/mod_datiComm.ascx" TagName="mod_datiComm" TagPrefix="uc1" %> - gestione dettaglio commessa + diff --git a/PROJ-ETS/PROJ-ETS/DatiCommessa.aspx.designer.cs b/PROJ-ETS/PROJ-ETS/DatiCommessa.aspx.designer.cs index 8449520..35f7dfe 100644 --- a/PROJ-ETS/PROJ-ETS/DatiCommessa.aspx.designer.cs +++ b/PROJ-ETS/PROJ-ETS/DatiCommessa.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 DatiCommessa - { +namespace PROJ_ETS { + + + public partial class DatiCommessa { + + /// + /// mod_datiComm1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::PROJ_ETS.WebUserControls.mod_datiComm mod_datiComm1; } } diff --git a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj index cc2674e..5f70256 100644 --- a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj +++ b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj @@ -284,6 +284,7 @@ + @@ -474,6 +475,13 @@ mod_commesse.ascx + + mod_datiComm.ascx + ASPXCodeBehind + + + mod_datiComm.ascx + mod_fasi.ascx ASPXCodeBehind diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx index 5df3b68..db3923b 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx @@ -2,7 +2,7 @@
+ OnSelectedIndexChanged="grView_SelectedIndexChanged" PageSize="20" OnRowUpdating="grView_RowUpdating"> @@ -16,13 +16,15 @@ + ToolTip="Aggiungi una nuova commessa al progetto" Visible='<%# isWritable() && enableNewFromEmpty %>' Width="200px" /> + @@ -37,7 +39,7 @@ - +
@@ -149,7 +151,7 @@ CommandArgument='<%# Eval("idxFase") %>' OnClick="btnNew_Click" ToolTip="Aggiungi Fase a commessa" Visible='<%# isAncestor(Eval("idxFaseAncest")) %>' />   + ImageUrl="../images/elimina_m.png" ToolTip="Delete" Visible='<%# delEnabled(Eval("idxFase")) %>' OnClientClick="return confirm('Confermi eliminazione record?')" />
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs index a492e72..4cdb8bb 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs @@ -522,7 +522,64 @@ namespace PROJ_ETS.WebUserControls { } + /// + /// salvo in session che il prox comando è ettaglio commesse... + /// + /// + /// + protected void imgDettComm_Click(object sender, ImageClickEventArgs e) + { + utils.obj.setSessionVal("nextObjCommand", "dettComm"); + } + /// + /// intercetto eventuale update fittizio x rimandare a pagina dett fasi + /// + /// + /// + protected void grView_RowUpdating(object sender, GridViewUpdateEventArgs e) + { + // salvo progetto sel + utils.obj.setSessionVal("idxFase_sel", e.Keys["idxFase"]); + // quale comando? + string _comando = ""; + if (utils.obj.isInSessionObject("nextObjCommand")) + { + _comando = utils.obj.StringSessionObj("nextObjCommand"); + utils.obj.emptySessionVal("nextObjCommand"); + } + // verifico il tipo di richiesta (clona o update normale) + 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; + } + 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); + Response.Redirect("DatiCommessa"); + // blocco update! + e.Cancel = true; + break; + default: + // faccio update! + break; + } + } #endregion + } } \ 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 new file mode 100644 index 0000000..56863a7 --- /dev/null +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx @@ -0,0 +1,3 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_datiComm.ascx.cs" Inherits="PROJ_ETS.WebUserControls.mod_datiComm" %> +dati dettaglio commessa +anno, num... \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.cs new file mode 100644 index 0000000..d2b5c8a --- /dev/null +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace PROJ_ETS.WebUserControls +{ + public partial class mod_datiComm : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.designer.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.designer.cs new file mode 100644 index 0000000..0eaa3f8 --- /dev/null +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace PROJ_ETS.WebUserControls +{ + + + public partial class mod_datiComm + { + } +} diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx.cs index 7fd168e..e1c0da8 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx.cs @@ -279,7 +279,7 @@ namespace PROJ_ETS.WebUserControls grView.DataBind(); } /// - /// salvo in session che il prox comando è clonare... + /// salvo in session che il prox comando è dettaglio fasi... /// /// /// diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll index 0ef28cc..aea1691 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 0a7670f..6e0296d 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/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 0f592af..4606ca6 100644 Binary files a/PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache index f22baed..75d1776 100644 Binary files a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache and b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache differ diff --git a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll index 0a7670f..6e0296d 100644 Binary files a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll differ