Skip to content

Commit efbbe76

Browse files
natakazakovanatakazakova
committed
update to unified API
1 parent 39a8784 commit efbbe76

File tree

7 files changed

+122
-88
lines changed

7 files changed

+122
-88
lines changed

‎.gitignore

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
x64/
2121
x86/
2222
bld/
23+
[Bb]in/
2324
[Oo]bj/
2425
[Ll]og/
2526

@@ -60,6 +61,7 @@ artifacts/
6061
*.pdb
6162
*.pgc
6263
*.pgd
64+
*.rsp
6365
*.sbr
6466
*.tlb
6567
*.tli
@@ -83,7 +85,7 @@ ipch/
8385
*.ncb
8486
*.opendb
8587
*.opensdf
86-
#*.sdf
88+
*.sdf
8789
*.cachefile
8890
*.VC.db
8991
*.VC.VC.opendb
@@ -223,9 +225,9 @@ UpgradeLog*.XML
223225
UpgradeLog*.htm
224226

225227
# SQL Server files
226-
#*.mdf
227-
#*.ldf
228-
#*.ndf
228+
*.mdf
229+
*.ldf
230+
*.ndf
229231

230232
# Business Intelligence projects
231233
*.rdl.data
@@ -294,4 +296,13 @@ __pycache__/
294296
*.btp.cs
295297
*.btm.cs
296298
*.odx.cs
297-
*.xsd.cs
299+
*.xsd.cs
300+
301+
#ExampleRangeTester artifacts
302+
TesterMetadata.xml
303+
304+
# Backup files
305+
*.bak
306+
307+
# Local server for npm packages
308+
.npmrc

‎CS/ASPxDashboard_RequestUnderlyingData/ASPxDashboard_RequestUnderlyingData.csproj

