diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo index aa5b88c..da3b221 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 7d78f6d..d5a1069 100644 Binary files a/DataUploader/bin/DataUploader.dll and b/DataUploader/bin/DataUploader.dll differ diff --git a/VersGen/WebSC.cs b/VersGen/WebSC.cs index 2ef386a..f22f5e0 100644 --- a/VersGen/WebSC.cs +++ b/VersGen/WebSC.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.3.041.153")] -[assembly: AssemblyFileVersion("1.3.041.153")] +[assembly: AssemblyVersion("1.4.049.156")] +[assembly: AssemblyFileVersion("1.4.049.156")] [assembly: AssemblyCopyright("Steamware © 2015-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/WebSC.tt b/VersGen/WebSC.tt index afc9308..7c03f8a 100644 --- a/VersGen/WebSC.tt +++ b/VersGen/WebSC.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("1.3.041.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("1.3.041.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("1.4.049.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("1.4.049.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2015-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ diff --git a/VersGen/bin/Release/VersGen.dll b/VersGen/bin/Release/VersGen.dll index d6ca6b0..03a07e4 100644 Binary files a/VersGen/bin/Release/VersGen.dll and b/VersGen/bin/Release/VersGen.dll differ diff --git a/VersGen/obj/Release/TempPE/WebSC.cs.dll b/VersGen/obj/Release/TempPE/WebSC.cs.dll index 2b8d294..e0277a5 100644 Binary files a/VersGen/obj/Release/TempPE/WebSC.cs.dll and b/VersGen/obj/Release/TempPE/WebSC.cs.dll differ diff --git a/VersGen/obj/Release/VersGen.dll b/VersGen/obj/Release/VersGen.dll index d6ca6b0..03a07e4 100644 Binary files a/VersGen/obj/Release/VersGen.dll and b/VersGen/obj/Release/VersGen.dll differ diff --git a/WebSCR/Web.config b/WebSCR/Web.config index 7fc5df6..bc3e72d 100644 --- a/WebSCR/Web.config +++ b/WebSCR/Web.config @@ -87,6 +87,7 @@ --> + diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs index 1bbe3b9..1afa3a7 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs @@ -84,6 +84,7 @@ namespace WebSCR.WebUserControls mod_impegno.Visible = false; mod_fileImpegno.Visible = false; mod_fileUpload.Visible = false; + mod_compSquadra.Visible = false; if (qsVal("Data") != "") { if (qsVal("IdxImpegno") != "") @@ -95,6 +96,7 @@ namespace WebSCR.WebUserControls mod_dettInt.Visible = true; mod_fileImpegno.Visible = true; mod_fileUpload.Visible = true; + mod_compSquadra.Visible = true; } else { @@ -108,9 +110,17 @@ namespace WebSCR.WebUserControls // metto in sessione squadra sel int idxImpegno = 0; string CodSquadra = ""; - DateTime DataImp = Convert.ToDateTime(memLayer.ML.StringSessionObj("DataRif")); + DateTime DataImp = DateTime.Now; try { + if (memLayer.ML.isInSessionObject("DataRif")) + { + DataImp = Convert.ToDateTime(memLayer.ML.StringSessionObj("DataRif")); + } + else if (memLayer.ML.getCookieVal("DataRif") != "") + { + DataImp = Convert.ToDateTime(memLayer.ML.getCookieVal("DataRif")); + } idxImpegno = Convert.ToInt32(qsVal("IdxImpegno")); DS_Applicazione.ImpegniRow rigaImp = DtProxy.man.taImp.getByKey(idxImpegno)[0]; CodSquadra = rigaImp.CodSquadra; diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index 3bd4645..ebfe80c 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 09593a8..f6f61bb 100644 Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ diff --git a/WebSCR/bin/WebSCR.dll.config b/WebSCR/bin/WebSCR.dll.config index 7fc5df6..bc3e72d 100644 --- a/WebSCR/bin/WebSCR.dll.config +++ b/WebSCR/bin/WebSCR.dll.config @@ -87,6 +87,7 @@ --> + diff --git a/WebSCR/bin/WebSCR_data.dll b/WebSCR/bin/WebSCR_data.dll index 6fb08da..e8f2959 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index 3bd4645..ccc02c3 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 6fb08da..9aa5e9f 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 5e44f1d..9369a14 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 6fb08da..9aa5e9f 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