From 91042cb41e8a4572c69462f9d81bf2bbc152de7c Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 5 Sep 2024 17:13:32 -0400 Subject: [PATCH] fix: Support multiple exchanges in exp params view/vm --- .../AnalyticsExpirationParametersVM.cs | 11 ++++++++++- .../AnalyticsExpirationParametersView.xaml.cs | 3 ++- .../spark/view/Converters/ExpirationTextConverter.cs | 11 ++++++++--- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersVM.cs b/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersVM.cs index 0a0a6ad6c..7417b2ba8 100644 --- a/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersVM.cs +++ b/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersVM.cs @@ -206,7 +206,16 @@ namespace mbts.spark { .Where(d => d.HasSecurity && d.Security.Symbol == r.security.symbol) .Where(d => is_unexpired(d)) .TryGetMinElement( - d => (r.security.expiration - d.Security.Expiration.date_time()).Ticks.abs(), + d => { + var expDiff = (r.security.expiration - d.Security.Expiration.date_time()).Ticks.abs(); + if (r.security.exchange != d.Security.Exchange.to_venue()) { + // This is a hack to favor the security from the same venue as the row's + // security in the event of a tie (for the nearest exp). As long as exp + // dates are separated by more than 1 tick (100ns), the hack will work. + expDiff += 1; + } + return expDiff; + }, out var nearest_exp)) { r.driver = nearest_exp; } diff --git a/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersView.xaml.cs b/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersView.xaml.cs index 95d93c21b..154e0ed04 100644 --- a/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersView.xaml.cs +++ b/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersView.xaml.cs @@ -39,7 +39,8 @@ namespace mbts.ui.shell { new() { ShowSymbol = true, ShowType = true, - MapExp = true + MapExp = true, + ShowVenue = true, }; public static IValueConverter driver_display_text_converter => diff --git a/src/client/spark/view/Converters/ExpirationTextConverter.cs b/src/client/spark/view/Converters/ExpirationTextConverter.cs index b38f50837..8eb421454 100644 --- a/src/client/spark/view/Converters/ExpirationTextConverter.cs +++ b/src/client/spark/view/Converters/ExpirationTextConverter.cs @@ -4,10 +4,10 @@ namespace mbts.ui.converters { using System; using System.Globalization; - using System.Text; using System.Windows.Data; class ExpirationTextConverter : IValueConverter { + public bool ShowVenue { get; set; } public bool ShowType { get; set; } public bool ShowSymbol { get; set; } public bool MapExp { get; set; } @@ -22,11 +22,16 @@ namespace mbts.ui.converters { object value, Type target_type, object parameter, CultureInfo culture) => throw new NotImplementedException(); - public string convert(SecurityExpiration exp) => - SecurityFormatter.format_expiration( + public string convert(SecurityExpiration exp) { + var rv = SecurityFormatter.format_expiration( exp.expiration, ShowSymbol ? exp.symbol : null, ShowType ? exp.security_type.contract_case() : null, DateFormat); + if (ShowVenue) { + rv = $"{rv} ({exp.exchange})"; + } + return rv; + } } }