Lines changed: 38 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.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>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProductVersion></ProductVersion>
7+
<ProductVersion>
8+
</ProductVersion>
89
<SchemaVersion>2.0</SchemaVersion>
910
<ProjectGuid>{2BC03E2C-BCF3-4C61-9769-0ECE0B548449}</ProjectGuid>
1011
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
@@ -13,7 +14,8 @@
1314
<RootNamespace>ASPxDashboard_RequestUnderlyingData</RootNamespace>
1415
<AssemblyName>ASPxDashboard_RequestUnderlyingData</AssemblyName>
1516
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
16-
<FileUpgradeFlags></FileUpgradeFlags>
17+
<FileUpgradeFlags>
18+
</FileUpgradeFlags>
1719
<OldToolsVersion>4.0</OldToolsVersion>
1820
<UseIISExpress>true</UseIISExpress>
1921
<IISExpressSSLPort />
@@ -22,6 +24,7 @@
2224
<IISExpressUseClassicPipelineMode />
2325
<UseGlobalApplicationHostFile />
2426
<UpgradeBackupLocation />
27+
<Use64BitIISExpress />
2528
</PropertyGroup>
2629
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2730
<DebugSymbols>true</DebugSymbols>
@@ -41,26 +44,28 @@
4144
<WarningLevel>4</WarningLevel>
4245
</PropertyGroup>
4346
<ItemGroup>
44-
<Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.17.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
45-
<Reference Include="DevExpress.Dashboard.v17.1.Core, Version=17.1.17.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
46-
<Reference Include="DevExpress.Dashboard.v17.1.Web, Version=17.1.17.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
47-
<Reference Include="DevExpress.DataAccess.v17.1, Version=17.1.17.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
48-
<Reference Include="DevExpress.Map.v17.1.Core, Version=17.1.17.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
49-
<Reference Include="DevExpress.Office.v17.1.Core, Version=17.1.17.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
50-
<Reference Include="DevExpress.Pdf.v17.1.Core, Version=17.1.17.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
51-
<Reference Include="DevExpress.PivotGrid.v17.1.Core, Version=17.1.17.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
52-
<Reference Include="DevExpress.Sparkline.v17.1.Core, Version=17.1.17.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
53-
<Reference Include="DevExpress.Utils.v17.1, Version=17.1.17.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
54-
<Reference Include="DevExpress.Web.Resources.v17.1, Version=17.1.17.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
55-
<Reference Include="DevExpress.Xpo.v17.1, Version=17.1.17.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
56-
<Reference Include="DevExpress.XtraCharts.v17.1, Version=17.1.17.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
57-
<Reference Include="DevExpress.XtraGauges.v17.1.Core, Version=17.1.17.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
58-
<Reference Include="DevExpress.XtraGauges.v17.1.Presets, Version=17.1.17.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
59-
<Reference Include="DevExpress.XtraPrinting.v17.1, Version=17.1.17.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
60-
<Reference Include="DevExpress.XtraGauges.v17.1.Win, Version=17.1.17.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
61-
<Reference Include="DevExpress.XtraMap.v17.1, Version=17.1.17.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
62-
<Reference Include="DevExpress.CodeParser.v17.1, Version=17.1.17.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
63-
<Reference Include="DevExpress.XtraReports.v17.1, Version=17.1.17.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
47+
<Reference Include="DevExpress.Charts.v21.2.Core, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
48+
<Reference Include="DevExpress.Dashboard.v21.2.Core, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
49+
<Reference Include="DevExpress.Dashboard.v21.2.Web.WebForms, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
50+
<Reference Include="DevExpress.Dashboard.v21.2.Web, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
51+
<Reference Include="DevExpress.DataAccess.v21.2, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
52+
<Reference Include="DevExpress.Map.v21.2.Core, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
53+
<Reference Include="DevExpress.Office.v21.2.Core, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
54+
<Reference Include="DevExpress.Pdf.v21.2.Core, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
55+
<Reference Include="DevExpress.PivotGrid.v21.2.Core, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
56+
<Reference Include="DevExpress.Sparkline.v21.2.Core, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
57+
<Reference Include="DevExpress.Data.Desktop.v21.2, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
58+
<Reference Include="DevExpress.Utils.v21.2, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
59+
<Reference Include="DevExpress.Web.Resources.v21.2, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
60+
<Reference Include="DevExpress.Xpo.v21.2, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
61+
<Reference Include="DevExpress.XtraCharts.v21.2, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
62+
<Reference Include="DevExpress.XtraGauges.v21.2.Core, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
63+
<Reference Include="DevExpress.XtraGauges.v21.2.Presets, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
64+
<Reference Include="DevExpress.XtraPrinting.v21.2, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
65+
<Reference Include="DevExpress.XtraGauges.v21.2.Win, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
66+
<Reference Include="DevExpress.XtraMap.v21.2, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
67+
<Reference Include="DevExpress.CodeParser.v21.2, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
68+
<Reference Include="DevExpress.XtraReports.v21.2, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
6469
<Reference Include="Microsoft.CSharp" />
6570
<Reference Include="System" />
6671
<Reference Include="System.Data" />
@@ -77,14 +82,15 @@
7782
<Reference Include="System.Web.DynamicData" />
7883
<Reference Include="System.Web.Entity" />
7984
<Reference Include="System.Web.ApplicationServices" />
80-
<Reference Include="DevExpress.Data.v17.1, Version=17.1.17.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
81-
<Reference Include="DevExpress.Web.ASPxThemes.v17.1, Version=17.1.17.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
82-
<Reference Include="DevExpress.RichEdit.v17.1.Core, Version=17.1.17.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
83-
<Reference Include="DevExpress.Printing.v17.1.Core, Version=17.1.17.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
84-
<Reference Include="DevExpress.Web.v17.1, Version=17.1.17.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
85+
<Reference Include="DevExpress.Data.v21.2, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
86+
<Reference Include="DevExpress.Web.ASPxThemes.v21.2, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
87+
<Reference Include="DevExpress.RichEdit.v21.2.Core, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
88+
<Reference Include="DevExpress.RichEdit.v21.2.Export, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
89+
<Reference Include="DevExpress.Printing.v21.2.Core, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
90+
<Reference Include="DevExpress.Web.v21.2, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
8591
</ItemGroup>
8692
<ItemGroup>
87-
<Content Include="App_Data\dashboard1.xml" />
93+
<Content Include="App_Data\Dashboards\dashboard1.xml" />
8894
<Content Include="App_Data\nwind.mdb" />
8995
<Content Include="Default.aspx" />
9096
<Content Include="Global.asax" />
@@ -132,7 +138,8 @@
132138
<IISUrl>http://localhost:50411/</IISUrl>
133139
<NTLMAuthentication>False</NTLMAuthentication>
134140
<UseCustomServer>False</UseCustomServer>
135-
<CustomServerUrl></CustomServerUrl>
141+
<CustomServerUrl>
142+
</CustomServerUrl>
136143
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
137144
</WebProjectProperties>
138145
</FlavorProperties>
@@ -145,4 +152,4 @@
145152
<Target Name="AfterBuild">
146153
</Target>
147154
-->
148-
</Project>
155+
</Project>

