From 6eda42122aa19947df441c8a5d6e307e41df6672 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 1 Oct 2019 09:51:56 -0500 Subject: [PATCH] DynamicOrderVM 'SecurityKey' descriptor impl --- .../Orders/OrderTypeVMs/DynamicOrderHelper.cs | 1 + .../spark/Orders/OrderTypeVMs/DynamicOrderVM.cs | 14 ++++++++------ .../Orders/OrderTypeVMs/OrderTypeVMFactory.cs | 15 +++++++++++++-- src/client/spark/view/Resources/TemplateKeys.cs | 6 ++++++ 4 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 src/client/spark/view/Resources/TemplateKeys.cs diff --git a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs index 81178590c..7a657e393 100644 --- a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs +++ b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs @@ -62,6 +62,7 @@ namespace mbts.spark { case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveInt: param.AsInt32 = 0; break; case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveOrderDef: param.AsOrderDef = new CustomOrderDefinition(); break; case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveString: param.AsString = string.Empty; break; + case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveSecurityKey: case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveUint: param.AsUint32 = 0u; break; case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveQuantity: param.AsQuantity = new bts.spark.QuantityMeasure(); break; } diff --git a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs index d69230589..d28c554a2 100644 --- a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs @@ -4,6 +4,7 @@ using bts.collections; using bts.spark; using mbts.collections; using mbts.spark.utilities; +using mbts.ui; using mbts.ui.utility; using mbts.utils; using System; @@ -73,9 +74,9 @@ namespace mbts.spark { case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveDouble: return mk(DynamicOrderParam.AsDoubleFieldNumber, v => v, v => v, double.NaN); case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveInt: return mk(DynamicOrderParam.AsInt32FieldNumber, v => v, v => v.GetValueOrDefault()); case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveUint: return mk(DynamicOrderParam.AsUint32FieldNumber, v => v, v => v.GetValueOrDefault()); + case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveSecurityKey: return mk(DynamicOrderParam.AsUint32FieldNumber, v => v, v => v.GetValueOrDefault(), template_key: TemplateKeys.SecurityKey); case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveString: return mk(DynamicOrderParam.AsStringFieldNumber, v => v, v => v); - case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveQuantity: - { + case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveQuantity: { var qm = new DynamicOrderQuantityVM(descriptor); return attached(qm, DynamicOrderHelper.get_quantity_value, DynamicOrderHelper.set_quantity_value, new QuantityMeasure { Ratio = 1.0, Absolute = 1 }); } @@ -88,16 +89,16 @@ namespace mbts.spark { default: throw ExceptionBuilder.Argument.unexpected_case(descriptor.ParamType.DescriptorCase, nameof(descriptor)); } - DynamicOrderParamVM mk(int field_number, Func convert, Func convert_back, TView default_value = default) { + DynamicOrderParamVM mk(int field_number, Func convert, Func convert_back, TView default_value = default, string template_key = null) { var fdesc = DynamicOrderParam.Descriptor.FindFieldByNumber(field_number); var pvm = new DynamicOrderParamVM(descriptor, fdesc, convert, convert_back); - return attached>(pvm, get_from_param, assign_to_param, default_value); + return attached>(pvm, get_from_param, assign_to_param, default_value, template_key); TView get_from_param(DynamicOrderParam param) => convert(ConvertUtils.try_convert(fdesc.Accessor.GetValue(param))); void assign_to_param(DynamicOrderParam param, TView value) => fdesc.Accessor.SetValue(param, convert_back(value)); } - TParam attached(TParam pvm, Func selector, Action assign_to_param, T default_value = default) where TParam : DynamicOrderParamVM, IDynamicOrderParamVM { + TParam attached(TParam pvm, Func selector, Action assign_to_param, T default_value = default, string template_key = null) where TParam : DynamicOrderParamVM, IDynamicOrderParamVM { add_property( pvm.descriptor.ParamName, mdef => mdef.OrderParams.TryGetValue(pvm.descriptor.ParamName, out DynamicOrderParam p) ? selector(p) : default_value, @@ -105,7 +106,8 @@ namespace mbts.spark { () => pvm.value, v => pvm.value = v, pvm.subscribe_value(), - default_value); + default_value, + template_key: template_key); return pvm; } } diff --git a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs index b24547c8e..ba74637e2 100644 --- a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs +++ b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs @@ -542,8 +542,19 @@ namespace mbts.spark { } } - protected void add_property(string prop_name, Func get_from_def, Action assign_to_def, Func get_local, Action set_local, IObservable subscribe_local, TValue non_uniform_value = default, AlgoParamPermissions permissions = AlgoParamPermissions.ReadWrite) { - var param = new AlgoParamVM(prop_name, DisplayNameHelper.snake_to_title_case(prop_name), get_local()) { permissions = permissions }; + protected void add_property( + string prop_name, + Func get_from_def, + Action assign_to_def, + Func get_local, + Action set_local, + IObservable subscribe_local, + TValue non_uniform_value = default, + AlgoParamPermissions permissions = AlgoParamPermissions.ReadWrite, + string template_key = null) { + var param = new AlgoParamVM(prop_name, DisplayNameHelper.snake_to_title_case(prop_name), get_local(), template_key) { + permissions = permissions + }; _algo_params.Add(param); _auto_props[prop_name] = new AutoProp(prop_name, def => { diff --git a/src/client/spark/view/Resources/TemplateKeys.cs b/src/client/spark/view/Resources/TemplateKeys.cs new file mode 100644 index 000000000..d376785ed --- /dev/null +++ b/src/client/spark/view/Resources/TemplateKeys.cs @@ -0,0 +1,6 @@ +namespace mbts.ui { + static class TemplateKeys { + public const string + SecurityKey = nameof(SecurityKey); + } +} \ No newline at end of file