diff --git a/VersGen/WebSC.cs b/VersGen/WebSC.cs index f7985ab..527ba83 100644 --- a/VersGen/WebSC.cs +++ b/VersGen/WebSC.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("2.2.123.1106")] -[assembly: AssemblyFileVersion("2.2.123.1106")] +[assembly: AssemblyVersion("2.2.124.1106")] +[assembly: AssemblyFileVersion("2.2.124.1106")] [assembly: AssemblyCopyright("Steamware © 2015-2018")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/WebSC.tt b/VersGen/WebSC.tt index 7fd93d0..a8816e7 100644 --- a/VersGen/WebSC.tt +++ b/VersGen/WebSC.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("2.2.123.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("2.2.123.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("2.2.124.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("2.2.124.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2015-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ diff --git a/WebSCR/WebUserControls/mod_giornata.ascx.cs b/WebSCR/WebUserControls/mod_giornata.ascx.cs index 3b997bb..59fa25d 100644 --- a/WebSCR/WebUserControls/mod_giornata.ascx.cs +++ b/WebSCR/WebUserControls/mod_giornata.ascx.cs @@ -193,14 +193,21 @@ namespace WebSCR.WebUserControls /// protected void DayPilotCalendar1_BeforeEventRender(object sender, DayPilot.Web.Ui.Events.Calendar.BeforeEventRenderEventArgs e) { - try + if (e.DataItem.Source != null) { - // this assumes your event object in Events collection has "color" field or property - e.BackgroundColor = (string)e.DataItem["CssColor"]; + try + { + // this assumes your event object in Events collection has "color" field or property + e.BackgroundColor = (string)e.DataItem["CssColor"]; + } + catch (Exception exc) + { + logger.lg.scriviLog(string.Format("Eccezione in cambio colore evento:{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION); + } } - catch (Exception exc) + else { - logger.lg.scriviLog(string.Format("Eccezione in cambio colore evento:{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION); + logger.lg.scriviLog(string.Format("Eccezione DataItem Nullo:{0}{1}", Environment.NewLine, e.DataItem), tipoLog.EXCEPTION); } } diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index c9b2a3c..b8a8fff 100644 Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