diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo index 6c7a4d5..c791c87 100644 Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ diff --git a/VersGen/WebSC.cs b/VersGen/WebSC.cs index ae3a0f2..550a956 100644 --- a/VersGen/WebSC.cs +++ b/VersGen/WebSC.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.9.062.190")] -[assembly: AssemblyFileVersion("1.9.062.190")] +[assembly: AssemblyVersion("1.9.063.191")] +[assembly: AssemblyFileVersion("1.9.063.191")] [assembly: AssemblyCopyright("Steamware © 2015-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/WebSC.tt b/VersGen/WebSC.tt index be5c5ad..6a7c35f 100644 --- a/VersGen/WebSC.tt +++ b/VersGen/WebSC.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("1.9.062.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("1.9.062.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("1.9.063.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("1.9.063.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2015-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ diff --git a/VersGen/obj/Release/TempPE/WebSC.cs.dll b/VersGen/obj/Release/TempPE/WebSC.cs.dll index 8409ce4..90be449 100644 Binary files a/VersGen/obj/Release/TempPE/WebSC.cs.dll and b/VersGen/obj/Release/TempPE/WebSC.cs.dll differ diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs index 70076db..95ed51d 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs @@ -163,6 +163,8 @@ namespace WebSCR.WebUserControls { //adesso = Convert.ToDateTime(memLayer.ML.StringSessionObj("DataRif")); adesso = Convert.ToDateTime(mod_filtroPeriodo.dataFrom); + // salvo!!! + memLayer.ML.setSessionVal("DataRif", adesso); } catch { } diff --git a/WebSCR/WebUserControls/mod_selData.ascx.cs b/WebSCR/WebUserControls/mod_selData.ascx.cs index 595f48d..2ff837b 100644 --- a/WebSCR/WebUserControls/mod_selData.ascx.cs +++ b/WebSCR/WebUserControls/mod_selData.ascx.cs @@ -102,7 +102,7 @@ namespace WebSCR.WebUserControls } catch { - answ = Convert.ToDateTime(txtDataRif.Text); + if (txtDataRif.Text != "") answ = Convert.ToDateTime(txtDataRif.Text); } return answ; } diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index 2a4cbde..b27499d 100644 Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