‎CS/ASPxDashboard_RequestUnderlyingData/App_Data/dashboard1.xml renamed to ‎CS/ASPxDashboard_RequestUnderlyingData/App_Data/Dashboards/dashboard1.xml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
<Dashboard>
33
<Title Text="Dashboard" />
44
<DataSources>
5-
<SqlDataSource ComponentName="DataSource1">
6-
<Name>SalesPerson</Name>
5+
<SqlDataSource Name="SalesPerson" ComponentName="DataSource1">
76
<Connection Name="nwindConnection" FromAppConfig="true" />
87
<Query Type="SelectQuery" Name="SalesPerson">
98
<Tables>
@@ -13,7 +12,7 @@
1312
<AllColumns Table="SalesPerson" />
1413
</Columns>
1514
</Query>
16-
<ConnectionOptions CloseConnection="true" CommandTimeout="0" />
15+
<ConnectionOptions CloseConnection="true" />
1716
</SqlDataSource>
1817
</DataSources>
1918
<Items>
@@ -47,9 +46,18 @@
4746
</SeriesDimensions>
4847
<Card>
4948
<ActualValue DefaultId="DataItem0" />
50-
<AbsoluteVariationNumericFormat FormatType="Number" Precision="0" />
51-
<PercentVariationNumericFormat FormatType="Percent" />
52-
<PercentOfTargetNumericFormat FormatType="Percent" />
49+
<AbsoluteVariationNumericFormat />
50+
<PercentVariationNumericFormat />
51+
<PercentOfTargetNumericFormat />
52+
<LayoutTemplate Type="Stretched">
53+
<TopValue Visible="true" ValueType="ActualValue" DimensionIndex="0" />
54+
<MainValue Visible="true" ValueType="Title" DimensionIndex="0" />
55+
<SubValue Visible="true" ValueType="Subtitle" DimensionIndex="0" />
56+
<BottomValue1 Visible="true" ValueType="PercentVariation" DimensionIndex="0" />
57+
<BottomValue2 Visible="true" ValueType="AbsoluteVariation" DimensionIndex="0" />
58+
<DeltaIndicator Visible="true" />
59+
<Sparkline Visible="true" />
60+
</LayoutTemplate>
5361
</Card>
5462
<SparklineArgument DefaultId="DataItem2" />
5563
</Card>

‎CS/ASPxDashboard_RequestUnderlyingData/App_Data/nwind.mdb

52 KB
Binary file not shown.

‎CS/ASPxDashboard_RequestUnderlyingData/Default.aspx

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,22 @@
11
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="ASPxDashboard_RequestUnderlyingData.Default" %>
22

3-
<%@ Register Assembly="DevExpress.Dashboard.v17.1.Web, Version=17.1.17.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a"
3+
<%@ Register Assembly="DevExpress.Dashboard.v21.2.Web.WebForms, Version=21.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a"
44
Namespace="DevExpress.DashboardWeb" TagPrefix="dx" %>
55

66
<!DOCTYPE html>
77

