diff --git a/.github/workflows/check-repos-updates.sh b/.github/workflows/check-repos-updates.sh index 3cfd671..6f45304 100755 --- a/.github/workflows/check-repos-updates.sh +++ b/.github/workflows/check-repos-updates.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash echo "Stage1 Find Updates" LATEST_RELEASE=$(curl -s https://api.github.com/repos/telerik/kendo-ui-core/releases | grep tag_name | head -n 1 | cut -d '"' -f 4) -LATEST_THEMES_RELEASE=$(curl -s https://api.github.com/repos/telerik/kendo-themes/releases | grep -B4 '"prerelease": false' | head -1 | cut -d '"' -f 4 | tr -d v) +LATEST_THEMES_RELEASE=$(curl -s https://api.github.com/repos/telerik/kendo-themes/releases | jq -r '[.[] | select(.prerelease == false)][0].name' | tr -d v) echo "Last release version is $LATEST_RELEASE" echo "Last Themes release version is $LATEST_THEMES_RELEASE" diff --git a/Kendo-UI-Bootstrap-Integration/src/Kendo-UI-Bootstrap-Integration/Kendo-UI-Bootstrap-Integration.csproj b/Kendo-UI-Bootstrap-Integration/src/Kendo-UI-Bootstrap-Integration/Kendo-UI-Bootstrap-Integration.csproj index d984bd5..73197b8 100644 --- a/Kendo-UI-Bootstrap-Integration/src/Kendo-UI-Bootstrap-Integration/Kendo-UI-Bootstrap-Integration.csproj +++ b/Kendo-UI-Bootstrap-Integration/src/Kendo-UI-Bootstrap-Integration/Kendo-UI-Bootstrap-Integration.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 true Kendo-UI-Bootstrap-Integration Kendo-UI-Bootstrap-Integration @@ -16,18 +16,18 @@ - + - - - - - + + + + + - + diff --git a/Kendo-UI-Bootstrap-Integration/src/Kendo-UI-Bootstrap-Integration/Models/Task.cs b/Kendo-UI-Bootstrap-Integration/src/Kendo-UI-Bootstrap-Integration/Models/Task.cs index 4a89fee..2ce61b0 100644 --- a/Kendo-UI-Bootstrap-Integration/src/Kendo-UI-Bootstrap-Integration/Models/Task.cs +++ b/Kendo-UI-Bootstrap-Integration/src/Kendo-UI-Bootstrap-Integration/Models/Task.cs @@ -10,7 +10,7 @@ public Task() this.Tasks1 = new HashSet(); } - public int TaskID { get; set; } + public int MeetingID { get; set; } public System.DateTime Start { get; set; } public System.DateTime End { get; set; } public string Title { get; set; } diff --git a/Kendo-UI-Bootstrap-Integration/src/Kendo-UI-Bootstrap-Integration/Models/TaskViewModel.cs b/Kendo-UI-Bootstrap-Integration/src/Kendo-UI-Bootstrap-Integration/Models/TaskViewModel.cs index 80bf647..b33b233 100644 --- a/Kendo-UI-Bootstrap-Integration/src/Kendo-UI-Bootstrap-Integration/Models/TaskViewModel.cs +++ b/Kendo-UI-Bootstrap-Integration/src/Kendo-UI-Bootstrap-Integration/Models/TaskViewModel.cs @@ -8,7 +8,7 @@ public class TaskViewModel : ISchedulerEvent { - public int TaskID { get; set; } + public int MeetingID { get; set; } public string Title { get; set; } public string Description { get; set; } @@ -52,7 +52,7 @@ public Task ToEntity() { return new Task { - TaskID = TaskID, + MeetingID = MeetingID, Title = Title, Start = Start, StartTimezone = StartTimezone, diff --git a/Kendo-UI-Bootstrap-Integration/src/Kendo-UI-Bootstrap-Integration/Views/Home/Index.cshtml b/Kendo-UI-Bootstrap-Integration/src/Kendo-UI-Bootstrap-Integration/Views/Home/Index.cshtml index e0a24e9..c1681e7 100644 --- a/Kendo-UI-Bootstrap-Integration/src/Kendo-UI-Bootstrap-Integration/Views/Home/Index.cshtml +++ b/Kendo-UI-Bootstrap-Integration/src/Kendo-UI-Bootstrap-Integration/Views/Home/Index.cshtml @@ -63,7 +63,6 @@ .Name("revenue") .DataSource(ds => ds.Read(read => read.Action("Revenue", "Home"))) .Transitions(false) - .Theme("sass") .ChartArea(chart => chart.Margin(m => m.Top(15)) .Background("transparent")) .Legend(l => l.Visible(false)) @@ -99,7 +98,6 @@ .Name("sales-per-day") .DataSource(ds => ds.Read(read => read.Action("SalesPerDay", "Home"))) .Transitions(false) - .Theme("sass") .ChartArea(chart => chart.Margin(m => m.Top(15)) .Background("transparent")) .Legend(l => l.Visible(false)) @@ -122,7 +120,6 @@ .Name("sales-per-region") .DataSource(ds => ds.Read(read => read.Action("SalesPerRegion", "Home"))) .Transitions(false) - .Theme("sass") .Legend(l=>l.Visible(false)) .ChartArea(c=>c.Margin(m => m.Top(15)) .Background("transparent")) @@ -153,7 +150,6 @@ .Name("market-alice-mutton") .DataSource(ds => ds.Read(read => read.Action("AliceMutton", "Home")).Group(g => g.Add(d=> d.Series))) .Transitions(false) - .Theme("sass") .Title(t => t .Text("Alice Mutton") .Position(ChartTitlePosition.Bottom) @@ -176,7 +172,6 @@ .Name("market-gravad") .DataSource(ds => ds.Read(read => read.Action("Gravad", "Home")).Group(g => g.Add(d=> d.Series))) .Transitions(false) - .Theme("sass") .Title(t => t .Text("Gravad lax") .Position(ChartTitlePosition.Bottom) @@ -199,7 +194,6 @@ .Name("market-inlagd") .DataSource(ds => ds.Read(read => read.Action("Inlagd", "Home")).Group(g => g.Add(d=> d.Series))) .Transitions(false) - .Theme("sass") .Title(t => t .Text("Inlagd Sill") .Position(ChartTitlePosition.Bottom) @@ -222,7 +216,6 @@ .Name("market-spageslid") .DataSource(ds => ds.Read(read => read.Action("Spegesild", "Home")).Group(g => g.Add(d=> d.Series))) .Transitions(false) - .Theme("sass") .Title(t => t .Text("Spageslid") .Position(ChartTitlePosition.Bottom) @@ -423,21 +416,21 @@ .Scrollable(s => s.Enabled(false)) .DataSource(dataSource => dataSource .Custom() - .Type("odata") + .Type("odata-v4") .PageSize(10) .ServerPaging(true) .ServerSorting(true) .ServerFiltering(true) - .Transport(t => t.Read(r => r.Url("https://demos.telerik.com/kendo-ui/service/Northwind.svc/Orders"))) + .Transport(t => t.Read(r => r.Url("https://demos.telerik.com/service/v2/odata/Orders"))) ) ) @(Html.Kendo().Scheduler() .Name("schedule") - .Date(new DateTime(2022, 6, 13)) - .StartTime(new DateTime(2022, 6, 13, 7, 00, 00)) - .EndTime(new DateTime(2022, 6, 13, 20, 00, 00)) + .Date(new DateTime(2024, 6, 10)) + .StartTime(new DateTime(2024, 6, 10, 7, 00, 00)) + .EndTime(new DateTime(2024, 6, 10, 20, 00, 00)) .HtmlAttributes(new { @class = "ra-section" }) .Views(views => { @@ -451,13 +444,13 @@ .Custom() .Transport(t => t .Read(r => r - .Url("https://demos.telerik.com/kendo-ui/service/meetings") - .DataType("jsonp")) + .Url("https://demos.telerik.com/service/v2/core/meetings") + .DataType("json")) ) .Schema(schema => schema .Model(m => { - m.Id(f => f.TaskID); + m.Id(f => f.MeetingID); m.Field("title", typeof(string)).DefaultValue("No title").From("Title"); m.Field("start", typeof(DateTime)).From("Start"); m.Field("end", typeof(DateTime)).From("End"); diff --git a/Kendo-UI-Bootstrap-Integration/src/Kendo-UI-Bootstrap-Integration/Views/Shared/_Layout.cshtml b/Kendo-UI-Bootstrap-Integration/src/Kendo-UI-Bootstrap-Integration/Views/Shared/_Layout.cshtml index 905c10e..242a311 100644 --- a/Kendo-UI-Bootstrap-Integration/src/Kendo-UI-Bootstrap-Integration/Views/Shared/_Layout.cshtml +++ b/Kendo-UI-Bootstrap-Integration/src/Kendo-UI-Bootstrap-Integration/Views/Shared/_Layout.cshtml @@ -5,12 +5,12 @@ - + - - - + + + diff --git a/Kendo-UI-Bootstrap-Integration/src/Kendo-UI-Bootstrap-Integration/wwwroot/favicon.ico b/Kendo-UI-Bootstrap-Integration/src/Kendo-UI-Bootstrap-Integration/wwwroot/favicon.ico index a3a7999..667b63a 100644 Binary files a/Kendo-UI-Bootstrap-Integration/src/Kendo-UI-Bootstrap-Integration/wwwroot/favicon.ico and b/Kendo-UI-Bootstrap-Integration/src/Kendo-UI-Bootstrap-Integration/wwwroot/favicon.ico differ