fills - [non-root] order type column filter shows badge color
This commit is contained in:
1 parent
e01c7f5372
commit
bb0aedeb0d
3 files changed
+35
-5
No files matched your search
@@ -71,9 +71,23 @@ namespace mbts.spark {
|
||||
// algo items view (common resources)
|
||||
var algo_items_comp = AlgoCollectionHelper.algo_data_vm_comparer.to_non_generic();
|
||||
var algo_items_group_desc = new PropertyGroupDescription(nameof(AlgoDataVM.group));
|
||||
// TODO: update [non-root] order type filter to use 'algo_items_source' so it includes studio algos (like the orderbook, and the new root algo column below)
|
||||
// order type
|
||||
var order_type_filter = dv_filter(OrderDataHelper.all_order_types, r => r.order?.order_type() ?? OrderType.None);
|
||||
var order_type_filter = DiscreteValuesFilterVM.CreateTableUpdate<FillTuple, AlgoDataVM, AlgoID, OrderType[]>(
|
||||
ft => new AlgoDataVM(ft.algo ?? AlgoData.empty),
|
||||
AlgoDataVM.id_fn,
|
||||
ots => Array.ConvertAll(ots ?? Array.Empty<OrderType>(), ot => AlgoID.from_algo_key(AlgoKey.from_known_type(ot))),
|
||||
ids => ids.empty_if_null().Select(AlgoID.to_algo_key).Where(k => k.mode == AlgoKey.Mode.Factory).Select(k => k.factory).ToArray(),
|
||||
out var order_type_observer,
|
||||
out var order_type_items_view);
|
||||
|
||||
order_type_items_view.CustomSort = algo_items_comp;
|
||||
order_type_items_view.GroupDescriptions.Add(algo_items_group_desc);
|
||||
order_type_observer.OnNext(TableUpdate<AlgoDataVM, AlgoID>.mk_empty(AlgoDataVM.id_fn)
|
||||
.with_added(OrderDataHelper.all_order_types
|
||||
.Select(OrderDataHelper.Defaults.CustomOrderDefinitionImmutable)
|
||||
.Select(AlgoData.from_custom_def)
|
||||
.Select(d => new AlgoDataVM(d))));
|
||||
|
||||
add_col_expl(Columns.OrderType,
|
||||
new OrderTypeColumn<Columns>(Columns.OrderType, new Binding(nameof(Row.badge_fill)), new Binding(nameof(Row.display_name)), order_type_filter) {
|
||||
id = col_id(Columns.OrderType),
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@ namespace mbts.ui.controls {
|
||||
}
|
||||
|
||||
public IDataGridColumnFilter filter { get; }
|
||||
public virtual string filter_template => DataGridFilterKnownTemplates.DiscreteValues;
|
||||
public virtual string filter_template => DataGridFilterKnownTemplates.AlgoType;
|
||||
public BindingBase font_weight_binding { get; set; }
|
||||
|
||||
public override FrameworkElement view_factory() {
|
||||
|
||||
@@ -63,8 +63,24 @@ namespace mbts.spark.filters {
|
||||
) => new DynamicItemsFilter<TRow, TValue, TState>(items, get_row_val, get_state, load_state, prop_name, equality_comparer ?? EqualityComparer<TValue>.Default, comparer);
|
||||
|
||||
public static IDataGridColumnPersistentFilter<TRow, TKey[]> CreateTableUpdate<TRow, TValue, TKey>(
|
||||
Func<TRow, TValue> factory, Func<TValue, TKey> key, out IObserver<TableUpdate<TValue, TKey>> items_observer, out ListCollectionView<TValue> items_view) where TKey : struct, IEquatable<TKey> {
|
||||
var filter = new TableUpdateItemsFilter<TRow, TValue, TKey, TKey[]>(factory, key, keys => keys, keys => keys.ToArray());
|
||||
Func<TRow, TValue> factory,
|
||||
Func<TValue, TKey> key,
|
||||
out IObserver<TableUpdate<TValue, TKey>> items_observer,
|
||||
out ListCollectionView<TValue> items_view)
|
||||
where TKey : struct, IEquatable<TKey> =>
|
||||
//
|
||||
CreateTableUpdate(factory, key, keys => keys, keys => keys.ToArray(), out items_observer, out items_view);
|
||||
|
||||
public static IDataGridColumnPersistentFilter<TRow, TState> CreateTableUpdate<TRow, TValue, TKey, TState>(
|
||||
Func<TRow, TValue> factory,
|
||||
Func<TValue, TKey> key,
|
||||
Func<TState, IEnumerable<TKey>> load_state,
|
||||
Func<IEnumerable<TKey>, TState> get_state,
|
||||
out IObserver<TableUpdate<TValue, TKey>> items_observer,
|
||||
out ListCollectionView<TValue> items_view)
|
||||
where TKey : struct, IEquatable<TKey> {
|
||||
//
|
||||
var filter = new TableUpdateItemsFilter<TRow, TValue, TKey, TState>(factory, key, load_state, get_state);
|
||||
items_observer = filter;
|
||||
items_view = filter.items_view;
|
||||
return filter;
|
||||
|
||||
Reference in new issue
Block a user