88
<html xmlns="http://www.w3.org/1999/xhtml">
99
<head runat="server">
1010
<title></title>
11+
<script src="Scripts/UnderlyingData.js"></script>
1112
</head>
1213
<body>
1314
<form id="form1" runat="server">
1415
<div id="detailGrid" style="position:absolute; left:600px; right:0; top:0; bottom:0;"></div>
1516
<div style="position:absolute; left:0; right:0; top:0; bottom:0;">
16-
<dx:ASPxDashboard ID="ASPxDashboard1" runat="server"
17-
DashboardXmlPath="~/App_Data/dashboard1.xml"
18-
WorkingMode="Viewer"
19-
ClientInstanceName="webDashboard"
20-
Height="850px" Width="600px">
21-
<ClientSideEvents
22-
DashboardEndUpdate="function(s, e) { loadUnderlyingData(); }">
23-
</ClientSideEvents>
17+
<dx:ASPxDashboard ID="ASPxDashboard1" runat="server" DashboardStorageFolder = "~/App_Data/Dashboards"
18+
WorkingMode="Viewer" ClientInstanceName="clientDashboardControl" Height="800px" Width="600px">
19+
<ClientSideEvents BeforeRender="onBeforeRender" />
2420
</dx:ASPxDashboard>
2521
</div>
2622
</form>

‎CS/ASPxDashboard_RequestUnderlyingData/Scripts/UnderlyingData.js

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,32 @@
1+
function onBeforeRender(sender) {
2+
var dashboardControl = sender.GetDashboardControl();
3+
4+
if (dashboardControl)
5+
dashboardControl.on('dashboardEndUpdate', loadUnderlyingData);
6+
}
7+
18
function loadUnderlyingData() {
9+
10+
webDashboard = clientDashboardControl.GetDashboardControl();
11+
var viewerApiExtension = webDashboard.findExtension('viewer-api');
12+
213
// Gets client data displayed in the Card dashboard item.
3-
var clientData = webDashboard.GetItemData('cardDashboardItem1');
14+
var clientData = viewerApiExtension.getItemData('cardDashboardItem1');
415

516
// Creates an array of data members used to obtain underlying data.
6-
var availableDataMembers = clientData.GetDataMembers();
17+
var availableDataMembers = clientData.getDataMembers();
718
var specificDataMembers = availableDataMembers.filter(function (dataMember) {
819
return ['Sales Person', 'Extended Price', 'OrderDate'].indexOf(dataMember) !== -1;
920
});
1021

1122
// Gets an axis point corresponding to a specific employee.
12-
var allSalesPersons = clientData.GetAxis(DashboardDataAxisNames.DefaultAxis).GetPoints();
23+
var allSalesPersons = clientData.getAxis(DashboardDataAxisNames.DefaultAxis).getPoints();
1324
var specificSalesPerson = allSalesPersons.find(function (person) {
1425
return person.GetValue() === "Andrew Fuller";
1526
});
1627

1728
// Gets an axis point corresponding to a specific month.
18-
var allDates = clientData.GetAxis(DashboardDataAxisNames.SparklineAxis).GetPoints();
29+
var allDates = clientData.getAxis(DashboardDataAxisNames.SparklineAxis).getPoints();
1930
var specificDate = allDates.find(function (date) {
2031
return date.GetValue().toDateString() === (new Date(2016, 4, 1)).toDateString();
2132
});
@@ -29,12 +40,12 @@ function loadUnderlyingData() {
2940
var underlyingData = [];
3041

3142
// Calls the RequestUnderlyingData method for the Card dashboard item with the specified parameters.
32-
webDashboard.RequestUnderlyingData('cardDashboardItem1', requestParameters, function (data) {
33-
dataMembers = data.GetDataMembers();
34-
for (var i = 0; i < data.GetRowCount() ; i++) {
43+
viewerApiExtension.requestUnderlyingData('cardDashboardItem1', requestParameters, function (data) {
44+
dataMembers = data.getDataMembers();
45+
for (var i = 0; i < data.getRowCount() ; i++) {
3546
var dataTableRow = {};
3647
$.each(dataMembers, function (_, dataMember) {
37-
dataTableRow[dataMember] = data.GetRowValue(i, dataMember);
48+
dataTableRow[dataMember] = data.getRowValue(i, dataMember);
3849
});
3950
underlyingData.push(dataTableRow);
4051
}

0 commit comments

Comments
 (0)