Skip to content

Commit 7e10aa7

Browse files
pollyndospollyndos
committed
update cs solution
1 parent 50f6dcf commit 7e10aa7

Some content is hidden

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

68 files changed

+32278
-41599
lines changed

‎CS/WebDashboardAspNetCore.sln

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29403.142
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.2.32516.85
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDashboardAspNetCore", "WebDashboardAspNetCore\WebDashboardAspNetCore.csproj", "{36E139CA-076D-4BDE-A446-82AE58CCDEFA}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebDashboardAspNetCore", "WebDashboardAspNetCore\WebDashboardAspNetCore.csproj", "{8B3AA784-B317-4241-9F61-B8B89FCF9C8F}"
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1010
Debug|Any CPU = Debug|Any CPU
1111
Release|Any CPU = Release|Any CPU
1212
EndGlobalSection
1313
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{36E139CA-076D-4BDE-A446-82AE58CCDEFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15-
{36E139CA-076D-4BDE-A446-82AE58CCDEFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
16-
{36E139CA-076D-4BDE-A446-82AE58CCDEFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
17-
{36E139CA-076D-4BDE-A446-82AE58CCDEFA}.Release|Any CPU.Build.0 = Release|Any CPU
14+
{8B3AA784-B317-4241-9F61-B8B89FCF9C8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{8B3AA784-B317-4241-9F61-B8B89FCF9C8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{8B3AA784-B317-4241-9F61-B8B89FCF9C8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{8B3AA784-B317-4241-9F61-B8B89FCF9C8F}.Release|Any CPU.Build.0 = Release|Any CPU
1818
EndGlobalSection
1919
GlobalSection(SolutionProperties) = preSolution
2020
HideSolutionNode = FALSE
2121
EndGlobalSection
2222
GlobalSection(ExtensibilityGlobals) = postSolution
23-
SolutionGuid = {01672CB1-7A2C-416F-A69C-5A7BA7DFA696}
23+
SolutionGuid = {A1B8019D-5AEE-4243-AE92-9D30BECA0400}
2424
EndGlobalSection
2525
EndGlobal

‎CS/WebDashboardAspNetCore/Code/DashboardUtils.cs

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
using DevExpress.DashboardAspNetCore;
2+
using DevExpress.DashboardCommon;
3+
using DevExpress.DashboardWeb;
4+
using DevExpress.DataAccess.ConnectionParameters;
5+
using DevExpress.DataAccess.Excel;
6+
using DevExpress.DataAccess.Sql;
7+
using Microsoft.Extensions.FileProviders;
8+
9+
namespace WebDashboardAspNetCore {
10+
public static class DashboardUtils {
11+
public static DashboardConfigurator CreateDashboardConfigurator(IConfiguration configuration, IFileProvider fileProvider, IHttpContextAccessor? contextAccessor) {
12+
13+
14+
DashboardConfigurator configurator = new DashboardConfigurator();
15+
configurator.SetConnectionStringsProvider(new DashboardConnectionStringsProvider(configuration));
16+
17+
DashboardFileStorage dashboardFileStorage = new DashboardFileStorage(fileProvider.GetFileInfo("Data/Dashboards").PhysicalPath);
18+
configurator.SetDashboardStorage(dashboardFileStorage);
19+
20+
DataSourceInMemoryStorage dataSourceStorage = new DataSourceInMemoryStorage();
21+
22+
configurator.SetDashboardStateService(new CustomDashboardStateService(contextAccessor));
23+
24+
// Registers an SQL data source.
25+
DashboardSqlDataSource sqlDataSource = new DashboardSqlDataSource("SQL Data Source", "sqliteConnection");
26+
sqlDataSource.DataProcessingMode = DataProcessingMode.Client;
27+
DevExpress.DataAccess.Sql.SelectQuery query = SelectQueryFluentBuilder
28+
.AddTable("SalesPerson")
29+
.SelectAllColumns()
30+
.Build("Sales Person");
31+
sqlDataSource.Queries.Add(query);
32+
dataSourceStorage.RegisterDataSource("sqlDataSource", sqlDataSource.SaveToXml());
33+
34+
configurator.SetDataSourceStorage(dataSourceStorage);
35+
36+
37+
configurator.ConfigureDataConnection += (s, e) => {
38+
if (e.ConnectionName == "sqliteConnection") {
39+
SQLiteConnectionParameters sqliteParams = new SQLiteConnectionParameters();
40+
sqliteParams.FileName = "Data/nwind.db";
41+
e.ConnectionParameters = sqliteParams;
42+
}
43+
};
44+
return configurator;
45+
}
46+
}
47+
}

‎CS/WebDashboardAspNetCore/Controllers/DefaultDashboardController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
using DevExpress.DashboardAspNetCore;
1+
using DevExpress.DashboardAspNetCore;
22
using DevExpress.DashboardWeb;
33
using Microsoft.AspNetCore.DataProtection;
44

55
namespace WebDashboardAspNetCore.Controllers {
66
public class DefaultDashboardController : DashboardController {
7-
public DefaultDashboardController(DashboardConfigurator configurator, IDataProtectionProvider dataProtectionProvider = null)
7+
public DefaultDashboardController(DashboardConfigurator configurator, IDataProtectionProvider? dataProtectionProvider = null)
88
: base(configurator, dataProtectionProvider) {
99
}
1010
}

‎CS/WebDashboardAspNetCore/Controllers/HomeController.cs

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎CS/WebDashboardAspNetCore/CustomDashboardStateService.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77

88
namespace WebDashboardAspNetCore {
99
public class CustomDashboardStateService : IDashboardStateService {
10-
IHttpContextAccessor contextAccessor;
11-
public CustomDashboardStateService(IHttpContextAccessor contextAccessor) {
10+
IHttpContextAccessor? contextAccessor;
11+
public CustomDashboardStateService(IHttpContextAccessor? contextAccessor) {
1212
this.contextAccessor = contextAccessor;
1313
}
14-
public DashboardState GetState(string dashboardId, XDocument dashboard) {
15-
var cookie = contextAccessor.HttpContext?.Request.Cookies["dashboardState"];
14+
public DashboardState? GetState(string dashboardId, XDocument dashboard) {
15+
var cookie = contextAccessor?.HttpContext?.Request.Cookies["dashboardState"];
1616
if (cookie != null) {
1717
DashboardState dashboardState = new DashboardState();
1818
dashboardState.LoadFromJson(HttpUtility.UrlDecode(cookie));

‎CS/WebDashboardAspNetCore/Data/Dashboards/dashboard1.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dashboard>
3-
<Title Text="Dashboard" />
4-
<DataSources>
5-
<SqlDataSource ComponentName="DataSource1">
6-
<Name>SalesPerson1</Name>
7-
<Connection Name="sqliteConnection" FromAppConfig="true" />
8-
<Query Type="SelectQuery" Name="SalesPerson1">
9-
<Tables>
10-
<Table Name="SalesPerson" />
11-
</Tables>
12-
<Columns>
13-
<AllColumns Table="SalesPerson" />
14-
</Columns>
15-
</Query>
16-
<ConnectionOptions CloseConnection="true" />
17-
</SqlDataSource>
18-
</DataSources>
3+
<Title Text="Dashboard" />
4+
<DataSources>
5+
<SqlDataSource ComponentName="DataSource1">
6+
<Name>SalesPerson1</Name>
7+
<Connection Name="sqliteConnection" FromAppConfig="true" />
8+
<Query Type="SelectQuery" Name="SalesPerson1">
9+
<Tables>
10+
<Table Name="SalesPerson" />
11+
</Tables>
12+
<Columns>
13+
<AllColumns Table="SalesPerson" />
14+
</Columns>
15+
</Query>
16+
<ConnectionOptions CloseConnection="true" />
17+
</SqlDataSource>
18+
</DataSources>
1919
<Items>
2020
<Grid ComponentName="gridDashboardItem1" Name="Grid 1" DataSource="DataSource1" DataMember="SalesPerson1">
2121
<InteractivityOptions MasterFilterMode="Multiple" />

‎CS/WebDashboardAspNetCore/Models/ErrorViewModel.cs

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎CS/WebDashboardAspNetCore/NuGet.config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<configuration>
3+
<packageSources>
4+
<add key="DevExpress-Local" value="C:\Program Files\DevExpress 22.1\Components\System\Components\packages" />
5+
</packageSources>
6+
</configuration>

‎CS/WebDashboardAspNetCore/Pages/Index.cshtml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
@page
2+
3+
<div style="position: absolute; left: 0; top: 0; right: 0; bottom: 0;">
4+
@(Html.DevExpress().Dashboard("dashboardControl1")
5+
.ControllerName("DefaultDashboard")
6+
.Width("100%")
7+
.Height("100%")
8+
.OnBeforeRender("onBeforeRender")
9+
)
10+
</div>

‎CS/WebDashboardAspNetCore/Pages/_Layout.cshtml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<!DOCTYPE html>
2+
3+
<html>
4+
<head>
5+
<meta charset="UTF-8" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
7+
<title>Dashboard Web Application</title>
8+
9+
<link href="css/site.min.css" rel="stylesheet" />
10+
11+
</head>
12+
<body>
13+
@RenderBody()
14+
15+
<script src="js/site.min.js"></script>
16+
<script src="~/js/Script.js"></script>
17+
</body>
18+
</html>

0 commit comments

Comments
 (0)