Sort sub list in Groups by any Column,

see src\AddIns\Analysis\CodeQuality\Reporting\DependencyReport.cs for example

Author: PeterForstmeier

src/AddIns/Analysis/CodeQuality/Reporting/DependencyReport.cs

@@ -19,10 +19,12 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Reflection;
 
 using ICSharpCode.Reporting;
 using ICSharpCode.Reporting.Interfaces;
+using ICSharpCode.Reporting.Items;
 using ICSharpCode.CodeQuality.Engine.Dom;
 
 namespace ICSharpCode.CodeQuality.Reporting
@@ -46,6 +48,11 @@ public IReportCreator Run(ReadOnlyCollection<AssemblyNode> list)
 			var reportingFactory = new ReportingFactory();
 			var reportCreator = reportingFactory.ReportCreator (stream,newList);
 			ReportSettings = reportingFactory.ReportModel.ReportSettings;
+			var groupColumn = (GroupColumn)ReportSettings.GroupColumnsCollection[0];
+			groupColumn.GroupSortColumn = new SortColumn() {
+				ColumnName = "ReferenceCount",
+				SortDirection = ListSortDirection.Ascending
+			};
 			reportCreator.BuildExportList();
 			return reportCreator;
 		}

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataManager/Listhandling/CollectionDataSource.cs

@@ -143,8 +143,13 @@ void Group()
 
 
 		IEnumerable<IGrouping<object, object>> GroupInternal () {
+			PropertyDescriptor sortProperty = null;
 			var groupProperty = listProperties.Find(reportSettings.GroupColumnsCollection[0].ColumnName,true);
-			var sortProperty = listProperties.Find("Randomint",true);
+			var groupColumn = (GroupColumn)reportSettings.GroupColumnsCollection[0];
+			
+			if (groupColumn.GroupSortColumn != null) {
+				sortProperty = listProperties.Find(groupColumn.GroupSortColumn.ColumnName,true);
+			}
 			IEnumerable<IGrouping<object, object>> groupedList;
 			if (sortProperty == null) {
 				groupedList = baseList.GroupBy(a => a.GetType().GetProperty(groupProperty.Name).GetValue(a, null)).OrderBy(c => c.Key);
@@ -155,7 +160,6 @@ IEnumerable<IGrouping<object, object>> GroupInternal () {
 			return groupedList;
 		}
 
-		
 		#endregion
 
 		public void Bind()
@@ -167,8 +171,8 @@ public void Bind()
 			}
 		}
 
-		#region Fill
 
+		#region Fill
 
 		public void Fill (List<IPrintableObject> collection, object current) {
 			Current = current;

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/GroupColumn.cs

@@ -43,6 +43,6 @@ public GroupColumn(string columnName,int groupLevel, ListSortDirection sortDirec
 
 		public int GroupLevel {get;private set;}
 
-		
+		public SortColumn GroupSortColumn {get;set;}
 	}
 }

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Test/ICSharpCode.Reporting.Test/src/DataSource/DataSourceFixture.cs

@@ -46,13 +46,47 @@ public void AvailableFieldsEqualContibutorsPropertyCount() {
 		}
 
 
+		[Test]
+		public void GroupbyOneColumnSortSubList () {
+			var rs = new ReportSettings();
+			var gc = new GroupColumn() {
+				ColumnName ="GroupItem",
+				SortDirection = ListSortDirection.Ascending,
+				GroupSortColumn = new SortColumn() {
+					ColumnName = "Randomint",
+					SortDirection = ListSortDirection.Ascending
+				}
+			};
+			rs.GroupColumnsCollection.Add(gc);
+			var collectionSource = new CollectionDataSource	(list,rs);
+			collectionSource.Bind();
+			var testKey = String.Empty;
+			var testSubKey = -1;
+			var groupedList = collectionSource.GroupedList;
+			foreach (var element in groupedList) {
+				Assert.That(element.Key,Is.GreaterThan(testKey));
+				testKey = element.Key.ToString();
+				foreach (Contributor sub in element) {
+					Assert.That(sub.RandomInt,Is.GreaterThanOrEqualTo(testSubKey));
+					testSubKey = sub.RandomInt;
+				}
+				testSubKey = -1;
+			}
+		}
+		
 
 		[Test]
 		public void GroupbyOneColumn () {
 			var rs = new ReportSettings();
 			rs.GroupColumnsCollection.Add( new GroupColumn("GroupItem",1,ListSortDirection.Ascending));
 			var collectionSource = new CollectionDataSource	(list,rs);
 			collectionSource.Bind();
+			var testKey = String.Empty;
+			var groupedList = collectionSource.GroupedList;
+			foreach (var element in groupedList) {
+				Assert.That(element.Key,Is.GreaterThan(testKey));
+				testKey = element.Key.ToString();
+			}
 		}