Skip to content

Commit 7d713ef

Browse files
SergeyNakhankovSergeyNakhankov
committed
Update to v21.2
1 parent aa7b9f5 commit 7d713ef

File tree

13 files changed

+240
-173
lines changed

13 files changed

+240
-173
lines changed

‎CS/MVCDashboardDesigner/App_Start/DashboardConfig.cs

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
using DevExpress.DashboardCommon;
2+
using DevExpress.DashboardWeb;
3+
using DevExpress.DashboardWeb.Mvc;
4+
using System;
5+
using System.Collections.Generic;
6+
using System.Configuration;
7+
using System.Linq;
8+
using System.Web;
9+
using System.Web.Routing;
10+
11+
namespace MVCDashboardDesigner.App_Start {
12+
public class DashboardConfig {
13+
public static void RegisterService(RouteCollection routes) {
14+
routes.MapDashboardRoute("api/dashboard", "DefaultDashboard");
15+
16+
var dataBaseDashboardStorage = new DataBaseEditaleDashboardStorage(
17+
ConfigurationManager.ConnectionStrings["DashboardStorageConnection"].ConnectionString);
18+
19+
DashboardConfigurator.Default.SetDashboardStorage(dataBaseDashboardStorage);
20+
21+
DataSourceInMemoryStorage dataSourceStorage = new DataSourceInMemoryStorage();
22+
DashboardObjectDataSource objDataSource = new DashboardObjectDataSource("Object Data Source", typeof(SalesPersonData));
23+
objDataSource.DataMember = "GetSalesData";
24+
dataSourceStorage.RegisterDataSource("objectDataSource", objDataSource.SaveToXml());
25+
26+
DashboardConfigurator.Default.SetDataSourceStorage(dataSourceStorage);
27+
28+
}
29+
}
30+
}

