Skip to content

Commit aedfe7a

Browse files
gmurray81gmurray81
committed
add grouping stubs
1 parent e70b834 commit aedfe7a

7 files changed

Lines changed: 72 additions & 24 deletions

File tree

‎DataSource.DataProviders.OData/DataSource.DataProviders.OData.Core/DataSource.DataProviders.OData.Core.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@
4040
</ItemGroup>
4141
<ItemGroup>
4242
<Reference Include="Infragistics.Core">
43-
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\Xamarin\2017.1\Source\Build\Infragistics.Core.dll</HintPath>
43+
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\Xamarin\2017.2\Source\Build\Infragistics.Core.dll</HintPath>
4444
</Reference>
4545
<Reference Include="Infragistics.Core.DataVisualization">
46-
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\Xamarin\2017.1\Source\Build\Infragistics.Core.DataVisualization.dll</HintPath>
46+
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\Xamarin\2017.2\Source\Build\Infragistics.Core.DataVisualization.dll</HintPath>
4747
</Reference>
4848
<Reference Include="Infragistics.Core.Platform">
49-
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\Xamarin\2017.1\Source\Build\Infragistics.Core.Platform.dll</HintPath>
49+
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\Xamarin\2017.2\Source\Build\Infragistics.Core.Platform.dll</HintPath>
5050
</Reference>
5151
<Reference Include="Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5252
<HintPath>..\packages\Microsoft.Data.Edm.5.6.4\lib\portable-net45+wp8+win8+wpa\Microsoft.Data.Edm.dll</HintPath>

‎DataSource.DataProviders.OData/DataSource.DataProviders.OData/DataSource.DataProviders.OData.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="InfragisticsWPF4.DataVisualization.v16.1, Version=16.1.0.9000, Culture=neutral, PublicKeyToken=1102135f7483647e, processorArchitecture=MSIL">
36-
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2016.1\Source\Build\InfragisticsWPF4.DataVisualization.v16.1.dll</HintPath>
35+
<Reference Include="InfragisticsWPF4.DataVisualization.v17.2, Version=17.2.0.9000, Culture=neutral, PublicKeyToken=1102135f7483647e, processorArchitecture=MSIL">
36+
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2017.2\Source\Build\InfragisticsWPF4.DataVisualization.v17.2.dll</HintPath>
3737
<SpecificVersion>False</SpecificVersion>
3838
</Reference>
39-
<Reference Include="InfragisticsWPF4.v16.1, Version=16.1.0.9000, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL">
39+
<Reference Include="InfragisticsWPF4.v17.2, Version=17.2.0.9000, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL">
4040
<SpecificVersion>False</SpecificVersion>
41-
<HintPath>c:\work\NetAdvantage\DEV\XAML\2016.1\Source\Build\InfragisticsWPF4.v16.1.dll</HintPath>
41+
<HintPath>c:\work\NetAdvantage\DEV\XAML\2017.2\Source\Build\InfragisticsWPF4.v17.2.dll</HintPath>
4242
</Reference>
4343
<Reference Include="Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4444
<HintPath>..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>

‎DataSource.DataProviders.OData/ODataSampleApp/MainWindow.xaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@
66
xmlns:local="clr-namespace:ODataSampleApp"
77
mc:Ignorable="d"
88
Title="MainWindow" Height="350" Width="525"
9-
xmlns:grid="clr-namespace:Infragistics.Controls;assembly=InfragisticsWPF4.Controls.Grids.XGrid.v16.1">
9+
xmlns:grid="clr-namespace:Infragistics.Controls;assembly=InfragisticsWPF4.Controls.Grids.XGrid.v17.2">
1010
<Grid>
11-
<grid:XGrid
11+
<grid:XamDataGrid
1212
Grid.Row="1"
1313
Name="grid1"
1414
RowHeight="50"
1515
RowSeparatorHeight="1"
1616
AutoGenerateColumns="False"
1717
>
1818

