SPARK-420 Fills Window cleanup

This commit is contained in:
John Colvin committed 2018-02-01 16:15:23 -05:00
1 parent c221b427b2
commit 0aaaeb6687
4 files changed
+41 -53

No files matched your search

@@ -35,9 +35,8 @@ namespace mbts.spark
fill_percentage_filter = new DoubleMinMax<Row>(r => r.fill_percentage, nameof(Row.fill_percentage));
order_percentage_filter = new DoubleMinMax<Row>(r => r.order_percentage, nameof(Row.order_percentage));
order_status_filter = new DiscreteValues<Row, OrderStatus>(_row_vms, r => r.order_status, nameof(Row.order_status));
bts_fill_id_filter = new RegexFinder<Row>(r => r.bts_fill_id, nameof(Row.bts_fill_id));
bts_order_id_filter = new RegexFinder<Row>(r => r.bts_order_id, nameof(Row.bts_order_id));
exch_order_id_filter = new RegexFinder<Row>(r => r.exch_order_id, nameof(Row.exch_order_id));
fill_key_filter = new RegexFinder<Row>(r => r.fill_key, nameof(Row.fill_key));
order_key_filter = new RegexFinder<Row>(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<Row, DoubleMinMaxState> fill_percentage_filter { get; }
public IDataGridColumnPersistentFilter<Row, DoubleMinMaxState> order_percentage_filter { get; }
public IDataGridColumnPersistentFilter<Row, OrderStatus[]> order_status_filter { get; }
public IDataGridColumnPersistentFilter<Row, string> bts_fill_id_filter { get; }
public IDataGridColumnPersistentFilter<Row, string> bts_order_id_filter { get; }
public IDataGridColumnPersistentFilter<Row, string> exch_order_id_filter { get; }
public IDataGridColumnPersistentFilter<Row, string> fill_key_filter { get; }
public IDataGridColumnPersistentFilter<Row, string> 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();
}
}
}
@@ -31,16 +31,21 @@
CurrentItem="{Binding current_row, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
u:DataGridBehavior.NotifyColumnsOfSorting="True" BorderThickness="0">
<DataGrid.Columns>
<DataGridTextColumn Header="Order Time" Binding="{Binding order_time, StringFormat='M/d H:mm:ss'}"
c:DataGridEx.CellKey="{u:Enum OrderTime, Type={u:Nested usp:FillsView.Columns}}"
c:DataGridFilterProperties.Filter="{Binding DataContext.order_time_filter, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterActive="{Binding DataContext.order_time_filter.active, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterTemplate="{StaticResource TimeFilterTemplate}"/>
<DataGridTextColumn Header="Security" Binding="{Binding security}"
c:DataGridEx.CellKey="{u:Enum Security, Type={u:Nested usp:FillsView.Columns}}"
c:DataGridFilterProperties.Filter="{Binding DataContext.security_filter, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterActive="{Binding DataContext.security_filter.active, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterTemplate="{StaticResource DiscreteValuesTemplate}"/>
<DataGridTextColumn Header="Fill Time" Binding="{Binding fill_time, StringFormat='M/d H:mm:ss'}"
c:DataGridEx.CellKey="{u:Enum FillTime, Type={u:Nested usp:FillsView.Columns}}"
c:DataGridFilterProperties.Filter="{Binding DataContext.fill_time_filter, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterActive="{Binding DataContext.fill_time_filter.active, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterTemplate="{StaticResource TimeFilterTemplate}"/>
<DataGridTextColumn Header="Order Time" Binding="{Binding order_time, StringFormat='M/d H:mm:ss'}"
c:DataGridEx.CellKey="{u:Enum OrderTime, Type={u:Nested usp:FillsView.Columns}}"
c:DataGridFilterProperties.Filter="{Binding DataContext.order_time_filter, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterActive="{Binding DataContext.order_time_filter.active, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterTemplate="{StaticResource TimeFilterTemplate}"/>
<DataGridTextColumn Header="User" Binding="{Binding user}"
c:DataGridEx.CellKey="{u:Enum User, Type={u:Nested usp:FillsView.Columns}}"
c:DataGridFilterProperties.Filter="{Binding DataContext.user_filter, Source={u:DirectReference grid}}"
@@ -56,26 +61,26 @@
c:DataGridFilterProperties.Filter="{Binding DataContext.exchange_filter, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterActive="{Binding DataContext.exchange_filter.active, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterTemplate="{StaticResource DiscreteValuesTemplate}"/>
<DataGridTextColumn Header="Security" Binding="{Binding security}"
c:DataGridEx.CellKey="{u:Enum Security, Type={u:Nested usp:FillsView.Columns}}"
c:DataGridFilterProperties.Filter="{Binding DataContext.security_filter, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterActive="{Binding DataContext.security_filter.active, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterTemplate="{StaticResource DiscreteValuesTemplate}"/>
<DataGridTextColumn Header="TIF" Binding="{Binding time_in_force}"
c:DataGridEx.CellKey="{u:Enum TimeInForce, Type={u:Nested usp:FillsView.Columns}}"
c:DataGridFilterProperties.Filter="{Binding time_in_force_filter, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterActive="{Binding DataContext.time_in_force_filter.active, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterTemplate="{StaticResource DiscreteValuesTemplate}"/>
<usp:DataGridOrderTypeColumn Header="Algo" ElementStyle="{StaticResource OrderTypeElement}" SortMemberPath="algo_type"
c:DataGridEx.CellKey="{u:Enum AlgoType, Type={u:Nested usp:FillsView.Columns}}"
c:DataGridFilterProperties.Filter="{Binding DataContext.algo_type_filter, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterActive="{Binding DataContext.algo_type_filter.active, Source={u:DirectReference grid}}"
<usp:DataGridOrderTypeColumn Header="Order Type" ElementStyle="{StaticResource OrderTypeElement}" SortMemberPath="order_type"
c:DataGridEx.CellKey="{u:Enum OrderType, Type={u:Nested usp:FillsView.Columns}}"
c:DataGridFilterProperties.Filter="{Binding DataContext.order_type_filter, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterActive="{Binding DataContext.order_type_filter.active, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterTemplate="{StaticResource DiscreteValuesTemplate}"/>
<DataGridTextColumn Header="B/S" ElementStyle="{StaticResource SideColorCodedTextElement}" Binding="{Binding side}"
c:DataGridEx.CellKey="{u:Enum Side, Type={u:Nested usp:FillsView.Columns}}"
c:DataGridFilterProperties.Filter="{Binding DataContext.side_filter, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterActive="{Binding DataContext.side_filter.active, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterTemplate="{StaticResource DiscreteValuesTemplate}"/>
<DataGridTextColumn Header="Qty" Binding="{Binding size_text}" SortMemberPath="size"
c:DataGridEx.CellKey="{u:Enum Size, Type={u:Nested usp:FillsView.Columns}}"
c:DataGridFilterProperties.Filter="{Binding DataContext.size_filter, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterActive="{Binding DataContext.size_filter.active, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterTemplate="{StaticResource UIntMinMaxTemplate}"/>
<DataGridTextColumn Header="Price" SortMemberPath="price"
c:DataGridEx.CellKey="{u:Enum Price, Type={u:Nested usp:FillsView.Columns}}"
c:DataGridFilterProperties.Filter="{Binding DataContext.price_filter, Source={u:DirectReference grid}}"
@@ -88,11 +93,6 @@
</MultiBinding>
</DataGridTextColumn.Binding>
</DataGridTextColumn>
<DataGridTextColumn Header="Qty" Binding="{Binding size_text}" SortMemberPath="size"
c:DataGridEx.CellKey="{u:Enum Size, Type={u:Nested usp:FillsView.Columns}}"
c:DataGridFilterProperties.Filter="{Binding DataContext.size_filter, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterActive="{Binding DataContext.size_filter.active, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterTemplate="{StaticResource UIntMinMaxTemplate}"/>
<DataGridTextColumn Header="Filled%" Binding="{Binding fill_percentage, StringFormat=P1}"
c:DataGridEx.CellKey="{u:Enum FillPercentage, Type={u:Nested usp:FillsView.Columns}}"
c:DataGridFilterProperties.Filter="{Binding DataContext.fill_percentage_filter, Source={u:DirectReference grid}}"
@@ -108,20 +108,15 @@
c:DataGridFilterProperties.Filter="{Binding DataContext.order_status_filter, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterActive="{Binding DataContext.order_status_filter.active, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterTemplate="{StaticResource DiscreteValuesTemplate}"/>
<DataGridTextColumn Header="BTS Fill" Binding="{Binding bts_fill_id}"
c:DataGridEx.CellKey="{u:Enum BTSFillID, Type={u:Nested usp:FillsView.Columns}}"
c:DataGridFilterProperties.Filter="{Binding DataContext.bts_fill_id_filter, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterActive="{Binding DataContext.bts_fill_id_filter.active, Source={u:DirectReference grid}}"
<DataGridTextColumn Header="Fill Key" Binding="{Binding fill_key}"
c:DataGridEx.CellKey="{u:Enum FillKey, Type={u:Nested usp:FillsView.Columns}}"
c:DataGridFilterProperties.Filter="{Binding DataContext.fill_key_filter, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterActive="{Binding DataContext.fill_key_filter.active, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterTemplate="{StaticResource RegexFinder}"/>
<DataGridTextColumn Header="BTS Order" Binding="{Binding bts_order_id}"
c:DataGridEx.CellKey="{u:Enum BTSOrderID, Type={u:Nested usp:FillsView.Columns}}"
c:DataGridFilterProperties.Filter="{Binding DataContext.bts_order_id_filter, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterActive="{Binding DataContext.bts_order_id_filter.active, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterTemplate="{StaticResource RegexFinder}"/>
<DataGridTextColumn Header="Exchange Order" Width="*" Binding="{Binding exch_order_id}"
c:DataGridEx.CellKey="{u:Enum ExchangeOrderID, Type={u:Nested usp:FillsView.Columns}}"
c:DataGridFilterProperties.Filter="{Binding DataContext.exchange_order_id_filter, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterActive="{Binding DataContext.exchange_order_id_filter.active, Source={u:DirectReference grid}}"
<DataGridTextColumn Header="Order Key" Binding="{Binding order_key}"
c:DataGridEx.CellKey="{u:Enum OrderKey, Type={u:Nested usp:FillsView.Columns}}"
c:DataGridFilterProperties.Filter="{Binding DataContext.order_key_filter, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterActive="{Binding DataContext.order_key_filter.active, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterTemplate="{StaticResource RegexFinder}"/>
</DataGrid.Columns>
</DataGrid>
@@ -7,7 +7,7 @@ namespace mbts.ui.spark
/// </summary>
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();
@@ -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;
}
}
}