Skip to content

Commit 3a110b9

Browse files
ES-976509 - Modified the code changes and committed the changes
1 parent 92855d7 commit 3a110b9

File tree

5 files changed

+47
-83
lines changed

5 files changed

+47
-83
lines changed

WPF/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
55
</startup>
66
</configuration>

WPF/App.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public partial class App : Application
2222
{
2323
public App()
2424
{
25-
Syncfusion.Licensing.SyncfusionLicenseProvider.RegisterLicense(Syncfusion.Licensing.DemoCommon.FindLicenseKey());
25+
Syncfusion.Licensing.SyncfusionLicenseProvider.RegisterLicense("License Key");
2626
}
2727
}
2828
}

WPF/MainWindow.xaml

Lines changed: 44 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -5,70 +5,54 @@
55
xmlns:syncfusion="http://schemas.syncfusion.com/wpf"
66
Title="MainWindow"
77
Icon="App.ico"
8-
syncfusion:LayoutControl.SetMetroMode="True" WindowStartupLocation="CenterScreen" Height="500">
8+
WindowStartupLocation="CenterScreen" Height="500">
99
<syncfusion:ChromelessWindow.DataContext>
1010
<local:ViewModel />
1111
</syncfusion:ChromelessWindow.DataContext>
1212
<Grid>
13-
14-
<syncfusion:LayoutControl HeaderDescriptionText="This sample shows how data with parent-child relationships can be bound to SfDataGrid."
15-
HeaderText="Master DetailsView"
16-
LayoutMode="Metro"
17-
UserOptionsVisibility="Collapsed">
18-
<syncfusion:LayoutControl.Resources>
19-
<ResourceDictionary>
20-
<ResourceDictionary.MergedDictionaries>
21-
<ResourceDictionary Source="/Syncfusion.SfGrid.WPF;component/Styles/Styles.xaml" />
22-
</ResourceDictionary.MergedDictionaries>
23-
</ResourceDictionary>
24-
</syncfusion:LayoutControl.Resources>
25-
<syncfusion:LayoutControl.GridView>
26-
<syncfusion:SfDataGrid x:Name="dataGrid"
27-
AutoGenerateColumns="False"
28-
HideEmptyGridViewDefinition="True"
29-
ItemsSource="{Binding Path=OrdersDetails}"
30-
NavigationMode="Cell"
31-
ShowGroupDropArea="True">
32-
<syncfusion:SfDataGrid.DetailsViewDefinition>
33-
<syncfusion:GridViewDefinition RelationalColumn="OrderDetails">
34-
<syncfusion:GridViewDefinition.DataGrid>
35-
<syncfusion:SfDataGrid x:Name="FirstDetailsViewGrid">
36-
<syncfusion:SfDataGrid.Columns>
37-
<syncfusion:GridTextColumn MappingName="OrderID" />
38-
<syncfusion:GridTextColumn MappingName="ProductID" TextAlignment="Right" />
39-
<syncfusion:GridTextColumn HeaderText="Unit Price"
40-
MappingName="UnitPrice"
41-
TextAlignment="Right" />
42-
<syncfusion:GridTextColumn MappingName="Quantity" TextAlignment="Right" />
43-
<syncfusion:GridTextColumn MappingName="Discount" TextAlignment="Right" />
44-
<syncfusion:GridTextColumn MappingName="CustomerID" />
45-
<syncfusion:GridDateTimeColumn HeaderText="Order Date"
46-
MappingName="OrderDate"
47-
TextAlignment="Right" />
48-
</syncfusion:SfDataGrid.Columns>
49-
</syncfusion:SfDataGrid>
50-
</syncfusion:GridViewDefinition.DataGrid>
51-
</syncfusion:GridViewDefinition>
52-
</syncfusion:SfDataGrid.DetailsViewDefinition>
53-
54-
55-
<syncfusion:SfDataGrid.Columns>
56-
<syncfusion:GridTextColumn MappingName="OrderID" />
57-
<syncfusion:GridTextColumn MappingName="CustomerID" />
58-
<syncfusion:GridDateTimeColumn Width="200"
59-
HeaderText="Shipping Date"
60-
MappingName="ShippingDate"
13+
<syncfusion:SfDataGrid x:Name="dataGrid"
14+
AutoGenerateColumns="False"
15+
HideEmptyGridViewDefinition="True"
16+
ItemsSource="{Binding Path=OrdersDetails}"
17+
NavigationMode="Cell"
18+
ShowGroupDropArea="True">
19+
<syncfusion:SfDataGrid.DetailsViewDefinition>
20+
<syncfusion:GridViewDefinition RelationalColumn="OrderDetails">
21+
<syncfusion:GridViewDefinition.DataGrid>
22+
<syncfusion:SfDataGrid x:Name="FirstDetailsViewGrid">
23+
<syncfusion:SfDataGrid.Columns>
24+
<syncfusion:GridTextColumn MappingName="OrderID" />
25+
<syncfusion:GridTextColumn MappingName="ProductID" TextAlignment="Right" />
26+
<syncfusion:GridTextColumn HeaderText="Unit Price"
27+
MappingName="UnitPrice"
28+
TextAlignment="Right" />
29+
<syncfusion:GridTextColumn MappingName="Quantity" TextAlignment="Right" />
30+
<syncfusion:GridTextColumn MappingName="Discount" TextAlignment="Right" />
31+
<syncfusion:GridTextColumn MappingName="CustomerID" />
32+
<syncfusion:GridDateTimeColumn HeaderText="Order Date"
33+
MappingName="OrderDate"
6134
TextAlignment="Right" />
62-
<syncfusion:GridNumericColumn HeaderText="Supplier ID"
63-
MappingName="EmployeeID"
64-
NumberDecimalDigits="0" />
65-
<syncfusion:GridTextColumn HeaderText="Ship City" MappingName="ShipCity" />
66-
<syncfusion:GridTextColumn HeaderText="Ship Country" MappingName="ShipCountry" />
67-
<syncfusion:GridCurrencyColumn CurrencySymbol="$" MappingName="Freight" />
68-
<syncfusion:GridCheckBoxColumn HeaderText="Closed" MappingName="IsClosed" />
69-
</syncfusion:SfDataGrid.Columns>
70-
</syncfusion:SfDataGrid>
71-
</syncfusion:LayoutControl.GridView>
72-
</syncfusion:LayoutControl>
35+
</syncfusion:SfDataGrid.Columns>
36+
</syncfusion:SfDataGrid>
37+
</syncfusion:GridViewDefinition.DataGrid>
38+
</syncfusion:GridViewDefinition>
39+
</syncfusion:SfDataGrid.DetailsViewDefinition>
40+
41+
<syncfusion:SfDataGrid.Columns>
42+
<syncfusion:GridTextColumn MappingName="OrderID" />
43+
<syncfusion:GridTextColumn MappingName="CustomerID" />
44+
<syncfusion:GridDateTimeColumn Width="200"
45+
HeaderText="Shipping Date"
46+
MappingName="ShippingDate"
47+
TextAlignment="Right" />
48+
<syncfusion:GridNumericColumn HeaderText="Supplier ID"
49+
MappingName="EmployeeID"
50+
NumberDecimalDigits="0" />
51+
<syncfusion:GridTextColumn HeaderText="Ship City" MappingName="ShipCity" />
52+
<syncfusion:GridTextColumn HeaderText="Ship Country" MappingName="ShipCountry" />
53+
<syncfusion:GridCurrencyColumn CurrencySymbol="$" MappingName="Freight" />
54+
<syncfusion:GridCheckBoxColumn HeaderText="Closed" MappingName="IsClosed" />
55+
</syncfusion:SfDataGrid.Columns>
56+
</syncfusion:SfDataGrid>
7357
</Grid>
7458
</syncfusion:ChromelessWindow>

