diff --git a/.vs/WebSCR/v15/.suo b/.vs/WebSCR/v15/.suo index 459a6dd..ed28127 100644 Binary files a/.vs/WebSCR/v15/.suo and b/.vs/WebSCR/v15/.suo differ diff --git a/DataUploader/bin/DataUploader.dll b/DataUploader/bin/DataUploader.dll index 1c151ce..6ddc0b0 100644 Binary files a/DataUploader/bin/DataUploader.dll and b/DataUploader/bin/DataUploader.dll differ diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll index dc34672..1538b34 100644 Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ diff --git a/VersGen/obj/Debug/CoreCompileInputs.cache b/VersGen/obj/Debug/CoreCompileInputs.cache index 6824835..825815e 100644 --- a/VersGen/obj/Debug/CoreCompileInputs.cache +++ b/VersGen/obj/Debug/CoreCompileInputs.cache @@ -1 +1 @@ -2d3c9427aa8165f65d239cfe8bd7f59fd44c28be +d2fa2e673e9f8b4569aec155fc44f26874470cab diff --git a/VersGen/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/VersGen/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index d6f026a..b47a27c 100644 Binary files a/VersGen/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/VersGen/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/VersGen/obj/Debug/VersGen.csproj.FileListAbsolute.txt b/VersGen/obj/Debug/VersGen.csproj.FileListAbsolute.txt index 3c6e3b3..334e002 100644 --- a/VersGen/obj/Debug/VersGen.csproj.FileListAbsolute.txt +++ b/VersGen/obj/Debug/VersGen.csproj.FileListAbsolute.txt @@ -8,3 +8,8 @@ C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\WebSCR\VersG C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\WebSCR\VersGen\obj\Debug\VersGen.csprojResolveAssemblyReference.cache C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\WebSCR\VersGen\obj\Debug\VersGen.dll C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\WebSCR\VersGen\obj\Debug\VersGen.pdb +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\VersGen\bin\Debug\VersGen.dll +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\VersGen\bin\Debug\VersGen.pdb +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\VersGen\obj\Debug\VersGen.csprojResolveAssemblyReference.cache +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\VersGen\obj\Debug\VersGen.dll +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\VersGen\obj\Debug\VersGen.pdb diff --git a/VersGen/obj/Debug/VersGen.csprojResolveAssemblyReference.cache b/VersGen/obj/Debug/VersGen.csprojResolveAssemblyReference.cache index 6a3ff77..e75eafc 100644 Binary files a/VersGen/obj/Debug/VersGen.csprojResolveAssemblyReference.cache and b/VersGen/obj/Debug/VersGen.csprojResolveAssemblyReference.cache differ diff --git a/VersGen/obj/Debug/VersGen.dll b/VersGen/obj/Debug/VersGen.dll index dc34672..1538b34 100644 Binary files a/VersGen/obj/Debug/VersGen.dll and b/VersGen/obj/Debug/VersGen.dll differ diff --git a/WebSCR/Web.config b/WebSCR/Web.config index 0f54c9a..125a533 100644 --- a/WebSCR/Web.config +++ b/WebSCR/Web.config @@ -13,6 +13,7 @@ + diff --git a/WebSCR/WebUserControls/mod_giornata.ascx.cs b/WebSCR/WebUserControls/mod_giornata.ascx.cs index 4aa7e03..160bcde 100644 --- a/WebSCR/WebUserControls/mod_giornata.ascx.cs +++ b/WebSCR/WebUserControls/mod_giornata.ascx.cs @@ -31,9 +31,12 @@ namespace WebSCR.WebUserControls data = Convert.ToDateTime(qsVal("Data")); } DayPilotCalendar1.Days = day2show; -#if false - DayPilotCalendar1.EventMove += DayPilotCalendar1_EventMove; -#endif + // controllo SE si tratta di reload faccio update... + if (memLayer.ML.BoolSessionObj("forceUpdate")) + { + memLayer.ML.setSessionVal("forceUpdate", false); + doUpdate(); + } } @@ -195,8 +198,10 @@ namespace WebSCR.WebUserControls // this assumes your event object in Events collection has "color" field or property e.BackgroundColor = (string)e.DataItem["CssColor"]; } - catch - { } + catch(Exception exc) + { + logger.lg.scriviLog(string.Format("Eccezione in cambio colore evento:{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION); + } } public string matrOp diff --git a/WebSCR/WebUserControls/mod_header.ascx.cs b/WebSCR/WebUserControls/mod_header.ascx.cs index cacf732..8662540 100644 --- a/WebSCR/WebUserControls/mod_header.ascx.cs +++ b/WebSCR/WebUserControls/mod_header.ascx.cs @@ -79,10 +79,10 @@ namespace WebSCR.WebUserControls /// protected void Page_Load(object sender, EventArgs e) { - // verifico se è cambiata pagina, nel qual caso incremento countdown... + // verifico se è cambiata pagina, nel qual caso resetto countdown... if (devicesAuthProxy.pagCorrente != devicesAuthProxy.pagPrecedente) { - countdown = 5; + countdown = memLayer.ML.CRI("baseCountdown"); devicesAuthProxy.pagPrecedente = devicesAuthProxy.pagCorrente; } if (!memLayer.ML.isInSessionObject("USER_NAME")) @@ -314,8 +314,9 @@ namespace WebSCR.WebUserControls } else { - countdown = countdown - 1; - + countdown-=1; + // faccio richiesta update... + memLayer.ML.setSessionVal("forceUpdate", true); } } } diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index 974cd98..27cfc14 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 3ce4e6b..08484ec 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 3e29b02..125a533 100644 --- a/WebSCR/bin/WebSCR.dll.config +++ b/WebSCR/bin/WebSCR.dll.config @@ -1,68 +1,69 @@  - - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebSCR/bin/WebSCR_data.dll b/WebSCR/bin/WebSCR_data.dll index deaa82c..cd7e434 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR/obj/Debug/WebSCR.csproj.FileListAbsolute.txt b/WebSCR/obj/Debug/WebSCR.csproj.FileListAbsolute.txt index 5f4ee59..db4ed72 100644 --- a/WebSCR/obj/Debug/WebSCR.csproj.FileListAbsolute.txt +++ b/WebSCR/obj/Debug/WebSCR.csproj.FileListAbsolute.txt @@ -65,3 +65,41 @@ C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\System.W C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\obj\Debug\WebSCR.csprojResolveAssemblyReference.cache C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\obj\Debug\WebSCR.dll C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\obj\Debug\WebSCR.pdb +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\NLog.config +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\WebSCR.dll.config +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\WebSCR.dll +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\WebSCR.pdb +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\Antlr3.Runtime.dll +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\DayPilot.dll +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\Elmah.dll +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\Microsoft.AspNet.FriendlyUrls.dll +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\Microsoft.AspNet.Web.Optimization.WebForms.dll +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\Microsoft.Web.Infrastructure.dll +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\Microsoft.Web.RedisSessionStateProvider.dll +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\Newtonsoft.Json.dll +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\NLog.dll +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\NLog.Web.dll +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\StackExchange.Redis.dll +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\StackExchange.Redis.StrongName.dll +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\SteamWare.dll +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\System.Web.Optimization.dll +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\WebGrease.dll +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\WebSCR_data.dll +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\ICSharpCode.SharpZipLib.dll +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\SteamWare.pdb +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\SteamWare.xml +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\SteamWare.dll.config +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\WebSCR_data.pdb +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\WebSCR_data.dll.config +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\Antlr3.Runtime.pdb +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\Microsoft.AspNet.FriendlyUrls.xml +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\Microsoft.Web.RedisSessionStateProvider.pdb +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\Newtonsoft.Json.xml +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\NLog.xml +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\NLog.Web.xml +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\StackExchange.Redis.xml +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\StackExchange.Redis.StrongName.xml +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\bin\System.Web.Optimization.xml +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\obj\Debug\WebSCR.csprojResolveAssemblyReference.cache +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\obj\Debug\WebSCR.dll +C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR\obj\Debug\WebSCR.pdb diff --git a/WebSCR_data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/WebSCR_data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 11526ce..dda1c24 100644 Binary files a/WebSCR_data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/WebSCR_data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