diff --git a/src/client/spark/Modules/Trading/PNL/Data/PNLData.cs b/src/client/spark/Modules/Trading/PNL/Data/PNLData.cs index 97da32e59..8964a94c8 100644 --- a/src/client/spark/Modules/Trading/PNL/Data/PNLData.cs +++ b/src/client/spark/Modules/Trading/PNL/Data/PNLData.cs @@ -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 diff --git a/src/client/spark/Modules/Trading/PNL/Settings/PNLFilterStates.cs b/src/client/spark/Modules/Trading/PNL/Settings/PNLFilterStates.cs index 079f370f6..71269f906 100644 --- a/src/client/spark/Modules/Trading/PNL/Settings/PNLFilterStates.cs +++ b/src/client/spark/Modules/Trading/PNL/Settings/PNLFilterStates.cs @@ -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(); 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()); diff --git a/src/client/spark/Modules/Trading/PNL/Settings/PNLSettings.cs b/src/client/spark/Modules/Trading/PNL/Settings/PNLSettings.cs index 0f5080797..2263f51d7 100644 --- a/src/client/spark/Modules/Trading/PNL/Settings/PNLSettings.cs +++ b/src/client/spark/Modules/Trading/PNL/Settings/PNLSettings.cs @@ -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; diff --git a/src/client/spark/Modules/Trading/PNL/VM/PNLRowVM.cs b/src/client/spark/Modules/Trading/PNL/VM/PNLRowVM.cs index 627a29050..2cb412704 100644 --- a/src/client/spark/Modules/Trading/PNL/VM/PNLRowVM.cs +++ b/src/client/spark/Modules/Trading/PNL/VM/PNLRowVM.cs @@ -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.Default, Comparer.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 account_cell { get; } public PNLCellVM exchange_cell { get; } + public PNLCellVM expiration_cell { get; } public PNLCellVM symbol_cell { get; } public PNLCellVM security_type_cell { get; } public PNLCellVM security_cell { get; } diff --git a/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs b/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs index 0a4bf9808..71bbcd13e 100644 --- a/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs +++ b/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs @@ -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.Default.to_safe().to_non_generic(); + expiration_filter = DiscreteValuesFilterVM.CreateTableUpdate( + r => r.expiration, + exp => exp, + out var expiration_filter_items_observer, + out var expiration_filter_items_view); + expiration_filter_items_view.CustomSort = Comparer.Default.to_non_generic(); _refresh_filter = new DeferrableActionWrapper(() => _filter_changed?.Invoke(get_filters_states().build_predicate())); var filter_src = Observable.Create>(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 account_filter { get; } public IDataGridColumnPersistentFilter exchange_filter { get; } = DiscreteValuesFilterVM.Common.exchange(r => r.security.exchange_or_default(), nameof(PNLRowVM.exchange)); + public IDataGridColumnPersistentFilter expiration_filter { get; } public IDataGridColumnPersistentFilter symbol_filter { get; } public IDataGridColumnPersistentFilter security_filter { get; } = new RegexFilterVM(r => r.security?.ToString(), nameof(PNLRowData.security)); public IDataGridColumnPersistentFilter security_key_filter { get; } = new RegexFilterVM(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> _expirations_source( + IObservable> pnl_source) => + pnl_source + .StartWith(TableUpdate.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> _symbols_source(IObservable> pnl_source) => pnl_source diff --git a/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml b/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml index 7851f1061..933b214d9 100644 --- a/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml +++ b/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml @@ -679,6 +679,17 @@ sort_member_path="symbol" HeaderTemplate="{StaticResource AnchorableColumnHeaderTemplate}" /> + + + diff --git a/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml.cs b/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml.cs index ff7b6d9b5..b817dc3af 100644 --- a/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml.cs +++ b/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml.cs @@ -42,6 +42,7 @@ namespace bts.shell.pnl { // Security Exchange, Symbol, + Expiration, SecurityType, Security, SecurityKey, diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs index 74f95a428..b44639cd2 100644 --- a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs +++ b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs @@ -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",