From bf4953f6dcac723e0167cda2af854069b87194fd Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 29 Mar 2019 09:45:32 -0500 Subject: [PATCH] adding TradedToday column to pnl --- src/client/spark/view/Spark/PAndL/PAndLVM.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/client/spark/view/Spark/PAndL/PAndLVM.cs b/src/client/spark/view/Spark/PAndL/PAndLVM.cs index f79228e70..27aa8ff05 100644 --- a/src/client/spark/view/Spark/PAndL/PAndLVM.cs +++ b/src/client/spark/view/Spark/PAndL/PAndLVM.cs @@ -68,6 +68,7 @@ namespace mbts.spark { total_pnl_filter.load_state(fs.total_pnl); pnl_price_filter.load_state(fs.pnl_price); security_type_filter.load_state(fs.security_types); + has_day_trades_filter.load_state(fs.has_day_trades); } else { // this is debt that will have to be paid down at some point, similar to the pnl_calc_type thing above // these should come from the default startup_data. @@ -85,6 +86,7 @@ namespace mbts.spark { add_col(Columns.DayLong, DefaultColumnHeaders.DayLong, r => r.day_long_quantity.ToString(), nameof(PnLSummaryRow.day_long_quantity), DefaultColumnWidths.PnL_Generic, day_long_quantity_filter, DataGridFilterKnownTemplates.UIntMinMax, HorizontalAlignment.Right); add_col(Columns.DayShort, DefaultColumnHeaders.DayShort, r => r.day_short_quantity.ToString(), nameof(PnLSummaryRow.day_short_quantity), DefaultColumnWidths.PnL_Generic, day_short_quantity_filter, DataGridFilterKnownTemplates.UIntMinMax, HorizontalAlignment.Right); add_col(Columns.DayPNL, DefaultColumnHeaders.DayPnL, r => r.day_pnl_text, nameof(PnLSummaryRow.day_pnl), 90, day_pnl_filter, DataGridFilterKnownTemplates.DoubleMinMax, HorizontalAlignment.Right, r => r.day_pnl_background); + add_col(Columns.TradedToday, "Traded Today", r => r.has_day_trades.ToString(), nameof(PnLSummaryRow.has_day_trades), 100, has_day_trades_filter, DataGridFilterKnownTemplates.DiscreteValues, HorizontalAlignment.Center); add_col(Columns.TotalNetPos, DefaultColumnHeaders.TotalNetPos, r => r.total_net_position.ToString(), nameof(PnLSummaryRow.total_net_position), DefaultColumnWidths.Total_Net_Pos, total_net_position_filter, DataGridFilterKnownTemplates.DoubleMinMax, HorizontalAlignment.Right); add_col(Columns.TotalPNL, DefaultColumnHeaders.TotalPnL, r => r.total_pnl_text, nameof(PnLSummaryRow.total_pnl), DefaultColumnWidths.PnL_Generic, total_pnl_filter, DataGridFilterKnownTemplates.DoubleMinMax, HorizontalAlignment.Right, r => r.total_pnl_background); add_col(Columns.PNLPrice, DefaultColumnHeaders.PnLPrice, r => r.pnl_price_text, nameof(PnLSummaryRow.pnl_price), DefaultColumnWidths.PnL_Generic, pnl_price_filter, DataGridFilterKnownTemplates.DoubleMinMax, HorizontalAlignment.Right); @@ -133,7 +135,8 @@ namespace mbts.spark { pnl_price_filter, weighted_average_buy_filter, weighted_average_sell_filter, - security_type_filter), + security_type_filter, + has_day_trades_filter), WorkLoop.Start("PAndL", _UPDATE_PERIOD, _calculate_pnl) ); } @@ -253,6 +256,7 @@ namespace mbts.spark { public IDataGridColumnPersistentFilter weighted_average_buy_filter { get; } = new DoubleMinMax(r => r.weighted_average_buy, nameof(PnLSummaryRow.weighted_average_buy)); public IDataGridColumnPersistentFilter weighted_average_sell_filter { get; } = new DoubleMinMax(r => r.weighted_average_sell, nameof(PnLSummaryRow.weighted_average_sell)); public IDataGridColumnPersistentFilter security_type_filter { get; } = DiscreteValuesFilterVM.Create(EnumHelper.get_values_except(SecurityType.Option, SecurityType.Stock, SecurityType.Synthetic).ToArray(), r => r.security_type, nameof(PnLSummaryRow.security_type)); + public IDataGridColumnPersistentFilter has_day_trades_filter { get; } = DiscreteValuesFilterVM.Create(new[] { true, false }, r => r.has_day_trades, nameof(PnLSummaryRow.has_day_trades)); public FilterStates get_filters_states() => new FilterStates { account_regex = account_filter.get_state(), @@ -267,7 +271,8 @@ namespace mbts.spark { total_net_pos = total_net_position_filter.get_state(), total_pnl = total_pnl_filter.get_state(), pnl_price = pnl_price_filter.get_state(), - security_types = security_type_filter.get_state() + security_types = security_type_filter.get_state(), + has_day_trades = has_day_trades_filter.get_state(), }; #endregion