WPF/MainWindow.xaml.cs

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,7 @@
55
// [email protected]. Any infringement will be prosecuted under
66
// applicable laws.
77
#endregion
8-
using System.Data.SqlServerCe;
9-
using MasterDetailsViewDemo;
10-
using Syncfusion.Windows.Controls.Grid;
118
using Syncfusion.Windows.Shared;
12-
using System;
13-
using System.Collections.Generic;
14-
using System.Collections.ObjectModel;
15-
using System.Linq;
16-
using System.Text;
17-
using System.Threading.Tasks;
18-
using System.Windows;
19-
using System.Windows.Controls;
20-
using System.Windows.Data;
21-
using System.Windows.Documents;
22-
using System.Windows.Input;
23-
using System.Windows.Media;
24-
using System.Windows.Media.Imaging;
25-
using System.Windows.Navigation;
26-
using System.Windows.Shapes;
279

2810
namespace MasterDetailsViewDemo
2911
{
@@ -46,7 +28,6 @@ private void DataGrid_QueryDetailsViewExpanderState(object sender, Syncfusion.UI
4628
if (orderInfo.OrderDetails.Count == 0)
4729
{
4830
e.ExpanderVisibility = false;
49-
5031
}
5132
}
5233
}

WPF/MasterDetailsViewDemo_2017.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>MasterDetailsViewDemo</RootNamespace>
1111
<AssemblyName>GroupingDemo</AssemblyName>
12-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1515
<WarningLevel>4</WarningLevel>
@@ -40,7 +40,6 @@
4040
<ItemGroup>
4141
<Reference Include="PresentationFramework.Aero" />
4242
<Reference Include="Syncfusion.Data.WPF"></Reference>
43-
<Reference Include="Syncfusion.SampleLayout"></Reference>
4443
<Reference Include="Syncfusion.SfGrid.WPF"></Reference>
4544
<Reference Include="Syncfusion.Shared.Wpf"></Reference>
4645
<Reference Include="Syncfusion.Linq.Base"></Reference>

0 commit comments

Comments
 (0)