ui (day fills): Add (groupable) exp column
This commit is contained in:
1 parent
1faef425ab
commit
329ddc576d
8 files changed
+66
-1
No files matched your search
@@ -288,6 +288,7 @@ namespace bts.shell.pnl {
|
||||
|
||||
public AccountTuple account => new(account_id, account_name);
|
||||
public string symbol => security?.pnl_symbol() ?? string.Empty;
|
||||
public DateTime expiration => security?.earliest_expiration() ?? DateTime.MinValue;
|
||||
public double effective_cpp => override_cpp ?? default_cpp;
|
||||
|
||||
/// Market/Calc
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
namespace bts.shell.pnl {
|
||||
using bts.api;
|
||||
using bts.collections;
|
||||
using bts.utils;
|
||||
|
||||
using mbts;
|
||||
@@ -29,6 +30,15 @@ namespace bts.shell.pnl {
|
||||
get => _exchange ?? Array.Empty<Venue>();
|
||||
set => _exchange = value;
|
||||
}
|
||||
|
||||
// expiration
|
||||
[ProtoMember(53)]
|
||||
DateTime[] _expiration;
|
||||
public DateTime[] expiration {
|
||||
get => _expiration.empty_if_null();
|
||||
set => _expiration = value;
|
||||
}
|
||||
|
||||
// symbol
|
||||
[ProtoMember(3)]
|
||||
string[] _symbol;
|
||||
@@ -181,6 +191,7 @@ namespace bts.shell.pnl {
|
||||
other != null &&
|
||||
account.SequenceEqual(other.account) &&
|
||||
exchange.SequenceEqual(other.exchange) &&
|
||||
expiration.SequenceEqual(other.expiration) &&
|
||||
symbol.SequenceEqual(other.symbol) &&
|
||||
security_type.SequenceEqual(other.security_type) &&
|
||||
security == other.security &&
|
||||
@@ -251,6 +262,7 @@ namespace bts.shell.pnl {
|
||||
// impl (add all)
|
||||
bd.add_discrete_values(fs.account, d => d.key.account_id);
|
||||
bd.add_discrete_values(fs.exchange, d => d.security.exchange_or_default());
|
||||
bd.add_discrete_values(fs.expiration, d => d.expiration);
|
||||
bd.add_discrete_values(fs.symbol, d => d.symbol);
|
||||
bd.add_discrete_values(fs.security_type, d => d.security.HasValue ? d.security.Value.ContractCase : Security.ContractOneofCase.None);
|
||||
bd.add_regex(fs.security, d => d.security.ToString());
|
||||
|
||||
@@ -79,6 +79,7 @@ namespace bts.shell.pnl {
|
||||
new[] {
|
||||
Columns.Account,
|
||||
Columns.Exchange,
|
||||
Columns.Expiration,
|
||||
Columns.Symbol,
|
||||
Columns.SecurityType,
|
||||
Columns.Security
|
||||
@@ -113,6 +114,7 @@ namespace bts.shell.pnl {
|
||||
new PNLSettings {
|
||||
_sorting_criteria = new[] {
|
||||
new SortingCriteria(nameof(Columns.Account), true),
|
||||
new SortingCriteria(nameof(Columns.Expiration), true),
|
||||
new SortingCriteria(nameof(Columns.Security), true)
|
||||
},
|
||||
filters = new FilterStates {
|
||||
@@ -133,7 +135,7 @@ namespace bts.shell.pnl {
|
||||
tick_factors = new TickFactors(100, 1)
|
||||
}
|
||||
},
|
||||
_anchors = new[] { Columns.Account, Columns.Symbol },
|
||||
_anchors = new[] { Columns.Account, Columns.Expiration, Columns.Symbol },
|
||||
_group_background_colors = BTSColors.PNL.group_alternating_background_colors.Select(c => c.rgb_color()).ToList(),
|
||||
_group_cell_appearance = new PNLCellAppearanceProto {
|
||||
font_params = new FontParamsProto {
|
||||
@@ -382,6 +384,8 @@ namespace bts.shell.pnl {
|
||||
public static GridColumnSettings account => new GridColumnSettings(nameof(Columns.Account), DefaultColumnHeaders.Account, width: Widths.Account);
|
||||
public static GridColumnSettings exchange => new GridColumnSettings(nameof(Columns.Exchange), DefaultColumnHeaders.Exchange, false, width: Widths.Exchange);
|
||||
public static GridColumnSettings symbol => new GridColumnSettings(nameof(Columns.Symbol), DefaultColumnHeaders.Symbol, width: Widths.Symbol);
|
||||
public static GridColumnSettings expiration => new(
|
||||
nameof(Columns.Expiration), DefaultColumnHeaders.Expiration, width: Widths.Expiration);
|
||||
public static GridColumnSettings security_type => new GridColumnSettings(nameof(Columns.SecurityType), Headers.SecurityType, width: Widths.SecurityType);
|
||||
public static GridColumnSettings security => new GridColumnSettings(nameof(Columns.Security), DefaultColumnHeaders.Security, width: Widths.Security);
|
||||
public static GridColumnSettings security_key => new GridColumnSettings(nameof(Columns.SecurityKey), DefaultColumnHeaders.SecurityKey, false, width: DefaultColumnWidths.SecurityKey);
|
||||
@@ -516,6 +520,7 @@ namespace bts.shell.pnl {
|
||||
get {
|
||||
yield return account;
|
||||
yield return exchange;
|
||||
yield return expiration;
|
||||
yield return symbol;
|
||||
yield return security_type;
|
||||
yield return security;
|
||||
|
||||
@@ -45,6 +45,10 @@ namespace bts.shell.pnl {
|
||||
account_cell = _cell_map.add(ColumnKeys.Account, d => d.account);
|
||||
security_type_cell = _cell_map.add(ColumnKeys.SecurityType, d => d.security?.ContractCase ?? Security.ContractOneofCase.None);
|
||||
exchange_cell = _cell_map.add(ColumnKeys.Exchange, d => d.security?.Exchange ?? Venue.Unset);
|
||||
expiration_cell = _cell_map.add(
|
||||
ColumnKeys.Expiration,
|
||||
d => d.expiration,
|
||||
e => SecurityFormatter.format_expiration(e));
|
||||
symbol_cell = _cell_map.add(ColumnKeys.Symbol, d => d.symbol);
|
||||
security_cell = _cell_map.add(ColumnKeys.Security, d => (d.security), null, EqualityComparer<SecurityImmutable?>.Default, Comparer<SecurityImmutable>.Default.to_nullable());
|
||||
security_key = _cell_map.add(ColumnKeys.SecurityKey, d => d.key.security_id);
|
||||
@@ -177,11 +181,13 @@ namespace bts.shell.pnl {
|
||||
public string account_name => data.account_name;
|
||||
public Venue exchange => security?.Exchange ?? Venue.Unset;
|
||||
public string symbol => security.symbol_or_default();
|
||||
public DateTime expiration => data.expiration;
|
||||
public Security.ContractOneofCase security_type => security?.ContractCase ?? Security.ContractOneofCase.None;
|
||||
public SecurityImmutable? security => data.security;
|
||||
// cells
|
||||
public PNLCellVM<PNLRowData, AccountTuple> account_cell { get; }
|
||||
public PNLCellVM<PNLRowData, Venue> exchange_cell { get; }
|
||||
public PNLCellVM<PNLRowData, DateTime> expiration_cell { get; }
|
||||
public PNLCellVM<PNLRowData, string> symbol_cell { get; }
|
||||
public PNLCellVM<PNLRowData, Security.ContractOneofCase> security_type_cell { get; }
|
||||
public PNLCellVM<PNLRowData, SecurityImmutable?> security_cell { get; }
|
||||
|
||||
@@ -113,6 +113,12 @@ namespace bts.shell.pnl {
|
||||
out var symbol_filter_items_observer,
|
||||
out var symbol_filter_items_view);
|
||||
symbol_filter_items_view.CustomSort = Comparer<string>.Default.to_safe().to_non_generic();
|
||||
expiration_filter = DiscreteValuesFilterVM.CreateTableUpdate<PNLRowData, DateTime, DateTime>(
|
||||
r => r.expiration,
|
||||
exp => exp,
|
||||
out var expiration_filter_items_observer,
|
||||
out var expiration_filter_items_view);
|
||||
expiration_filter_items_view.CustomSort = Comparer<DateTime>.Default.to_non_generic();
|
||||
_refresh_filter = new DeferrableActionWrapper(() => _filter_changed?.Invoke(get_filters_states().build_predicate()));
|
||||
var filter_src = Observable.Create<Func<PNLRowData, bool>>(o => {
|
||||
o.OnNext(get_filters_states().build_predicate());
|
||||
@@ -132,6 +138,8 @@ namespace bts.shell.pnl {
|
||||
.OnDispatcher()
|
||||
.Subscribe(_update),
|
||||
_symbols_source(position_model.pnl).OnDispatcher().Subscribe(symbol_filter_items_observer),
|
||||
_expirations_source(position_model.pnl).OnDispatcher()
|
||||
.Subscribe(expiration_filter_items_observer),
|
||||
Disposable.Create(() => {
|
||||
foreach (var f in _all_filters)
|
||||
f.filter_changed -= _refresh_filter.execute;
|
||||
@@ -212,6 +220,7 @@ namespace bts.shell.pnl {
|
||||
/// security
|
||||
public IDataGridColumnPersistentFilter<PNLRowData, uint[]> account_filter { get; }
|
||||
public IDataGridColumnPersistentFilter<PNLRowData, Venue[]> exchange_filter { get; } = DiscreteValuesFilterVM.Common.exchange<PNLRowData>(r => r.security.exchange_or_default(), nameof(PNLRowVM.exchange));
|
||||
public IDataGridColumnPersistentFilter<PNLRowData, DateTime[]> expiration_filter { get; }
|
||||
public IDataGridColumnPersistentFilter<PNLRowData, string[]> symbol_filter { get; }
|
||||
public IDataGridColumnPersistentFilter<PNLRowData, string> security_filter { get; } = new RegexFilterVM<PNLRowData>(r => r.security?.ToString(), nameof(PNLRowData.security));
|
||||
public IDataGridColumnPersistentFilter<PNLRowData, string> security_key_filter { get; } = new RegexFilterVM<PNLRowData>(r => r.key.security_id.ToString());
|
||||
@@ -287,6 +296,7 @@ namespace bts.shell.pnl {
|
||||
public FilterStates get_filters_states() => new FilterStates {
|
||||
account = account_filter.get_state(),
|
||||
exchange = exchange_filter.get_state(),
|
||||
expiration = expiration_filter.get_state(),
|
||||
symbol = symbol_filter.get_state(),
|
||||
security_type = security_type_filter.get_state(),
|
||||
security = security_filter.get_state(),
|
||||
@@ -351,6 +361,7 @@ namespace bts.shell.pnl {
|
||||
/// security
|
||||
account_filter.load_state(f.account);
|
||||
exchange_filter.load_state(f.exchange);
|
||||
expiration_filter.load_state(f.expiration);
|
||||
symbol_filter.load_state(f.symbol);
|
||||
security_type_filter.load_state(f.security_type);
|
||||
security_filter.load_state(f.security);
|
||||
@@ -539,6 +550,7 @@ namespace bts.shell.pnl {
|
||||
case ColumnKeys.Exchange: return wrap(r => r.exchange);
|
||||
case ColumnKeys.SecurityType: return wrap(r => r.security?.ContractCase ?? SecurityType.None);
|
||||
case ColumnKeys.Symbol: return wrap(r => r.symbol);
|
||||
case ColumnKeys.Expiration: return wrap(r => r.expiration);
|
||||
case ColumnKeys.Security: return wrap(r => r.security);
|
||||
case ColumnKeys.SecurityKey: return wrap(r => r.security_key);
|
||||
case ColumnKeys.CPP: return wrap(r => r.cpp);
|
||||
@@ -605,6 +617,13 @@ namespace bts.shell.pnl {
|
||||
yield return col_hash.Contains(c.id) ? c.with(is_visible: false) : c;
|
||||
}
|
||||
|
||||
static IObservable<TableUpdate<DateTime, DateTime>> _expirations_source(
|
||||
IObservable<TableUpdate<PNLRowData, PNLKey>> pnl_source) =>
|
||||
pnl_source
|
||||
.StartWith(TableUpdate<PNLRowData, PNLKey>.mk_empty(PNLRowData.key_fn))
|
||||
.distinct_on(PNLRowData.key_fn, r => r.expiration, e => e)
|
||||
.Filter(e => e != DateTime.MinValue);
|
||||
|
||||
// combines the known system symbols
|
||||
static IObservable<TableUpdate<string, string>> _symbols_source(IObservable<TableUpdate<PNLRowData, PNLKey>> pnl_source) =>
|
||||
pnl_source
|
||||
|
||||
@@ -679,6 +679,17 @@
|
||||
sort_member_path="symbol"
|
||||
HeaderTemplate="{StaticResource AnchorableColumnHeaderTemplate}"
|
||||
/>
|
||||
<!--Expiration-->
|
||||
<pnl:PNLColumn
|
||||
c:DataGridFilterProperties.Filter="{Binding DataContext.expiration_filter, Source={u:DirectReference _grid}}"
|
||||
c:DataGridFilterProperties.FilterTemplate="{StaticResource {x:Static ft:DataGridFilterKnownTemplates.DiscreteValuesCollectionView}}"
|
||||
c:DataGridFilterProperties.FilterActive="{Binding DataContext.expiration_filter.active, Source={u:DirectReference _grid}}"
|
||||
c:DataGridFilterProperties.FilterOpen="{Binding DataContext.expiration_filter.open, Source={u:DirectReference _grid}}"
|
||||
key="Expiration"
|
||||
data_member_path="expiration_cell.cell_data"
|
||||
sort_member_path="expiration"
|
||||
HeaderTemplate="{StaticResource AnchorableColumnHeaderTemplate}"
|
||||
/>
|
||||
<!--Security Type-->
|
||||
<pnl:PNLColumn
|
||||
c:DataGridFilterProperties.Filter="{Binding DataContext.security_type_filter, Source={u:DirectReference _grid}}"
|
||||
@@ -1125,6 +1136,14 @@
|
||||
<c:TextCell c:DIYGrid.ColumnKey="Account" DataContext="{Binding account_cell}" Style="{StaticResource RowTextCell}" Visibility="{Binding AnchorIndex.anchors.Account, RelativeSource={RelativeSource AncestorType=pnl:PNLView}, Converter={StaticResource FalseVisibilityConverter}}"/>
|
||||
<c:TextCell c:DIYGrid.ColumnKey="Exchange" DataContext="{Binding exchange_cell}" Style="{StaticResource RowTextCell}" Visibility="{Binding AnchorIndex.anchors.Exchange, RelativeSource={RelativeSource AncestorType=pnl:PNLView}, Converter={StaticResource FalseVisibilityConverter}}"/>
|
||||
<c:TextCell c:DIYGrid.ColumnKey="Symbol" DataContext="{Binding symbol_cell}" Style="{StaticResource RowTextCell}" Visibility="{Binding AnchorIndex.anchors.Symbol, RelativeSource={RelativeSource AncestorType=pnl:PNLView}, Converter={StaticResource FalseVisibilityConverter}}"/>
|
||||
<c:TextCell
|
||||
c:DIYGrid.ColumnKey="Expiration"
|
||||
DataContext="{Binding expiration_cell}"
|
||||
Style="{StaticResource RowTextCell}"
|
||||
Visibility="{Binding
|
||||
AnchorIndex.anchors.Expiration,
|
||||
RelativeSource={RelativeSource AncestorType=pnl:PNLView},
|
||||
Converter={StaticResource FalseVisibilityConverter}}" />
|
||||
<c:TextCell c:DIYGrid.ColumnKey="SecurityType" DataContext="{Binding security_type_cell}" Style="{StaticResource RowTextCell}" Visibility="{Binding AnchorIndex.anchors.SecurityType, RelativeSource={RelativeSource AncestorType=pnl:PNLView}, Converter={StaticResource FalseVisibilityConverter}}"/>
|
||||
<c:TextCell c:DIYGrid.ColumnKey="Security" DataContext="{Binding security_cell}" Style="{StaticResource RowTextCell}" Visibility="{Binding AnchorIndex.anchors.Security, RelativeSource={RelativeSource AncestorType=pnl:PNLView}, Converter={StaticResource FalseVisibilityConverter}}"/>
|
||||
<c:TextCell c:DIYGrid.ColumnKey="SecurityKey" DataContext="{Binding security_key}" Style="{StaticResource RowTextCell}"/>
|
||||
|
||||
@@ -42,6 +42,7 @@ namespace bts.shell.pnl {
|
||||
// Security
|
||||
Exchange,
|
||||
Symbol,
|
||||
Expiration,
|
||||
SecurityType,
|
||||
Security,
|
||||
SecurityKey,
|
||||
|
||||
@@ -77,6 +77,7 @@
|
||||
// 'PNL Account' is a bit wider than normal Account cols, bc it is a 'grouping' column, so it has additional content/icons
|
||||
Account = 100,
|
||||
Exchange = 85,
|
||||
Expiration = 75,
|
||||
Symbol = 72,
|
||||
Security = DefaultColumnWidths.Security,
|
||||
Qty = 42,
|
||||
@@ -105,6 +106,7 @@
|
||||
AvgCost = "Avg Cost",
|
||||
AttachedTargetOrderKey = "Attached Target Key",
|
||||
Exchange = "Exchange",
|
||||
Expiration = "Exp",
|
||||
FillKey = "Fill Key",
|
||||
FillTime = "Fill Time",
|
||||
OrderKey = "Order Key",
|
||||
|
||||
Reference in new issue
Block a user