Skip to content

Commit 1bf4ea6

Browse files
IankodjIankodj
committed
Update to MVC5, Kendo 2017 R1 and add custom agenda
1 parent 2452229 commit 1bf4ea6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+46855
-22434
lines changed

‎scheduler/scheduler-custom-view/SchedulerCustomViewDemo.sln

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2012
4-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SchedulerCustomViewDemo", "SchedulerCustomViewDemo\SchedulerCustomViewDemo.csproj", "{E3EF35D5-D0CE-49CC-B254-852C734EDEDE}"
5-
EndProject
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.25420.1
5+
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{E6411438-309A-4083-9DE7-45B29770ACC0}"
77
ProjectSection(SolutionItems) = preProject
88
.nuget\NuGet.Config = .nuget\NuGet.Config
99
.nuget\NuGet.exe = .nuget\NuGet.exe
1010
.nuget\NuGet.targets = .nuget\NuGet.targets
1111
EndProjectSection
1212
EndProject
13+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SchedulerCustomViewDemo", "SchedulerCustomViewDemo\SchedulerCustomViewDemo.csproj", "{E3EF35D5-D0CE-49CC-B254-852C734EDEDE}"
14+
EndProject
1315
Global
1416
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1517
Debug|Any CPU = Debug|Any CPU

‎scheduler/scheduler-custom-view/SchedulerCustomViewDemo/Models/Sample.Designer.cs

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scheduler/scheduler-custom-view/SchedulerCustomViewDemo/Models/SchedulerMeetingService.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System;
55
using System.Linq;
66
using System.Web.Mvc;
7+
using System.Collections.Generic;
78

89
public class SchedulerMeetingService : ISchedulerEventService<MeetingViewModel>
910
{
@@ -166,5 +167,10 @@ public void Dispose()
166167
{
167168
db.Dispose();
168169
}
170+
171+
IList<MeetingViewModel> ISchedulerEventService<MeetingViewModel>.GetAll()
172+
{
173+
throw new NotImplementedException();
174+
}
169175
}
170176
}

‎scheduler/scheduler-custom-view/SchedulerCustomViewDemo/SchedulerCustomViewDemo.csproj

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</ProductVersion>
99
<SchemaVersion>2.0</SchemaVersion>
1010
<ProjectGuid>{E3EF35D5-D0CE-49CC-B254-852C734EDEDE}</ProjectGuid>
11-
<ProjectTypeGuids>{E53F8FEA-EAE0-44A6-8774-FFD645390401};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
11+
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
1212
<OutputType>Library</OutputType>
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
1414
<RootNamespace>SchedulerCustomViewDemo</RootNamespace>
@@ -23,9 +23,12 @@
2323
<IISExpressAnonymousAuthentication />
2424
<IISExpressWindowsAuthentication />
2525
<IISExpressUseClassicPipelineMode />
26-
<UpgradeBackupLocation />
26+
<UpgradeBackupLocation>
27+
</UpgradeBackupLocation>
2728
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
2829
<RestorePackages>true</RestorePackages>
30+
<MvcProjectUpgradeChecked>true</MvcProjectUpgradeChecked>
31+
<UseGlobalApplicationHostFile />
2932
</PropertyGroup>
3033
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3134
<DebugSymbols>true</DebugSymbols>
@@ -48,17 +51,21 @@
4851
<Reference Include="EntityFramework">
4952
<HintPath>..\packages\EntityFramework.5.0.0\lib\net45\EntityFramework.dll</HintPath>
5053
</Reference>
51-
<Reference Include="Kendo.Mvc, Version=2013.3.1119.340, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
52-
<SpecificVersion>False</SpecificVersion>
53-
<HintPath>..\lib\KENDOUIMVC\2013.3.1119.340\Kendo.Mvc.dll</HintPath>
54-
<Private>True</Private>
54+
<Reference Include="Kendo.Mvc">
55+
<HintPath>..\lib\KENDOUIMVC\2017.1.223.545\Kendo.Mvc.dll</HintPath>
5556
</Reference>
5657
<Reference Include="Microsoft.CSharp" />
58+
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59+
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
60+
<Private>True</Private>
61+
</Reference>
5762
<Reference Include="System.Data.Entity" />
5863
<Reference Include="System.Runtime.Serialization" />
5964
<Reference Include="System.Security" />
60-
<Reference Include="System.Web.WebPages, Version=1.0.0.0,&#xD;&#xA;Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL " />
61-
<Reference Include="System.Web.Helpers, Version=1.0.0.0,&#xD;&#xA;Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
65+
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
66+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
67+
<Private>True</Private>
68+
</Reference>
6269
<Reference Include="System" />
6370
<Reference Include="System.Data" />
6471
<Reference Include="System.Drawing" />
@@ -68,6 +75,26 @@
6875
<Reference Include="System.ComponentModel.DataAnnotations" />
6976
<Reference Include="System.Core" />
7077
<Reference Include="System.Data.DataSetExtensions" />
78+
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
79+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
80+
<Private>True</Private>
81+
</Reference>
82+
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
83+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
84+
<Private>True</Private>
85+
</Reference>
86+
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
87+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
88+
<Private>True</Private>
89+
</Reference>
90+
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
91+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
92+
<Private>True</Private>
93+
</Reference>
94+
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
95+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
96+
<Private>True</Private>
97+
</Reference>
7198
<Reference Include="System.Xml.Linq" />
7299
<Reference Include="System.Web" />
73100
<Reference Include="System.Web.Extensions" />
@@ -77,7 +104,6 @@
77104
<Reference Include="System.Configuration" />
78105
<Reference Include="System.Web.Services" />
79106
<Reference Include="System.EnterpriseServices" />
80-
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
81107
</ItemGroup>
82108
<ItemGroup>
83109
<Compile Include="Controllers\HomeController.cs" />

