diff --git a/ETS_Data/bin/ETS/ETS_Data.dll b/ETS_Data/bin/ETS/ETS_Data.dll index 6538966..54ee8f1 100644 Binary files a/ETS_Data/bin/ETS/ETS_Data.dll and b/ETS_Data/bin/ETS/ETS_Data.dll differ diff --git a/ETS_Data/obj/ETS/ETS_Data.dll b/ETS_Data/obj/ETS/ETS_Data.dll index 6538966..54ee8f1 100644 Binary files a/ETS_Data/obj/ETS/ETS_Data.dll and b/ETS_Data/obj/ETS/ETS_Data.dll differ diff --git a/PROJ-ETS/PROJ-ETS/FornitoriCommessa.aspx b/PROJ-ETS/PROJ-ETS/FornitoriCommessa.aspx index cb040d8..ee90c5d 100644 --- a/PROJ-ETS/PROJ-ETS/FornitoriCommessa.aspx +++ b/PROJ-ETS/PROJ-ETS/FornitoriCommessa.aspx @@ -1,4 +1,8 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Progetti.master" AutoEventWireup="true" CodeBehind="FornitoriCommessa.aspx.cs" Inherits="PROJ_ETS.FornitoriCommessa" %> + +<%@ Register Src="WebUserControls/mod_filtroComm.ascx" TagName="mod_filtroComm" TagPrefix="uc1" %> +<%@ Register Src="WebUserControls/mod_commForn.ascx" TagName="mod_commForn" TagPrefix="uc2" %> - Fornitori Commessa + + diff --git a/PROJ-ETS/PROJ-ETS/FornitoriCommessa.aspx.cs b/PROJ-ETS/PROJ-ETS/FornitoriCommessa.aspx.cs index fc607e7..9ee3a71 100644 --- a/PROJ-ETS/PROJ-ETS/FornitoriCommessa.aspx.cs +++ b/PROJ-ETS/PROJ-ETS/FornitoriCommessa.aspx.cs @@ -11,7 +11,12 @@ namespace PROJ_ETS { protected void Page_Load(object sender, EventArgs e) { + mod_filtroComm1.eh_nuovoValore += mod_filtroComm1_eh_nuovoValore; + } + void mod_filtroComm1_eh_nuovoValore(object sender, EventArgs e) + { + mod_commForn1.doUpdate(); } } } \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/FornitoriCommessa.aspx.designer.cs b/PROJ-ETS/PROJ-ETS/FornitoriCommessa.aspx.designer.cs index cb844a2..eb54b94 100644 --- a/PROJ-ETS/PROJ-ETS/FornitoriCommessa.aspx.designer.cs +++ b/PROJ-ETS/PROJ-ETS/FornitoriCommessa.aspx.designer.cs @@ -3,15 +3,31 @@ // 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 FornitoriCommessa - { +namespace PROJ_ETS { + + + public partial class FornitoriCommessa { + + /// + /// mod_filtroComm1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::PROJ_ETS.WebUserControls.mod_filtroComm mod_filtroComm1; + + /// + /// mod_commForn1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::PROJ_ETS.WebUserControls.mod_commForn mod_commForn1; } } diff --git a/PROJ-ETS/PROJ-ETS/IntegrazioniCommessa.aspx b/PROJ-ETS/PROJ-ETS/IntegrazioniCommessa.aspx index b6af76c..be2a3cf 100644 --- a/PROJ-ETS/PROJ-ETS/IntegrazioniCommessa.aspx +++ b/PROJ-ETS/PROJ-ETS/IntegrazioniCommessa.aspx @@ -1,3 +1,7 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Progetti.master" AutoEventWireup="true" CodeBehind="IntegrazioniCommessa.aspx.cs" Inherits="PROJ_ETS.IntegrazioniCommessa" %> +<%@ Register src="WebUserControls/mod_filtroComm.ascx" tagname="mod_filtroComm" tagprefix="uc1" %> +<%@ Register src="WebUserControls/mod_commInteg.ascx" tagname="mod_commInteg" tagprefix="uc2" %> + + diff --git a/PROJ-ETS/PROJ-ETS/IntegrazioniCommessa.aspx.cs b/PROJ-ETS/PROJ-ETS/IntegrazioniCommessa.aspx.cs index 639f0b6..29b1484 100644 --- a/PROJ-ETS/PROJ-ETS/IntegrazioniCommessa.aspx.cs +++ b/PROJ-ETS/PROJ-ETS/IntegrazioniCommessa.aspx.cs @@ -11,7 +11,12 @@ namespace PROJ_ETS { protected void Page_Load(object sender, EventArgs e) { + mod_filtroComm1.eh_nuovoValore += mod_filtroComm1_eh_nuovoValore; + } + void mod_filtroComm1_eh_nuovoValore(object sender, EventArgs e) + { + mod_commInteg1.doUpdate(); } } } \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/IntegrazioniCommessa.aspx.designer.cs b/PROJ-ETS/PROJ-ETS/IntegrazioniCommessa.aspx.designer.cs index 1a15ae7..7af89f9 100644 --- a/PROJ-ETS/PROJ-ETS/IntegrazioniCommessa.aspx.designer.cs +++ b/PROJ-ETS/PROJ-ETS/IntegrazioniCommessa.aspx.designer.cs @@ -3,15 +3,31 @@ // 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 IntegrazioniCommessa - { +namespace PROJ_ETS { + + + public partial class IntegrazioniCommessa { + + /// + /// mod_filtroComm1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::PROJ_ETS.WebUserControls.mod_filtroComm mod_filtroComm1; + + /// + /// mod_commInteg1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::PROJ_ETS.WebUserControls.mod_commInteg mod_commInteg1; } } diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commForn.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commForn.ascx.cs index 4551b1e..1bdfe85 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commForn.ascx.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commForn.ascx.cs @@ -39,5 +39,13 @@ namespace PROJ_ETS.WebUserControls eh_nuovoValore(this, new EventArgs()); } } + + /// + /// effettua update selezione + /// + public void doUpdate() + { + grView.DataBind(); + } } } \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commInteg.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commInteg.ascx.cs index e7679c1..4cfd268 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commInteg.ascx.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commInteg.ascx.cs @@ -38,5 +38,13 @@ namespace PROJ_ETS.WebUserControls eh_nuovoValore(this, new EventArgs()); } } + + /// + /// effettua update selezione + /// + public void doUpdate() + { + grView.DataBind(); + } } } \ 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 d1f92e6..6656931 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx @@ -287,7 +287,7 @@ -
+<%--
    @@ -302,5 +302,5 @@
-
+--%>
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.designer.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.designer.cs index 86531d2..3a52a76 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.designer.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.designer.cs @@ -29,23 +29,5 @@ namespace PROJ_ETS.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource ods; - - /// - /// mod_commInteg1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::PROJ_ETS.WebUserControls.mod_commInteg mod_commInteg1; - - /// - /// mod_commForn1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::PROJ_ETS.WebUserControls.mod_commForn mod_commForn1; } } diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll index 6538966..54ee8f1 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 737bc7b..95c128c 100644 Binary files a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll differ