diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index a01e480a7..a39d61f45 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -35,9 +35,8 @@ namespace mbts.spark fill_percentage_filter = new DoubleMinMax(r => r.fill_percentage, nameof(Row.fill_percentage)); order_percentage_filter = new DoubleMinMax(r => r.order_percentage, nameof(Row.order_percentage)); order_status_filter = new DiscreteValues(_row_vms, r => r.order_status, nameof(Row.order_status)); - bts_fill_id_filter = new RegexFinder(r => r.bts_fill_id, nameof(Row.bts_fill_id)); - bts_order_id_filter = new RegexFinder(r => r.bts_order_id, nameof(Row.bts_order_id)); - exch_order_id_filter = new RegexFinder(r => r.exch_order_id, nameof(Row.exch_order_id)); + fill_key_filter = new RegexFinder(r => r.fill_key, nameof(Row.fill_key)); + order_key_filter = new RegexFinder(r => r.order_key, nameof(Row.order_key)); if (filters != null) { order_time_filter.load_state(filters.order_time); fill_time_filter.load_state(filters.fill_time); @@ -53,13 +52,12 @@ namespace mbts.spark fill_percentage_filter.load_state(filters.fill_percentage); order_percentage_filter.load_state(filters.order_percentage); order_status_filter.load_state(filters.order_status); - bts_fill_id_filter.load_state(filters.bts_fill_id); - bts_order_id_filter.load_state(filters.bts_order_id); - exch_order_id_filter.load_state(filters.exch_order_id); + fill_key_filter.load_state(filters.fill_key); + order_key_filter.load_state(filters.order_key); } _resources.Add(hook_filters(rows_view, order_time_filter, fill_time_filter, time_in_force_filter, order_type_filter, account_filter, user_filter, exchange_filter, security_filter, side_filter, - price_filter, size_filter, fill_percentage_filter, order_percentage_filter, order_status_filter, bts_fill_id_filter, bts_order_id_filter, exch_order_id_filter + price_filter, size_filter, fill_percentage_filter, order_percentage_filter, order_status_filter, fill_key_filter, order_key_filter )); } @@ -77,9 +75,8 @@ namespace mbts.spark public IDataGridColumnPersistentFilter fill_percentage_filter { get; } public IDataGridColumnPersistentFilter order_percentage_filter { get; } public IDataGridColumnPersistentFilter order_status_filter { get; } - public IDataGridColumnPersistentFilter bts_fill_id_filter { get; } - public IDataGridColumnPersistentFilter bts_order_id_filter { get; } - public IDataGridColumnPersistentFilter exch_order_id_filter { get; } + public IDataGridColumnPersistentFilter fill_key_filter { get; } + public IDataGridColumnPersistentFilter order_key_filter { get; } public FilterStates get_filters() => new FilterStates { @@ -97,9 +94,8 @@ namespace mbts.spark fill_percentage = fill_percentage_filter.get_state(), order_percentage = order_percentage_filter.get_state(), order_status = order_status_filter.get_state(), - bts_fill_id = bts_fill_id_filter.get_state(), - bts_order_id = bts_order_id_filter.get_state(), - exch_order_id = exch_order_id_filter.get_state() + fill_key = fill_key_filter.get_state(), + order_key = order_key_filter.get_state(), }; protected override Row row_factory(FillTuple row_model) => new Row(row_model, _model); @@ -132,9 +128,8 @@ namespace mbts.spark public double fill_percentage => _fill.LastShares / (double)_order.State.Quantity; public double order_percentage => (double)_order.State.FilledQuantity / (double)_order.State.Quantity; public OrderStatus order_status => _order.State.Status; - public string bts_fill_id => _fill.FillKey; - public string bts_order_id => _order.Key.ToString(); - public string exch_order_id => "None because this is a simulation."; + public string fill_key => _fill.FillKey; + public string order_key => _order.Key.ToString(); } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/Fills/FillsView.xaml b/src/client/spark/Modules/Trading/Fills/FillsView.xaml index a1f4428ee..60bd374a7 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsView.xaml +++ b/src/client/spark/Modules/Trading/Fills/FillsView.xaml @@ -31,16 +31,21 @@ CurrentItem="{Binding current_row, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" u:DataGridBehavior.NotifyColumnsOfSorting="True" BorderThickness="0"> - + + - - + - - - - diff --git a/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs b/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs index c72966aec..5f1b70d59 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs @@ -7,7 +7,7 @@ namespace mbts.ui.spark /// public partial class FillsView : UserControl { - public enum Columns { OrderTime, FillTime, User, Account, Exchange, Security, TimeInForce, AlgoType, Side, Price, Size, FillPercentage, OrderPercentage, OrderStatus, BTSFillID, BTSOrderID, ExchangeOrderID } + public enum Columns { OrderTime, FillTime, User, Account, Exchange, Security, TimeInForce, OrderType, Side, Price, Size, FillPercentage, OrderPercentage, OrderStatus, FillKey, OrderKey, ExchangeOrderID } public FillsView() { InitializeComponent(); diff --git a/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs b/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs index a109af865..5901a1e30 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs @@ -75,11 +75,9 @@ namespace bts.shell [ProtoMember(14)] public OrderStatus[] order_status; [ProtoMember(15)] - public string bts_fill_id; + public string fill_key; [ProtoMember(16)] - public string bts_order_id; - [ProtoMember(17)] - public string exch_order_id; + public string order_key; } } } \ No newline at end of file