Переглянути джерело

Fixes to filters on StockForecast screen

Kenric Nugteren 6 місяців тому
батько
коміт
7c5ecdd77f

+ 4 - 4
prs.desktop/Panels/Stock Forecast/StockForecastGrid.cs

@@ -345,8 +345,8 @@ public class StockForecastGrid : DynamicItemsListGrid<StockForecastItem>, IDataM
             Tag = tag,
             HeaderText = header,
             GetFilter = () => new DynamicColumnFilter<double?>(
-                r => GetColumnCalculatedData(tag, r),
-                () => GetColumnFilterItems(tag))
+                    r => GetColumnCalculatedData(tag, r),
+                    filter => GetColumnFilterItems(filter, tag))
         };
         ActionColumns.Add(column);
     }
@@ -642,10 +642,10 @@ public class StockForecastGrid : DynamicItemsListGrid<StockForecastItem>, IDataM
         };
     }
 
-    private IEnumerable<Tuple<string, double?>> GetColumnFilterItems(ColumnTag tag)
+    private IEnumerable<Tuple<string, double?>> GetColumnFilterItems(DynamicColumnFilter<double?> filter, ColumnTag tag)
     {
         var items = new HashSet<double>();
-        foreach(var row in Data.Rows)
+        foreach(var row in (filter as IDynamicGridColumnFilter).GetRowsToFilter(this))
         {
             var value = GetColumnCalculatedData(tag, row);
             if (value.HasValue)