Skip to content

Commit bbd2903

Browse files
veselintsveselints
committed
chore: update Scheduler server filtering to latest Kendo.Mvc version
1 parent 7e5ce6a commit bbd2903

File tree

20 files changed

+51
-47142
lines changed

20 files changed

+51
-47142
lines changed

‎scheduler/scheduler-server-filtering/KendoUI_Scheduler_Server_Filtering/KendoUI_Scheduler_Server_Filtering.csproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
<IISExpressUseClassicPipelineMode />
2323
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
2424
<RestorePackages>true</RestorePackages>
25+
<Use64BitIISExpress />
26+
<UseGlobalApplicationHostFile />
2527
</PropertyGroup>
2628
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2729
<DebugSymbols>true</DebugSymbols>
@@ -41,8 +43,9 @@
4143
<WarningLevel>4</WarningLevel>
4244
</PropertyGroup>
4345
<ItemGroup>
44-
<Reference Include="Kendo.Mvc">
45-
<HintPath>..\lib\KENDOUIMVC\2013.3.1119.340\Kendo.Mvc.dll</HintPath>
46+
<Reference Include="Kendo.Mvc, Version=2013.3.1119.340, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
47+
<SpecificVersion>False</SpecificVersion>
48+
<HintPath>..\lib\Kendo.Mvc.dll</HintPath>
4649
</Reference>
4750
<Reference Include="Microsoft.CSharp" />
4851
<Reference Include="System" />

‎scheduler/scheduler-server-filtering/KendoUI_Scheduler_Server_Filtering/Views/Home/Index.cshtml‎

Lines changed: 40 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,51 @@
11
@(Html.Kendo().Scheduler<KendoUI_Scheduler_Server_Filtering.Models.TaskViewModel>()
2-
.Name("scheduler")
3-
.Date(new DateTime(2013, 6, 13))
4-
.StartTime(new DateTime(2013, 6, 13, 7, 00, 00))
5-
.Height(600)
6-
.Views(views =>
7-
{
8-
views.DayView();
9-
views.WorkWeekView(workWeekView => workWeekView.Selected(true));
10-
views.WeekView();
11-
views.MonthView();
12-
views.AgendaView();
13-
})
14-
.Timezone("Etc/UTC")
15-
.DataSource(d => d
16-
.Model(m => {
17-
m.Id(f => f.TaskID);
18-
m.Field(f => f.Title).DefaultValue("No title");
19-
m.Field(f => f.OwnerID).DefaultValue(1);
20-
m.Field(f => f.Title).DefaultValue("No title");
21-
m.RecurrenceId(f => f.RecurrenceID);
22-
})
23-
.ServerOperation(true)
24-
.Read(read => read.Action("Read", "Home").Data("getAdditionalData"))
25-
.Create("Create", "Home")
26-
.Destroy("Destroy", "Home")
27-
.Update("Update", "Home")
28-
)
2+
.Name("scheduler")
3+
.Date(new DateTime(2013, 6, 13))
4+
.StartTime(new DateTime(2013, 6, 13, 7, 00, 00))
5+
.Height(600)
6+
.Views(views =>
7+
{
8+
views.DayView();
9+
views.WorkWeekView(workWeekView => workWeekView.Selected(true));
10+
views.WeekView();
11+
views.MonthView();
12+
views.AgendaView();
13+
})
14+
.Timezone("Etc/UTC")
15+
.DataSource(d => d
16+
.Model(m => {
17+
m.Id(f => f.TaskID);
18+
m.Field(f => f.Title).DefaultValue("No title");
19+
m.Field(f => f.OwnerID).DefaultValue(1);
20+
m.Field(f => f.Title).DefaultValue("No title");
21+
m.RecurrenceId(f => f.RecurrenceID);
22+
})
23+
.ServerOperation(true)
24+
.Read(read => read.Action("Read", "Home").Data("getAdditionalData"))
25+
.Create("Create", "Home")
26+
.Destroy("Destroy", "Home")
27+
.Update("Update", "Home")
28+
)
2929
)
3030