19-
<grid:XGrid.Columns>
20-
<grid:TextColumn Key="CustomerID" Title="Customer ID" />
21-
<grid:TextColumn Key="ShipName" Title="Ship Name" />
22-
<grid:NumericColumn Key="OrderID" Title="Order ID" />
23-
<grid:TextColumn Key="ShipCountry" Title="Ship Country" />
24-
</grid:XGrid.Columns>
25-
</grid:XGrid>
19+
<grid:XamDataGrid.Columns>
20+
<grid:TextColumn PropertyPath="CustomerID" HeaderText="Customer ID" />
21+
<grid:TextColumn PropertyPath="ShipName" HeaderText="Ship Name" />
22+
<grid:NumericColumn PropertyPath="OrderID" HeaderText="Order ID" />
23+
<grid:TextColumn PropertyPath="ShipCountry" HeaderText="Ship Country" />
24+
</grid:XamDataGrid.Columns>
25+
</grid:XamDataGrid>
2626
</Grid>
2727
</Window>

‎DataSource.DataProviders.OData/ODataSampleApp/ODataSampleApp.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@
3737
<WarningLevel>4</WarningLevel>
3838
</PropertyGroup>
3939
<ItemGroup>
40-
<Reference Include="InfragisticsWPF4.Controls.Grids.XGrid.v16.1, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1102135f7483647e, processorArchitecture=MSIL">
40+
<Reference Include="InfragisticsWPF4.Controls.Grids.XGrid.v17.2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1102135f7483647e, processorArchitecture=MSIL">
4141
<SpecificVersion>False</SpecificVersion>
42-
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2016.1\Source\Build\InfragisticsWPF4.Controls.Grids.XGrid.v16.1.dll</HintPath>
42+
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2017.2\Source\Build\InfragisticsWPF4.Controls.Grids.XGrid.v17.2.dll</HintPath>
4343
</Reference>
44-
<Reference Include="InfragisticsWPF4.DataVisualization.v16.1, Version=16.1.0.9000, Culture=neutral, PublicKeyToken=1102135f7483647e, processorArchitecture=MSIL">
44+
<Reference Include="InfragisticsWPF4.DataVisualization.v17.2, Version=17.2.0.9000, Culture=neutral, PublicKeyToken=1102135f7483647e, processorArchitecture=MSIL">
4545
<SpecificVersion>False</SpecificVersion>
46-
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2016.1\Source\Build\InfragisticsWPF4.DataVisualization.v16.1.dll</HintPath>
46+
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2017.2\Source\Build\InfragisticsWPF4.DataVisualization.v17.2.dll</HintPath>
4747
</Reference>
48-
<Reference Include="InfragisticsWPF4.v16.1, Version=16.1.0.9000, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL">
48+
<Reference Include="InfragisticsWPF4.v17.2, Version=17.2.0.9000, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL">
4949
<SpecificVersion>False</SpecificVersion>
50-
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2016.1\Source\Build\InfragisticsWPF4.v16.1.dll</HintPath>
50+
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2017.2\Source\Build\InfragisticsWPF4.v17.2.dll</HintPath>
5151
</Reference>
5252
<Reference Include="Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5353
<HintPath>..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>

‎DataSource.DataProviders.SQLite/DataSource.DataProviders.SQLite.Core/DataSource.DataProviders.SQLite.Core.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
</ItemGroup>
3939
<ItemGroup>
4040
<Reference Include="Infragistics.Core">
41-
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\Xamarin\2017.1\Source\Build\Infragistics.Core.dll</HintPath>
41+
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\Xamarin\2017.2\Source\Build\Infragistics.Core.dll</HintPath>
4242
</Reference>
4343
<Reference Include="Infragistics.Core.DataVisualization">
44-
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\Xamarin\2017.1\Source\Build\Infragistics.Core.DataVisualization.dll</HintPath>
44+
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\Xamarin\2017.2\Source\Build\Infragistics.Core.DataVisualization.dll</HintPath>
4545
</Reference>
4646
<Reference Include="SQLite-net, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
4747
<HintPath>..\..\..\..\visual studio 2015\Projects\SQLDemo\packages\sqlite-net-pcl.1.3.1\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLite-net.dll</HintPath>

