diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo index 9bc234c..ff8bdd7 100644 Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ diff --git a/DataUploader/bin/DataUploader.dll b/DataUploader/bin/DataUploader.dll index 8f37073..d5a1069 100644 Binary files a/DataUploader/bin/DataUploader.dll and b/DataUploader/bin/DataUploader.dll differ diff --git a/VersGen/bin/Release/VersGen.dll b/VersGen/bin/Release/VersGen.dll index 1e844b1..d6ca6b0 100644 Binary files a/VersGen/bin/Release/VersGen.dll and b/VersGen/bin/Release/VersGen.dll differ diff --git a/VersGen/obj/Release/VersGen.dll b/VersGen/obj/Release/VersGen.dll index 1e844b1..d6ca6b0 100644 Binary files a/VersGen/obj/Release/VersGen.dll and b/VersGen/obj/Release/VersGen.dll differ diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs index 487cbc8..1bbe3b9 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs @@ -48,7 +48,15 @@ namespace WebSCR.WebUserControls /// void mod_filtroPeriodo_eh_selData(object sender, EventArgs e) { - refreshDetail(); + DateTime adesso = DateTime.Now; + try + { + adesso = Convert.ToDateTime(mod_filtroPeriodo.dataFrom); + } + catch + { } + Response.Redirect(string.Format("{0}?Data={1:yyyy-MM-dd}", devicesAuthProxy.pagCorrente, adesso)); + //refreshDetail(); } /// /// recupera valore querystring @@ -137,6 +145,19 @@ namespace WebSCR.WebUserControls /// private void refreshDetail() { + // ricarica eventuale data se in cookie e non in URL... + if (qsVal("Data") == "") + { + DateTime adesso = DateTime.Now; + try + { + //adesso = Convert.ToDateTime(memLayer.ML.StringSessionObj("DataRif")); + adesso = Convert.ToDateTime(mod_filtroPeriodo.dataFrom); + } + catch + { } + Response.Redirect(string.Format("{0}?Data={1:yyyy-MM-dd}", devicesAuthProxy.pagCorrente, adesso)); + } mod_dispPeriodo.DataFrom = mod_filtroPeriodo.dataFrom.ToString("yyyy-MM-dd"); mod_dispPeriodo.NumGG = mod_filtroPeriodo.numGG.ToString(); mod_dispPeriodo.Zona = mod_filtroZona.Zona; @@ -144,5 +165,6 @@ namespace WebSCR.WebUserControls mod_impegno.doUpdate(); mod_dettInt.doUpdate(); } + } } \ No newline at end of file diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index 1798668..0bd5d73 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 aae618a..e8f2959 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR_data/bin/Release/WebSCR_data.dll b/WebSCR_data/bin/Release/WebSCR_data.dll index aae618a..e8f2959 100644 Binary files a/WebSCR_data/bin/Release/WebSCR_data.dll and b/WebSCR_data/bin/Release/WebSCR_data.dll differ diff --git a/WebSCR_data/obj/Release/WebSCR_data.dll b/WebSCR_data/obj/Release/WebSCR_data.dll index aae618a..e8f2959 100644 Binary files a/WebSCR_data/obj/Release/WebSCR_data.dll and b/WebSCR_data/obj/Release/WebSCR_data.dll differ