From b07eec08b4e4949dc386a7af5e13b6fea44e9e4a Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 1 Apr 2019 10:36:25 -0500 Subject: [PATCH] Yes No formatting in row --- .../Filters/DataGridFilterHelper.cs | 3 ++- .../Filters/Views/FilterTemplates.xaml | 21 +++++++++++++++++++ .../spark/view/Resources/Converters.xaml | 3 +++ .../spark/view/Spark/PAndL/PnLSummaryRow.cs | 2 ++ 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/DataGridFilterHelper.cs b/src/client/spark/view/Controls/DataGridEx/Filters/DataGridFilterHelper.cs index 864026520..96308bbda 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/DataGridFilterHelper.cs +++ b/src/client/spark/view/Controls/DataGridEx/Filters/DataGridFilterHelper.cs @@ -63,6 +63,7 @@ namespace mbts.spark.filters { TimeFilter = "TimeFilterTemplate", DiscreteValues = "DiscreteValuesTemplate", EnumValues = "EnumValuesTemplate", - Regex = "RegexTemplate"; + Regex = "RegexTemplate", + YesNo = "YesNoTemplate"; } } \ No newline at end of file diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/Views/FilterTemplates.xaml b/src/client/spark/view/Controls/DataGridEx/Filters/Views/FilterTemplates.xaml index 925c3958a..26ff10f0a 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/Views/FilterTemplates.xaml +++ b/src/client/spark/view/Controls/DataGridEx/Filters/Views/FilterTemplates.xaml @@ -146,6 +146,27 @@ /> + + + + + + + + + + + + + + diff --git a/src/client/spark/view/Spark/PAndL/PnLSummaryRow.cs b/src/client/spark/view/Spark/PAndL/PnLSummaryRow.cs index 5d4d12c92..fa9dc2ec8 100644 --- a/src/client/spark/view/Spark/PAndL/PnLSummaryRow.cs +++ b/src/client/spark/view/Spark/PAndL/PnLSummaryRow.cs @@ -186,6 +186,8 @@ namespace mbts.spark { public string weighted_average_sell_text => _weighted_average_sell.text; // public bool has_day_trades => day_long_quantity != 0 || day_short_quantity != 0; + public string has_day_trades_text => has_day_trades ? "Yes" : "No"; + public void raise_invalidated() => invalidated?.Invoke();