diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo index d652e62..f68950f 100644 Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ diff --git a/WebSCR/WebSCR.csproj b/WebSCR/WebSCR.csproj index 36f7478..ce59ccb 100644 --- a/WebSCR/WebSCR.csproj +++ b/WebSCR/WebSCR.csproj @@ -349,6 +349,7 @@ + @@ -491,6 +492,13 @@ mod_dettImpegno.ascx + + mod_dettInt.ascx + ASPXCodeBehind + + + mod_dettInt.ascx + mod_elencoClienti.ascx ASPXCodeBehind diff --git a/WebSCR/WebUserControls/mod_dettImpegno.ascx b/WebSCR/WebUserControls/mod_dettImpegno.ascx index 0504ba7..89a9ac8 100644 --- a/WebSCR/WebUserControls/mod_dettImpegno.ascx +++ b/WebSCR/WebUserControls/mod_dettImpegno.ascx @@ -1,4 +1,6 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_dettImpegno.ascx.cs" Inherits="WebSCR.WebUserControls.mod_dettImpegno" %> +<%@ Register Src="~/WebUserControls/mod_dettInt.ascx" TagPrefix="uc1" TagName="mod_dettInt" %> +
    @@ -235,97 +237,7 @@
  • -
    -
    - - -
    -
    - - - - - - - - - - - - - - - - Nessun Task - - - <%-- - - - -
    - -
    -     - - - -     --%> - - <%-- -
    - -
    - note: - -
    -
    -     --%> - -
    -
    - -
    -
    - ,  - -
    - <%--
    - note: - -
    --%> -
    -     -     - - - - - <%-- - - --%> - - - -     -     - - - - - - - - - - - - - - - - - +
