From 7f349cfa7152de026262cebe26b5d451f9f37751 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 4 May 2022 11:46:35 -0400 Subject: [PATCH] ui: Use converter to generate 'pretty name' for sec criteria clause --- .../SecurityCriteriaClauseTextConverter.cs | 28 +++++++++++++++ .../SecurityCriteriaTextConverter.cs | 34 +++++++++++++++++++ .../ContractPicker/ContractPickerView.xaml | 15 +++++++- 3 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 src/client/spark/view/Converters/SecurityCriteriaClauseTextConverter.cs create mode 100644 src/client/spark/view/Converters/SecurityCriteriaTextConverter.cs diff --git a/src/client/spark/view/Converters/SecurityCriteriaClauseTextConverter.cs b/src/client/spark/view/Converters/SecurityCriteriaClauseTextConverter.cs new file mode 100644 index 000000000..b6f2c6370 --- /dev/null +++ b/src/client/spark/view/Converters/SecurityCriteriaClauseTextConverter.cs @@ -0,0 +1,28 @@ +namespace mbts.ui.converters { + using mbts.spark; + + using System; + using System.Collections.Generic; + using System.Globalization; + using System.Windows.Data; + + class SecurityCriteriaClauseTextConverter : IMultiValueConverter { + public static SecurityCriteriaClauseTextConverter Instance => new(); + + public object Convert( + object[] values, Type target_type, object parameter, CultureInfo culture) { + if (!ConvertUtils.try_convert_args( + values, + out SecurityCriteriaClause clause, + out IReadOnlyDictionary sec_md_map)) { + return null; + } + return clause.pretty_name ?? clause.fmt_pretty( + id => sec_md_map.TryGetValue(id, out var smd) ? smd.security.Symbol : string.Empty); + } + + public object[] ConvertBack( + object value, Type[] target_types, object parameter, CultureInfo culture) => + throw new NotImplementedException(); + } +} diff --git a/src/client/spark/view/Converters/SecurityCriteriaTextConverter.cs b/src/client/spark/view/Converters/SecurityCriteriaTextConverter.cs new file mode 100644 index 000000000..23f6a2e71 --- /dev/null +++ b/src/client/spark/view/Converters/SecurityCriteriaTextConverter.cs @@ -0,0 +1,34 @@ +namespace mbts.ui.converters { + using bts.utils; + + using mbts.spark; + + using System; + using System.Collections.Generic; + using System.Globalization; + using System.Linq; + using System.Windows.Data; + + class SecurityCriteriaTextConverter : IMultiValueConverter { + public static SecurityCriteriaTextConverter Instance => new(); + + public object Convert( + object[] values, Type target_type, object parameter, CultureInfo culture) { + if (!ConvertUtils.try_convert_args( + values, + out SecurityCriteria criteria, + out IReadOnlyDictionary sec_md_map)) { + return null; + } + return $" {SpecialCharacters.DotChar} ".join( + criteria.clauses.Select( + c => c.pretty_name ?? c.fmt_pretty( + id => sec_md_map.TryGetValue(id, out var smd) ? + smd.security.Symbol : string.Empty))); + } + + public object[] ConvertBack( + object value, Type[] target_types, object parameter, CultureInfo culture) => + throw new NotImplementedException(); + } +} diff --git a/src/client/spark/view/Spark/ContractPicker/ContractPickerView.xaml b/src/client/spark/view/Spark/ContractPicker/ContractPickerView.xaml index 200104930..7a0b6490e 100644 --- a/src/client/spark/view/Spark/ContractPicker/ContractPickerView.xaml +++ b/src/client/spark/view/Spark/ContractPicker/ContractPickerView.xaml @@ -352,7 +352,6 @@ Visibility="{Binding is_edit_mode, Converter={StaticResource BoolToVisibility}}" SelectionMode="Extended" SelectedValuePath="value" - DisplayMemberPath="value" Margin="12,0,0,10" VerticalAlignment="Stretch" Height="90"> @@ -372,6 +371,20 @@ + + + + + + + + + + + +