‎scheduler/scheduler-custom-view/SchedulerCustomViewDemo/Views/Home/Index.cshtml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22
<link href="@Url.Content("~/Content/toDoViewStyles.css")" rel="stylesheet" type="text/css" />
33
<script src="@Url.Content("~/Scripts/toDoView.js")"></script>
44

5+
@* Custom Agenda implementation *@
6+
<script>
7+
var CustomAgenda = kendo.ui.AgendaView.extend({
8+
endDate: function () {
9+
var date = kendo.ui.AgendaView.fn.endDate.call(this);
10+
return kendo.date.addDays(date, 31);
11+
}
12+
});
13+
</script>
514

615
@(Html.Kendo().Scheduler<SchedulerCustomViewDemo.Models.MeetingViewModel>()
716
.Name("scheduler")
@@ -13,6 +22,7 @@
1322
views.WeekView(weekView => weekView.Selected(true));
1423
views.MonthView();
1524
views.AgendaView();
25+
views.CustomView("CustomAgenda", view => view.Title("Custom Agenda"));
1626
views.CustomView("kendo.ui.ToDoView", view => view.Title("To Do").Selected(true));
1727
})
1828
.Timezone("Etc/UTC")

‎scheduler/scheduler-custom-view/SchedulerCustomViewDemo/Views/Shared/_Layout.cshtml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<head>
44
<title>@ViewBag.Title</title>
55
<link href="@Url.Content("~/Content/Site.css")" rel="stylesheet" type="text/css" />
6-
<link href="http://cdn.kendostatic.com/2015.2.902/styles/kendo.common.min.css" rel="stylesheet" type="text/css" />
7-
<link href="http://cdn.kendostatic.com/2015.2.902/styles/kendo.default.min.css" rel="stylesheet" type="text/css" />
8-
<script src="http://cdn.kendostatic.com/2015.2.902/js/jquery.min.js"></script>
9-
<script src="http://cdn.kendostatic.com/2015.2.902/js/kendo.all.min.js"></script>
10-
<script src="http://cdn.kendostatic.com/2015.2.902/js/kendo.aspnetmvc.min.js"></script>
11-
<script src="http://cdn.kendostatic.com/2015.2.902/js/kendo.timezones.min.js"></script>
6+
<link href="http://cdn.kendostatic.com/2017.1.223/styles/kendo.common.min.css" rel="stylesheet" type="text/css" />
7+
<link href="http://cdn.kendostatic.com/2017.1.223/styles/kendo.default.min.css" rel="stylesheet" type="text/css" />
8+
<script src="http://cdn.kendostatic.com/2017.1.223/js/jquery.min.js"></script>
9+
<script src="http://cdn.kendostatic.com/2017.1.223/js/kendo.all.min.js"></script>
10+
<script src="http://cdn.kendostatic.com/2017.1.223/js/kendo.aspnetmvc.min.js"></script>
11+
<script src="http://cdn.kendostatic.com/2017.1.223/js/kendo.timezones.min.js"></script>
1212
</head>
1313

