Eric's PR comments

This commit is contained in:
Kevin Darby committed 2018-09-19 16:47:42 -04:00
1 parent a71b6b3b99
commit 3dbfd2ebfd
1 file changed
+6 -62
@@ -22,66 +22,7 @@ namespace mbts.spark
[ImportingConstructor]
private DynamicOrderHelper(OrderService order_service)
{
if(!_test_mode)
_dynamic_types = order_service.get_registered_dynamic_order_types(new VoidMessage());
else
{
_dynamic_types = new RegisteredDynamicOrderTypes();
var desc = new DynamicOrderDescriptor() { DynamicOrderType = "TestOrder" };
desc.ParamDesc.Add(new DynamicOrderParamDescriptor()
{
ParamName = "ParamBool",
ParamType = new DynamicOrderTypeDescriptor()
{
Primitive = DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveBool
}
});
desc.ParamDesc.Add(new DynamicOrderParamDescriptor()
{
ParamName = "ParamDouble",
ParamType = new DynamicOrderTypeDescriptor()
{
Primitive = DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveDouble
}
});
desc.ParamDesc.Add(new DynamicOrderParamDescriptor()
{
ParamName = "ParamInt",
ParamType = new DynamicOrderTypeDescriptor()
{
Primitive = DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveInt
}
});
desc.ParamDesc.Add(new DynamicOrderParamDescriptor()
{
ParamName = "ParamUInt",
ParamType = new DynamicOrderTypeDescriptor()
{
Primitive = DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveUint
}
});
desc.ParamDesc.Add(new DynamicOrderParamDescriptor()
{
ParamName = "ParamStr",
ParamType = new DynamicOrderTypeDescriptor()
{
Primitive = DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveString
}
});
var en = new DynamicOrderParamDescriptor()
{
ParamName = "ParamEnum",
ParamType = new DynamicOrderTypeDescriptor()
{
Enumerated = new DynamicOrderEnumeratedDescriptor()
}
};
en.ParamType.Enumerated.Element.AddRange(new[] { "C1", "C2" });
desc.ParamDesc.Add(en);
_dynamic_types.DynamicOrderDesc.Add(desc);
}
_dynamic_types = order_service.get_registered_dynamic_order_types(new VoidMessage());
}
public void add_dynamic_order_defs(List<CustomOrderDefinitionImmutable> defs,
@@ -102,8 +43,11 @@ namespace mbts.spark
{
Dictionary<string, DynamicOrderParamVM> par = new Dictionary<string, DynamicOrderParamVM>();
var order = _dynamic_types.DynamicOrderDesc.FirstOrDefault(x => x.DynamicOrderType == dyntype);
foreach (var p in order.ParamDesc)
par[p.ParamName] = new DynamicOrderParamVM() { param = new DynamicOrderParam(), descriptor = p };
if (order != null)
{
foreach (var p in order.ParamDesc)
par[p.ParamName] = new DynamicOrderParamVM() { param = new DynamicOrderParam(), descriptor = p };
}
return par;
}
}