diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo index db724da..b4cb475 100644 Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ diff --git a/WebSCR/WebUserControls/mod_schedaGiorno.ascx b/WebSCR/WebUserControls/mod_schedaGiorno.ascx index fdc8a01..9487bc2 100644 --- a/WebSCR/WebUserControls/mod_schedaGiorno.ascx +++ b/WebSCR/WebUserControls/mod_schedaGiorno.ascx @@ -35,7 +35,6 @@ DataStartField="Inizio" DataEndField="Fine" TimeFormat="Clock24Hours" - CssClassPrefix="calendar_white" ViewType="Day" HeightSpec="BusinessHours" BusinessBeginsHour="8" @@ -47,7 +46,9 @@ EventMoveHandling="CallBack" EventClickHandling="JavaScript" EventClickJavaScript="eventClick(e)" - EventResizeHandling="Disabled"> + EventResizeHandling="Disabled" + Theme="calendar_white" OnBeforeEventRender="DayPilotCalendar1_BeforeEventRender" + > diff --git a/WebSCR/WebUserControls/mod_schedaGiorno.ascx.cs b/WebSCR/WebUserControls/mod_schedaGiorno.ascx.cs index d983e47..e494709 100644 --- a/WebSCR/WebUserControls/mod_schedaGiorno.ascx.cs +++ b/WebSCR/WebUserControls/mod_schedaGiorno.ascx.cs @@ -138,5 +138,15 @@ namespace WebSCR.WebUserControls // resetto sel rbl rblSquadre.SelectedIndex = -1; } + /// + /// intercetto e cambio classe CSS... + /// + /// + /// + protected void DayPilotCalendar1_BeforeEventRender(object sender, DayPilot.Web.Ui.Events.Calendar.BeforeEventRenderEventArgs e) + { + // this assumes your event object in Events collection has "color" field or property + e.BackgroundColor = (string)e.DataItem["CssColor"]; + } } } \ No newline at end of file diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index 8152b97..c77392e 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 feba6e2..5cbed21 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 9f9064d..2327700 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache b/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache index 01fb4c7..b1224ea 100644 Binary files a/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache and b/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache differ diff --git a/WebSCR/obj/Debug/WebSCR.dll b/WebSCR/obj/Debug/WebSCR.dll index feba6e2..5cbed21 100644 Binary files a/WebSCR/obj/Debug/WebSCR.dll and b/WebSCR/obj/Debug/WebSCR.dll differ diff --git a/WebSCR_data/DS_Applicazione.Designer.cs b/WebSCR_data/DS_Applicazione.Designer.cs index d220267..e8a8f87 100644 --- a/WebSCR_data/DS_Applicazione.Designer.cs +++ b/WebSCR_data/DS_Applicazione.Designer.cs @@ -3322,6 +3322,8 @@ namespace WebSCR_data { private global::System.Data.DataColumn columnCodSquadra; + private global::System.Data.DataColumn columnCssColor; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public v_ImpegniCalDataTable() { @@ -3395,6 +3397,14 @@ namespace WebSCR_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn CssColorColumn { + get { + return this.columnCssColor; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -3432,14 +3442,15 @@ namespace WebSCR_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public v_ImpegniCalRow Addv_ImpegniCalRow(string NomeImpegno, System.DateTime Inizio, System.DateTime Fine, string CodSquadra) { + public v_ImpegniCalRow Addv_ImpegniCalRow(string NomeImpegno, System.DateTime Inizio, System.DateTime Fine, string CodSquadra, string CssColor) { v_ImpegniCalRow rowv_ImpegniCalRow = ((v_ImpegniCalRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, NomeImpegno, Inizio, Fine, - CodSquadra}; + CodSquadra, + CssColor}; rowv_ImpegniCalRow.ItemArray = columnValuesArray; this.Rows.Add(rowv_ImpegniCalRow); return rowv_ImpegniCalRow; @@ -3474,6 +3485,7 @@ namespace WebSCR_data { this.columnInizio = base.Columns["Inizio"]; this.columnFine = base.Columns["Fine"]; this.columnCodSquadra = base.Columns["CodSquadra"]; + this.columnCssColor = base.Columns["CssColor"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3489,6 +3501,8 @@ namespace WebSCR_data { base.Columns.Add(this.columnFine); this.columnCodSquadra = new global::System.Data.DataColumn("CodSquadra", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCodSquadra); + this.columnCssColor = new global::System.Data.DataColumn("CssColor", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnCssColor); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnIdxImpegno}, true)); this.columnIdxImpegno.AutoIncrement = true; @@ -3503,6 +3517,8 @@ namespace WebSCR_data { this.columnFine.ReadOnly = true; this.columnCodSquadra.AllowDBNull = false; this.columnCodSquadra.MaxLength = 50; + this.columnCssColor.AllowDBNull = false; + this.columnCssColor.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -5298,6 +5314,17 @@ namespace WebSCR_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string CssColor { + get { + return ((string)(this[this.tablev_ImpegniCal.CssColorColumn])); + } + set { + this[this.tablev_ImpegniCal.CssColorColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsNomeImpegnoNull() { @@ -9265,6 +9292,7 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo tableMapping.ColumnMappings.Add("Inizio", "Inizio"); tableMapping.ColumnMappings.Add("Fine", "Fine"); tableMapping.ColumnMappings.Add("CodSquadra", "CodSquadra"); + tableMapping.ColumnMappings.Add("CssColor", "CssColor"); this._adapter.TableMappings.Add(tableMapping); } diff --git a/WebSCR_data/DS_Applicazione.xsd b/WebSCR_data/DS_Applicazione.xsd index df1c907..6acda5c 100644 --- a/WebSCR_data/DS_Applicazione.xsd +++ b/WebSCR_data/DS_Applicazione.xsd @@ -674,6 +674,7 @@ FROM v_elencoImpegni + @@ -1123,6 +1124,13 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq + + + + + + + diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index 8152b97..c77392e 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 9f9064d..2327700 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/TempPE/DS_Applicazione.Designer.cs.dll b/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll index 54320c3..afb776b 100644 Binary files a/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll and b/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache index 4518ff7..630bf20 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 9f9064d..2327700 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