‎DataSource.DataProviders.SQLite/SQLiteDataProvider/SQLiteVirtualDataSourceDataProvider.cs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ public SQLiteVirtualDataSourceDataProvider()
3535
{
3636
_sortDescriptions = new SortDescriptionCollection();
3737
_sortDescriptions.CollectionChanged += SortDescriptions_CollectionChanged;
38+
_groupDescriptions = new SortDescriptionCollection();
39+
_groupDescriptions.CollectionChanged += GroupDescriptions_CollectionChanged;
3840
_filterExpressions = new FilterExpressionCollection();
3941
_filterExpressions.CollectionChanged += FilterExpressions_CollectionChanged;
4042
}
@@ -49,6 +51,11 @@ private void SortDescriptions_CollectionChanged(object sender, System.Collection
4951
QueueAutoRefresh();
5052
}
5153

54+
private void GroupDescriptions_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
55+
{
56+
QueueAutoRefresh();
57+
}
58+
5259
public void AddPageRequest(int pageIndex, DataSourcePageRequestPriority priority)
5360
{
5461
if (DeferAutoRefresh)
@@ -423,6 +430,14 @@ public bool IsSortingSupported
423430
}
424431
}
425432

433+
public bool IsGroupingSupported
434+
{
435+
get
436+
{
437+
return false;
438+
}
439+
}
440+
426441
public bool IsFilteringSupported
427442
{
428443
get
@@ -440,6 +455,15 @@ public SortDescriptionCollection SortDescriptions
440455
}
441456
}
442457

458+
private SortDescriptionCollection _groupDescriptions;
459+
public SortDescriptionCollection GroupDescriptions
460+
{
461+
get
462+
{
463+
return _groupDescriptions;
464+
}
465+
}
466+
443467
private string[] _propertiesRequested;
444468
public string[] PropertiesRequested
445469
{

‎ODataDataProvider/ODataVirtualDataSourceDataProvider.cs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ public class ODataVirtualDataSourceDataProvider
3333
public ODataVirtualDataSourceDataProvider()
3434
{
3535
_sortDescriptions = new SortDescriptionCollection();
36+
_groupDescriptions = new SortDescriptionCollection();
3637
_sortDescriptions.CollectionChanged += SortDescriptions_CollectionChanged;
38+
_groupDescriptions.CollectionChanged += GroupDescriptions_CollectionChanged;
3739
_filterExpressions = new FilterExpressionCollection();
3840
_filterExpressions.CollectionChanged += FilterExpressions_CollectionChanged;
3941
}
@@ -48,6 +50,11 @@ private void SortDescriptions_CollectionChanged(object sender, System.Collection
4850
QueueAutoRefresh();
4951
}
5052

53+
private void GroupDescriptions_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
54+
{
55+
QueueAutoRefresh();
56+
}
57+
5158
public void AddPageRequest(int pageIndex, DataSourcePageRequestPriority priority)
5259
{
5360
if (DeferAutoRefresh)
@@ -426,6 +433,23 @@ public bool IsKeyIndexLookupSupported
426433
}
427434
}
428435

436+
public bool IsGroupingSupported
437+
{
438+
get
439+
{
440+
return false;
441+
}
442+
}
443+
444+
private SortDescriptionCollection _groupDescriptions;
445+
public SortDescriptionCollection GroupDescriptions
446+
{
447+
get
448+
{
449+
return _groupDescriptions;
450+
}
451+
}
452+
429453
public void NotifySetItem(int index, object oldItem, object newItem)
430454
{
431455
if (UpdateNotifier != null)

0 commit comments

Comments
 (0)