diff --git a/.vs/WebSCR/v15/.suo b/.vs/WebSCR/v15/.suo index 23ed8a8..b73251a 100644 Binary files a/.vs/WebSCR/v15/.suo and b/.vs/WebSCR/v15/.suo differ diff --git a/VersGen/WebSC.cs b/VersGen/WebSC.cs index ea15186..d20bae6 100644 --- a/VersGen/WebSC.cs +++ b/VersGen/WebSC.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("2.1.109.930")] -[assembly: AssemblyFileVersion("2.1.109.930")] -[assembly: AssemblyCopyright("Steamware © 2015-2017")] +[assembly: AssemblyVersion("2.2.120.1106")] +[assembly: AssemblyFileVersion("2.2.120.1106")] +[assembly: AssemblyCopyright("Steamware © 2015-2018")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/WebSC.tt b/VersGen/WebSC.tt index 0eb72b8..a32dc33 100644 --- a/VersGen/WebSC.tt +++ b/VersGen/WebSC.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("2.1.109.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("2.1.109.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("2.2.120.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("2.2.120.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2015-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll index 4c93a46..fec879d 100644 Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ diff --git a/VersGen/obj/Debug/TempPE/WebSC.cs.dll b/VersGen/obj/Debug/TempPE/WebSC.cs.dll index 5e02241..6683b39 100644 Binary files a/VersGen/obj/Debug/TempPE/WebSC.cs.dll and b/VersGen/obj/Debug/TempPE/WebSC.cs.dll differ diff --git a/VersGen/obj/Debug/VersGen.dll b/VersGen/obj/Debug/VersGen.dll index 4c93a46..fec879d 100644 Binary files a/VersGen/obj/Debug/VersGen.dll and b/VersGen/obj/Debug/VersGen.dll differ diff --git a/WebSCR/WebUserControls/mod_dettInt.ascx.cs b/WebSCR/WebUserControls/mod_dettInt.ascx.cs index 1644a62..928e689 100644 --- a/WebSCR/WebUserControls/mod_dettInt.ascx.cs +++ b/WebSCR/WebUserControls/mod_dettInt.ascx.cs @@ -93,7 +93,10 @@ namespace WebSCR.WebUserControls } protected void Page_Load(object sender, EventArgs e) { - doUpdate(); + if (!Page.IsPostBack) + { + doUpdate(); + } } /// /// aggiunge il task corrente all'elenco dei task... @@ -231,14 +234,16 @@ namespace WebSCR.WebUserControls protected void odsDettInt_Updating(object sender, ObjectDataSourceMethodEventArgs e) { e.InputParameters["UserMod"] = user_std.UtSn.userNameAD; - e.InputParameters["Note"] = e.InputParameters["Note"].ToString().Trim(); e.InputParameters["MatrOp"] = matrOp; + if (e.InputParameters["Note"] is null) + { + e.InputParameters["Note"] = ""; + } } protected void odsDettInt_Deleting(object sender, ObjectDataSourceMethodEventArgs e) { e.InputParameters["UserMod"] = user_std.UtSn.userNameAD; - e.InputParameters["Note"] = e.InputParameters["Note"].ToString().Trim(); e.InputParameters["MatrOp"] = matrOp; } diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index b00ae28..431dd7e 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 9f0a0c6..113279b 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR_data/bin/Debug/WebSCR_data.dll b/WebSCR_data/bin/Debug/WebSCR_data.dll index 9f0a0c6..113279b 100644 Binary files a/WebSCR_data/bin/Debug/WebSCR_data.dll and b/WebSCR_data/bin/Debug/WebSCR_data.dll differ