1414
<body>

‎scheduler/scheduler-custom-view/SchedulerCustomViewDemo/Views/web.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
<configuration>
44
<configSections>
5-
<sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
6-
<section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
7-
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
5+
<sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
6+
<section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
7+
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
88
</sectionGroup>
99
</configSections>
1010

‎scheduler/scheduler-custom-view/SchedulerCustomViewDemo/packages.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="EntityFramework" version="5.0.0" targetFramework="net45" />
4+
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
5+
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
6+
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
7+
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
48
</packages>

‎scheduler/scheduler-custom-view/SchedulerCustomViewDemo/web.config

Lines changed: 36 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,52 +6,65 @@
66
<configuration>
77
<configSections>
88
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
9-
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
9+
<section name="entityFramework"
10+
type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
11+
requirePermission="false"/>
1012
</configSections>
1113
<appSettings>
12-
<add key="webpages:Version" value="1.0.0.0" />
13-
<add key="ClientValidationEnabled" value="true" />
14-
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
14+
<add key="webpages:Version" value="3.0.0.0"/>
15+
<add key="webpages:Enabled" value="false" />
16+
<add key="ClientValidationEnabled" value="true"/>
17+
<add key="UnobtrusiveJavaScriptEnabled" value="true"/>
1518
</appSettings>
1619
<system.web>
1720
<compilation debug="true" targetFramework="4.5">
1821
<assemblies>
19-
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
20-
<add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
21-
<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
22-
<add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
23-
<add assembly="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
24-
<add assembly="System.Data.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
22+
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
23+
<add assembly="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
24+
<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
25+
<add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
26+
<add assembly="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
27+
<add assembly="System.Data.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
2528
</assemblies>
2629
</compilation>
2730
<pages>
2831
<namespaces>
29-
<add namespace="System.Web.Helpers" />
30-
<add namespace="System.Web.Mvc" />
31-
<add namespace="System.Web.Mvc.Ajax" />
32-
<add namespace="System.Web.Mvc.Html" />
33-
<add namespace="System.Web.Routing" />
34-
<add namespace="System.Web.WebPages" />
35-
<add namespace="Kendo.Mvc.UI" />
32+
<add namespace="System.Web.Helpers"/>
33+
<add namespace="System.Web.Mvc"/>
34+
<add namespace="System.Web.Mvc.Ajax"/>
35+
<add namespace="System.Web.Mvc.Html"/>
36+
<add namespace="System.Web.Routing"/>
37+
<add namespace="System.Web.WebPages"/>
38+
<add namespace="Kendo.Mvc.UI"/>
3639
</namespaces>
3740
</pages>
3841
</system.web>
3942
<system.webServer>
40-
<validation validateIntegratedModeConfiguration="false" />
41-
<modules runAllManagedModulesForAllRequests="true" />
43+
<validation validateIntegratedModeConfiguration="false"/>
44+
<modules runAllManagedModulesForAllRequests="true"/>
4245
</system.webServer>
4346
<runtime>
4447
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
4548
<dependentAssembly>
46-
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
47-
<bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="3.0.0.0" />
49+
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
50+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
51+
</dependentAssembly>
52+
<dependentAssembly>
53+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
54+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
55+
</dependentAssembly>
56+
<dependentAssembly>
57+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
58+
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
4859
</dependentAssembly>
4960
</assemblyBinding>
5061
</runtime>
5162
<entityFramework>
52-
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
63+
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework"/>
5364
</entityFramework>
5465
<connectionStrings>
55-
<add name="SampleEntities" connectionString="metadata=res://*/Models.Sample.csdl|res://*/Models.Sample.ssdl|res://*/Models.Sample.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=(LocalDB)\v11.0;attachdbfilename=|DataDirectory|\Sample.mdf;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
66+
<add name="SampleEntities"
67+
connectionString="metadata=res://*/Models.Sample.csdl|res://*/Models.Sample.ssdl|res://*/Models.Sample.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=(LocalDB)\v11.0;attachdbfilename=|DataDirectory|\Sample.mdf;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework&quot;"
68+
providerName="System.Data.EntityClient"/>
5669
</connectionStrings>
5770
</configuration>

‎scheduler/scheduler-custom-view/lib/KENDOUIMVC/2013.3.1119.340/Kendo.Mvc.dll

-1.25 MB
Binary file not shown.

0 commit comments

Comments
 (0)