mview synth fills popup only shows fills of synth root algos

This commit is contained in:
John Colvin committed 2019-12-09 14:56:12 -06:00
1 parent 896b4bc318
commit 7583dcd386
3 files changed
+15 -5

No files matched your search

@@ -412,7 +412,6 @@ namespace mbts.spark {
var state = StartupData.DefaultAuxiliaryFills;
if (state.filters == null)
state.filters = new bts.shell.fills.FillsFilterStates();
state.filters.security = SecurityCriteria.from_keys(securities.Select(SecurityDataHelper.key_fn));
switch (column) {
case Columns.RawDayPosition:
state.filters.fill_kind = new[] {
@@ -427,6 +426,12 @@ namespace mbts.spark {
break;
}
state.grid = GridSettingsHelper.hide_cols(state.grid, new[] { ui.spark.FillsView.Columns.Security });
var sec_keys = securities.Select(SecurityDataHelper.key_fn);
if (securities.All(s => s.ContractCase == Security.ContractOneofCase.Synthetic)) {
state.root_securities = sec_keys.ToArray();
} else {
state.filters.security = SecurityCriteria.from_keys(sec_keys);
}
var vm = new FillsVM(
_bus, _orders_model, Observable.Return(state), new WindowSettingsManager<GridSettings>.DisconnectedImpl(state.grid));
return (vm, $"{string.Join(_security_delimiter, securities)}", title_desc, fg);
@@ -214,10 +214,13 @@ namespace mbts.spark {
((IKeyedColumn<Columns>)column).key;
static IObservable<TableUpdate<FillTuple, string>> _get_observable(IBus bus, OrdersModel model, FillsSettings state) {
if (!state.orders.is_null_or_empty()) {
var orders_hash = new HashSet<uint>(state.orders);
return model.on_fill_tuples_with_root.Filter(f => orders_hash.Contains(f.fill.OrderKey));
} else return model.on_fill_tuples_with_root;
var orders_hash = state.orders.is_null_or_empty() ? null : new HashSet<uint>(state.orders);
var root_securities_hash = state.root_securities.is_null_or_empty() ? null : new HashSet<uint>(state.root_securities);
return orders_hash == null && root_securities_hash == null ?
model.on_fill_tuples_with_root :
model.on_fill_tuples_with_root.Filter(f =>
(orders_hash == null || orders_hash.Contains(f.fill.OrderKey)) &&
(root_securities_hash == null || root_securities_hash.Contains(f.root_order_security?.security?.Id ?? 0)));
}
static IObservable<TableUpdate<FillTuple, string>> _get_observable(IBus bus, OrdersModel model, IObservable<FillsSettings> state) =>
@@ -38,6 +38,8 @@ namespace bts.shell.fills {
public static IEnumerable<Columns> mini_column_keys => DefaultColumns.Mini.mini_cols_data.Keys;
public IReadOnlyList<SortingCriteria> sorting_criterion => _sorting_criteria ?? (_sorting_criteria = DefaultColumns.default_sorting_criterion.ToList());
public uint[] root_securities { get; set; }
public static FillsSettings Default() =>
new FillsSettings(null, null, new FillsFilterStates(), null);