diff --git a/src/client/spark/mspark/Shell/Fills/FillsView.xaml b/src/client/spark/mspark/Shell/Fills/FillsView.xaml index 95251292a..7972121ec 100644 --- a/src/client/spark/mspark/Shell/Fills/FillsView.xaml +++ b/src/client/spark/mspark/Shell/Fills/FillsView.xaml @@ -48,7 +48,7 @@ - + diff --git a/src/client/spark/view/Controls/SecuritySelectorControl/SecurityItem.cs b/src/client/spark/view/Controls/SecuritySelectorControl/SecurityItem.cs index d1bcbae1f..e43cbd599 100644 --- a/src/client/spark/view/Controls/SecuritySelectorControl/SecurityItem.cs +++ b/src/client/spark/view/Controls/SecuritySelectorControl/SecurityItem.cs @@ -19,6 +19,7 @@ namespace mbts.ui.spark public ContractOneofCase type => security.ContractCase; public string symbol => security.ForceSymbol(); public string display_name => security.ToString(null); + public string display_exchange => security.DisplayExchange(); public bool is_selected { get => _is_selected; set { diff --git a/src/client/spark/view/Controls/SecuritySelectorControl/SecuritySelectorControl.xaml.cs b/src/client/spark/view/Controls/SecuritySelectorControl/SecuritySelectorControl.xaml.cs index 20a766221..0894e5693 100644 --- a/src/client/spark/view/Controls/SecuritySelectorControl/SecuritySelectorControl.xaml.cs +++ b/src/client/spark/view/Controls/SecuritySelectorControl/SecuritySelectorControl.xaml.cs @@ -91,7 +91,7 @@ namespace mbts.ui.spark if (new_val != null) { new_val.ViewDestroyed += target._internal_security_items_ViewDestroyed; var vs = new CollectionViewSource(new_val); - vs.GroupDescriptions.AddRange(new[] { "exchange", "symbol", "type" }.Select(p => new PropertyGroupDescription(p))); + vs.GroupDescriptions.AddRange(new[] { "display_exchange", "symbol", "type" }.Select(p => new PropertyGroupDescription(p))); target.SecurityItemsViewSource = vs; } } diff --git a/src/client/spark_api/security/SecurityHelper.cs b/src/client/spark_api/security/SecurityHelper.cs index 53fb3b891..c1d4929f5 100644 --- a/src/client/spark_api/security/SecurityHelper.cs +++ b/src/client/spark_api/security/SecurityHelper.cs @@ -66,6 +66,10 @@ namespace bts.api if (security.ContractCase == ContractOneofCase.Synthetic) return ForceSymbol(security.Synthetic.Legs.First().Security); else return security.Symbol; } + + public static string DisplayExchange(this Security security) { + return security.ContractCase == ContractOneofCase.Synthetic ? $"[{string.Join(",", get_flat_future_legs(security).Select(flt => flt.Item1.ToString()).Distinct().OrderBy(e => e))}]" : security.Exchange.ToString(); + } #endregion } } diff --git a/tools/clientbuild.cmd b/tools/clientbuild.cmd index 8594724f7..0ae62674d 100644 --- a/tools/clientbuild.cmd +++ b/tools/clientbuild.cmd @@ -7,6 +7,5 @@ if not exist build\src\lib\spark_lib.vcxproj ( copy /y tools\cpp.build.props build\Directory.Build.Props > nul @call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\Tools\VsDevCmd.bat" > nul cd %~dp0\.. -msbuild /m /p:platform=x64 /clp:verbosity=minimal /clp:summary /t:restore spark_client.sln -msbuild /m /p:platform=x64 /p:GenerateFullPaths=true /clp:verbosity=minimal /clp:summary spark_client.sln - +msbuild /m /p:platform=x64 /clp:verbosity=minimal /clp:summary /t:restore %* spark_client.sln +msbuild /m /p:platform=x64 /p:GenerateFullPaths=true /clp:verbosity=minimal /clp:summary %* spark_client.sln