‎CS/MVCDashboardDesigner/App_Start/RouteConfig.cs

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ public class RouteConfig {
1111
public static void RegisterRoutes(RouteCollection routes) {
1212
routes.IgnoreRoute("{resource}.axd/{*pathInfo}");
1313
routes.IgnoreRoute("{resource}.ashx/{*pathInfo}");
14-
routes.MapDashboardRoute("api/dashboard");
1514

1615
routes.MapRoute(
1716
name: "Default", // Route name

‎CS/MVCDashboardDesigner/Controllers/DefaultDashboardController.cs

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
using DevExpress.DashboardWeb.Mvc;
2+
3+
namespace MVCDashboardDesigner.Controllers {
4+
5+
public class DefaultDashboardController : DashboardController {
6+
7+
}
8+
}

‎CS/MVCDashboardDesigner/Global.asax.cs

+2-15
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,23 @@
55
using System.Web.Routing;
66
using DevExpress.DashboardCommon;
77
using DevExpress.DashboardWeb;
8+
using MVCDashboardDesigner.App_Start;
89

910
namespace MVCDashboardDesigner {
1011
// Note: For instructions on enabling IIS6 or IIS7 classic mode,
1112
// visit http://go.microsoft.com/?LinkId=9394801
1213

1314
public class MvcApplication : System.Web.HttpApplication {
1415
protected void Application_Start() {
16+
DashboardConfig.RegisterService(RouteTable.Routes);
1517
AreaRegistration.RegisterAllAreas();
16-
1718
WebApiConfig.Register(GlobalConfiguration.Configuration);
1819
FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters);
1920
RouteConfig.RegisterRoutes(RouteTable.Routes);
2021

2122
ModelBinders.Binders.DefaultBinder = new DevExpress.Web.Mvc.DevExpressEditorsBinder();
2223

2324
DevExpress.Web.ASPxWebControl.CallbackError += Application_Error;
24-
25-
var dataBaseDashboardStorage = new DataBaseEditaleDashboardStorage(
26-
ConfigurationManager.ConnectionStrings["DashboardStorageConnection"].ConnectionString);
27-
28-
DashboardConfigurator.Default.SetDashboardStorage(dataBaseDashboardStorage);
29-
30-
DataSourceInMemoryStorage dataSourceStorage = new DataSourceInMemoryStorage();
31-
DashboardObjectDataSource objDataSource = new DashboardObjectDataSource("Object Data Source", typeof(SalesPersonData));
32-
33-
objDataSource.DataMember = "GetSalesData";
34-
35-
dataSourceStorage.RegisterDataSource("objectDataSource", objDataSource.SaveToXml());
36-
37-
DashboardConfigurator.Default.SetDataSourceStorage(dataSourceStorage);
3825
}
3926

4027
protected void Application_Error(object sender, EventArgs e) {

‎CS/MVCDashboardDesigner/MVCDashboardDesigner.csproj

+40-35
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -118,103 +118,106 @@
118118
<Reference Include="System.Configuration" />
119119
<Reference Include="System.Web.Services" />
120120
<Reference Include="System.EnterpriseServices" />
121-
<Reference Include="DevExpress.Data.v20.1, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
121+
<Reference Include="DevExpress.Data.v21.2, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
122122
<Private>False</Private>
123123
</Reference>
124-
<Reference Include="DevExpress.Web.ASPxThemes.v20.1, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
124+
<Reference Include="DevExpress.Web.ASPxThemes.v21.2, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
125125
<Private>False</Private>
126126
</Reference>
127-
<Reference Include="DevExpress.RichEdit.v20.1.Core, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
127+
<Reference Include="DevExpress.RichEdit.v21.2.Core, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
128128
<Private>False</Private>
129129
</Reference>
130-
<Reference Include="DevExpress.RichEdit.v20.1.Export, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
130+
<Reference Include="DevExpress.RichEdit.v21.2.Export, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
131131
<Private>False</Private>
132132
</Reference>
133-
<Reference Include="DevExpress.Printing.v20.1.Core, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
133+
<Reference Include="DevExpress.Printing.v21.2.Core, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
134134
<Private>False</Private>
135135
</Reference>
136-
<Reference Include="DevExpress.Web.v20.1, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
136+
<Reference Include="DevExpress.Web.v21.2, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
137137
<Private>False</Private>
138138
</Reference>
139-
<Reference Include="DevExpress.Web.Mvc5.v20.1, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
139+
<Reference Include="DevExpress.Web.Mvc5.v21.2, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
140140
<Private>False</Private>
141141
</Reference>
142-
<Reference Include="DevExpress.Dashboard.v20.1.Core, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
142+
<Reference Include="DevExpress.Dashboard.v21.2.Core, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
143143
<Private>False</Private>
144144
</Reference>
145-
<Reference Include="DevExpress.Dashboard.v20.1.Web, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
145+
<Reference Include="DevExpress.Dashboard.v21.2.Web, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
146146
<Private>False</Private>
147147
</Reference>
148-
<Reference Include="DevExpress.Dashboard.v20.1.Web.WebForms, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
148+
<Reference Include="DevExpress.Dashboard.v21.2.Web.WebForms, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
149149
<Private>False</Private>
150150
</Reference>
151-
<Reference Include="DevExpress.Dashboard.v20.1.Web.Mvc5, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
151+
<Reference Include="DevExpress.Dashboard.v21.2.Web.Mvc5, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
152152
<Private>False</Private>
153153
</Reference>
154-
<Reference Include="DevExpress.DataAccess.v20.1, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
154+
<Reference Include="DevExpress.DataAccess.v21.2, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
155155
<Private>False</Private>
156156
</Reference>
157-
<Reference Include="DevExpress.Xpo.v20.1, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
157+
<Reference Include="DevExpress.Xpo.v21.2, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
158158
<Private>False</Private>
159159
</Reference>
160-
<Reference Include="DevExpress.Pdf.v20.1.Core, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
160+
<Reference Include="DevExpress.Pdf.v21.2.Core, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
161161
<Private>False</Private>
162162
</Reference>
163-
<Reference Include="DevExpress.Web.Resources.v20.1, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
163+
<Reference Include="DevExpress.Web.Resources.v21.2, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
164164
<Private>False</Private>
165165
</Reference>
166-
<Reference Include="DevExpress.Charts.v20.1.Core, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
166+
<Reference Include="DevExpress.Charts.v21.2.Core, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
167167
<Private>False</Private>
168168
</Reference>
169-
<Reference Include="DevExpress.Office.v20.1.Core, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
169+
<Reference Include="DevExpress.Office.v21.2.Core, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
170170
<Private>False</Private>
171171
</Reference>
172-
<Reference Include="DevExpress.PivotGrid.v20.1.Core, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
172+
<Reference Include="DevExpress.PivotGrid.v21.2.Core, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
173173
<Private>False</Private>
174174
</Reference>
175-
<Reference Include="DevExpress.TreeMap.v20.1.Core, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
175+
<Reference Include="DevExpress.TreeMap.v21.2.Core, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
176176
<Private>False</Private>
177177
</Reference>
178-
<Reference Include="DevExpress.Map.v20.1.Core, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
178+
<Reference Include="DevExpress.Map.v21.2.Core, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
179179
<Private>False</Private>
180180
</Reference>
181-
<Reference Include="DevExpress.XtraTreeMap.v20.1, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
181+
<Reference Include="DevExpress.XtraTreeMap.v21.2.UI, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
182182
<Private>False</Private>
183183
</Reference>
184-
<Reference Include="DevExpress.Sparkline.v20.1.Core, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
184+
<Reference Include="DevExpress.XtraTreeMap.v21.2, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
185185
<Private>False</Private>
186186
</Reference>
187-
<Reference Include="DevExpress.Data.Desktop.v20.1, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
187+
<Reference Include="DevExpress.Sparkline.v21.2.Core, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
188188
<Private>False</Private>
189189
</Reference>
190-
<Reference Include="DevExpress.Utils.v20.1, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
190+
<Reference Include="DevExpress.Data.Desktop.v21.2, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
191191
<Private>False</Private>
192192
</Reference>
193-
<Reference Include="DevExpress.XtraCharts.v20.1, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
193+
<Reference Include="DevExpress.Utils.v21.2, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
194194
<Private>False</Private>
195195
</Reference>
196-
<Reference Include="DevExpress.XtraGauges.v20.1.Core, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
196+
<Reference Include="DevExpress.XtraCharts.v21.2, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
197197
<Private>False</Private>
198198
</Reference>
199-
<Reference Include="DevExpress.XtraGauges.v20.1.Presets, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
199+
<Reference Include="DevExpress.XtraGauges.v21.2.Core, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
200200
<Private>False</Private>
201201
</Reference>
202-
<Reference Include="DevExpress.XtraGauges.v20.1.Win, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
202+
<Reference Include="DevExpress.XtraGauges.v21.2.Presets, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
203203
<Private>False</Private>
204204
</Reference>
205-
<Reference Include="DevExpress.XtraMap.v20.1, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
205+
<Reference Include="DevExpress.XtraGauges.v21.2.Win, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
206206
<Private>False</Private>
207207
</Reference>
208-
<Reference Include="DevExpress.CodeParser.v20.1, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
208+
<Reference Include="DevExpress.XtraMap.v21.2, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
209209
<Private>False</Private>
210210
</Reference>
211-
<Reference Include="DevExpress.XtraReports.v20.1, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
211+
<Reference Include="DevExpress.CodeParser.v21.2, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
212212
<Private>False</Private>
213213
</Reference>
214-
<Reference Include="DevExpress.XtraEditors.v20.1, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
214+
<Reference Include="DevExpress.XtraReports.v21.2, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
215215
<Private>False</Private>
216216
</Reference>
217-
<Reference Include="DevExpress.XtraPrinting.v20.1, Version=20.1.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
217+
<Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
218+
<Private>False</Private>
219+
</Reference>
220+
<Reference Include="DevExpress.XtraPrinting.v21.2, Version=21.2.1.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
218221
<Private>False</Private>
219222
</Reference>
220223
<Reference Include="WebMatrix.Data, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -276,9 +279,11 @@
276279
<Content Include="Views\Shared\_Layout.cshtml" />
277280
</ItemGroup>
278281
<ItemGroup>
282+
<Compile Include="App_Start\DashboardConfig.cs" />
279283
<Compile Include="App_Start\FilterConfig.cs" />
280284
<Compile Include="App_Start\RouteConfig.cs" />
281285
<Compile Include="App_Start\WebApiConfig.cs" />
286+
<Compile Include="Controllers\DefaultDashboardController.cs" />
282287
<Compile Include="Controllers\HomeController.cs" />
283288
<Compile Include="DataBaseEditaleDashboardStorage.cs" />
284289
<Compile Include="Global.asax.cs">
@@ -327,4 +332,4 @@
327332
</FlavorProperties>
328333
</VisualStudio>
329334
</ProjectExtensions>
330-
</Project>
335+
</Project>

‎CS/MVCDashboardDesigner/Views/Home/Index.cshtml

+1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44

55
@Html.DevExpress().Dashboard(settings => {
66
settings.Name = "Dashboard";
7+
settings.ControllerName = "DefaultDashboard";
78
settings.Height = Unit.Percentage(100);
89
}).GetHtml()

0 commit comments

Comments
 (0)