diff --git a/WebSCR/WebUserControls/mod_dettImpegno.ascx.cs b/WebSCR/WebUserControls/mod_dettImpegno.ascx.cs index 7c86382..c8e0b73 100644 --- a/WebSCR/WebUserControls/mod_dettImpegno.ascx.cs +++ b/WebSCR/WebUserControls/mod_dettImpegno.ascx.cs @@ -11,6 +11,12 @@ namespace WebSCR.WebUserControls public partial class mod_dettImpegno : System.Web.UI.UserControl { protected void Page_Load(object sender, EventArgs e) + { + doUpdate(); + mod_dettInt.eh_update += mod_dettInt_eh_update; + } + + void mod_dettInt_eh_update(object sender, EventArgs e) { doUpdate(); } @@ -34,8 +40,8 @@ namespace WebSCR.WebUserControls private void doUpdate() { - grViewDettInt.DataBind(); frmView.DataBind(); + mod_dettInt.doUpdate(); } /// /// recupera valore querystring @@ -69,34 +75,6 @@ namespace WebSCR.WebUserControls e.InputParameters["UserMod"] = SteamWare.user_std.UtSn.userNameAD; } } - /// - /// aggiunge il task corrente all'elenco dei task... - /// - /// - /// - protected void lbAdd_Click(object sender, EventArgs e) - { - DtProxy.man.taDetImp.insertQuery(idxImpegno, ddlTipoCons.SelectedValue); - doUpdate(); - } - - protected void odsDettInt_Deleted(object sender, ObjectDataSourceStatusEventArgs e) - { - doUpdate(); - } - - protected void odsDettInt_Updated(object sender, ObjectDataSourceStatusEventArgs e) - { - doUpdate(); - } - - protected void odsDettInt_Updating(object sender, ObjectDataSourceMethodEventArgs e) - { - // recupero valori consegna e note... - e.InputParameters["CodConsegna"] = ((DropDownList)grViewDettInt.Rows[grViewDettInt.EditIndex].FindControl("ddlTipoCons")).SelectedValue; - e.InputParameters["Note"] = ((TextBox)grViewDettInt.Rows[grViewDettInt.EditIndex].FindControl("txtNote")).Text; - } - } } \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_dettImpegno.ascx.designer.cs b/WebSCR/WebUserControls/mod_dettImpegno.ascx.designer.cs index ec4ffde..24439c6 100644 --- a/WebSCR/WebUserControls/mod_dettImpegno.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_dettImpegno.ascx.designer.cs @@ -49,48 +49,12 @@ namespace WebSCR.WebUserControls { protected global::System.Web.UI.WebControls.ObjectDataSource odsOrario; /// - /// lbAdd control. + /// mod_dettInt control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.LinkButton lbAdd; - - /// - /// ddlTipoCons control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.DropDownList ddlTipoCons; - - /// - /// odsTipoCons control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ObjectDataSource odsTipoCons; - - /// - /// grViewDettInt control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.GridView grViewDettInt; - - /// - /// odsDettInt control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ObjectDataSource odsDettInt; + protected global::WebSCR.WebUserControls.mod_dettInt mod_dettInt; } } diff --git a/WebSCR/WebUserControls/mod_dettInt.ascx b/WebSCR/WebUserControls/mod_dettInt.ascx new file mode 100644 index 0000000..046095e --- /dev/null +++ b/WebSCR/WebUserControls/mod_dettInt.ascx @@ -0,0 +1,88 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_dettInt.ascx.cs" Inherits="WebSCR.WebUserControls.mod_dettInt" %> +
+
+ + +
+
+ + + + + + + + + + + + + + + + Nessun Task + + + <%-- + + + +
+ +
+ + + + + --%> + + <%-- +
+ +
+ note: + +
+
+ --%> + +
+
+ +
+
+ ,  + +
+ <%--
+ note: + +
--%> +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebSCR/WebUserControls/mod_dettInt.ascx.cs b/WebSCR/WebUserControls/mod_dettInt.ascx.cs new file mode 100644 index 0000000..ec1fe84 --- /dev/null +++ b/WebSCR/WebUserControls/mod_dettInt.ascx.cs @@ -0,0 +1,98 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using WebSCR_data; + +namespace WebSCR.WebUserControls +{ + public partial class mod_dettInt : System.Web.UI.UserControl + { + public event EventHandler eh_update; + /// + /// solleva evento selezione data + /// + protected void reportEvent() + { + // evento! + if (eh_update != null) + { + eh_update(this, new EventArgs()); + } + } + /// + /// impegno corrente + /// + public int idxImpegno + { + get + { + int answ = 0; + try + { + answ = Convert.ToInt32(qsVal("IdxImpegno")); + } + catch + { } + return answ; + } + } + /// + /// recupera valore querystring + /// + /// + /// + protected string qsVal(string nome) + { + string answ = ""; + try + { + answ = Request.QueryString[nome].ToString(); + } + catch + { } + return answ; + } + protected void Page_Load(object sender, EventArgs e) + { + + } + /// + /// aggiunge il task corrente all'elenco dei task... + /// + /// + /// + protected void lbAdd_Click(object sender, EventArgs e) + { + DtProxy.man.taDetImp.insertQuery(idxImpegno, ddlTipoCons.SelectedValue); + //doUpdate(); + reportEvent(); + } + + protected void odsDettInt_Deleted(object sender, ObjectDataSourceStatusEventArgs e) + { + //doUpdate(); + reportEvent(); + } + + protected void odsDettInt_Updated(object sender, ObjectDataSourceStatusEventArgs e) + { + //doUpdate(); + reportEvent(); + } + public void doUpdate() + { + grViewDettInt.DataBind(); + } + protected void odsDettInt_Updating(object sender, ObjectDataSourceMethodEventArgs e) + { +#if false + // recupero valori consegna e note... + e.InputParameters["CodConsegna"] = ((DropDownList)grViewDettInt.Rows[grViewDettInt.EditIndex].FindControl("ddlTipoCons")).SelectedValue; + e.InputParameters["Note"] = ((TextBox)grViewDettInt.Rows[grViewDettInt.EditIndex].FindControl("txtNote")).Text; +#endif + } + } +} \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_dettInt.ascx.designer.cs b/WebSCR/WebUserControls/mod_dettInt.ascx.designer.cs new file mode 100644 index 0000000..2a3fcfa --- /dev/null +++ b/WebSCR/WebUserControls/mod_dettInt.ascx.designer.cs @@ -0,0 +1,60 @@ +//------------------------------------------------------------------------------ +// +// 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 WebSCR.WebUserControls { + + + public partial class mod_dettInt { + + /// + /// lbAdd control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbAdd; + + /// + /// ddlTipoCons control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList ddlTipoCons; + + /// + /// odsTipoCons control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsTipoCons; + + /// + /// grViewDettInt control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.GridView grViewDettInt; + + /// + /// odsDettInt control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsDettInt; + } +} diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index 3999063..ef100ba 100644 Binary files a/WebSCR/bin/SteamWare.dll and b/WebSCR/bin/SteamWare.dll differ diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index 16ad2a6..8ee5d34 100644 Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ diff --git a/WebSCR/bin/WebSCR_data.dll b/WebSCR/bin/WebSCR_data.dll index 7e3e20a..91cb1f0 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/WebSCR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 7fc0109..29a51e2 100644 Binary files a/WebSCR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/WebSCR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache b/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache index 7688271..5de8918 100644 Binary files a/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache and b/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache differ diff --git a/WebSCR/obj/Debug/WebSCR.dll b/WebSCR/obj/Debug/WebSCR.dll index 16ad2a6..8ee5d34 100644 Binary files a/WebSCR/obj/Debug/WebSCR.dll and b/WebSCR/obj/Debug/WebSCR.dll differ diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index 3999063..ef100ba 100644 Binary files a/WebSCR_data/bin/Debug/SteamWare.dll and b/WebSCR_data/bin/Debug/SteamWare.dll differ diff --git a/WebSCR_data/bin/Debug/WebSCR_data.dll b/WebSCR_data/bin/Debug/WebSCR_data.dll index 7e3e20a..91cb1f0 100644 Binary files a/WebSCR_data/bin/Debug/WebSCR_data.dll and b/WebSCR_data/bin/Debug/WebSCR_data.dll differ diff --git a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache index 0a9d71b..968ab3b 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache and b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache differ diff --git a/WebSCR_data/obj/Debug/WebSCR_data.dll b/WebSCR_data/obj/Debug/WebSCR_data.dll index 7e3e20a..91cb1f0 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