3131
<script>
3232
function getAdditionalData() {
3333
var scheduler = $("#scheduler").data("kendoScheduler");
3434
35-
var timezone = scheduler.options.timezone;
36-
var startDate = kendo.timezone.convert(scheduler.view().startDate(), timezone, "Etc/UTC");
37-
var endDate = kendo.timezone.convert(scheduler.view().endDate(), timezone, "Etc/UTC");
35+
var timezone = scheduler.options.timezone;
36+
var startDate = kendo.timezone.convert(scheduler.view().startDate(), timezone, "Etc/UTC");
37+
var endDate = kendo.timezone.convert(scheduler.view().endDate(), timezone, "Etc/UTC");
3838
39-
//optionally add startTime / endTime of the view
40-
var startTime = kendo.date.getMilliseconds(scheduler.view().startTime());
41-
var endTime = kendo.date.getMilliseconds(scheduler.view().endTime());
42-
endTime = endTime == 0 ? kendo.date.MS_PER_DAY : endTime;
39+
var startTime = 0;
40+
var endTime = 0;
41+
42+
if (scheduler.view().startTime) {
43+
console.log('in')
44+
//optionally add startTime / endTime of the view
45+
startTime = kendo.date.getMilliseconds(scheduler.view().startTime());
46+
endTime = kendo.date.getMilliseconds(scheduler.view().endTime());
47+
endTime = endTime == 0 ? kendo.date.MS_PER_DAY : endTime;
48+
}
4349
4450
var result = {
4551
Start: new Date(startDate.getTime() - (startDate.getTimezoneOffset() * kendo.date.MS_PER_MINUTE) + startTime),

‎scheduler/scheduler-server-filtering/KendoUI_Scheduler_Server_Filtering/Views/Shared/_Layout.cshtml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<title>@ViewBag.Title</title>
77
@Styles.Render("~/Content/css")
88

9-
<link href="http://cdn.kendostatic.com/2015.3.930/styles/kendo.common.min.css" rel="stylesheet" type="text/css" />
10-
<link href="http://cdn.kendostatic.com/2015.3.930/styles/kendo.default.min.css" rel="stylesheet" type="text/css" />
11-
<script src="http://cdn.kendostatic.com/2015.3.930/js/jquery.min.js"></script>
12-
<script src="http://cdn.kendostatic.com/2015.3.930/js/kendo.all.min.js"></script>
13-
<script src="http://cdn.kendostatic.com/2015.3.930/js/kendo.timezones.min.js"></script>
14-
<script src="http://cdn.kendostatic.com/2015.3.930/js/kendo.aspnetmvc.min.js"></script>
9+
<link href="http://cdn.kendostatic.com/2019.1.220/styles/kendo.common.min.css" rel="stylesheet" type="text/css" />
10+
<link href="http://cdn.kendostatic.com/2019.1.220/styles/kendo.default.min.css" rel="stylesheet" type="text/css" />
11+
<script src="http://cdn.kendostatic.com/2019.1.220/js/jquery.min.js"></script>
12+
<script src="http://cdn.kendostatic.com/2019.1.220/js/kendo.all.min.js"></script>
13+
<script src="http://cdn.kendostatic.com/2019.1.220/js/kendo.timezones.min.js"></script>
14+
<script src="http://cdn.kendostatic.com/2019.1.220/js/kendo.aspnetmvc.min.js"></script>
1515
<script src="@Url.Content("~/Scripts/kendo.modernizr.custom.js")"></script>
1616
</head>
1717
<body>

‎scheduler/scheduler-server-filtering/lib/KENDOUIMVC/2013.3.1119.340/Kendo.Mvc.dll‎

-1.25 MB
Binary file not shown.

0 commit comments

Comments
 (0)