diff --git a/src/client/spark/view/Spark/Core/OrderUtils.cs b/src/client/spark/view/Spark/Core/OrderUtils.cs index 266921768..931dfdc79 100644 --- a/src/client/spark/view/Spark/Core/OrderUtils.cs +++ b/src/client/spark/view/Spark/Core/OrderUtils.cs @@ -30,6 +30,7 @@ namespace mbts.spark { public static string short_description(this OrderRecordImmutable order) => $"{order.Def.Side} {order.State.Quantity} at {order.State.Price}"; public static bool has_parent(this OrderRecordImmutable order) => order.ParentKey != 0; + public static bool is_active(this OrderRecordImmutable order) => order.State.Status == bts.api.orderman2.OrderStatus.Working; #endregion public static string display_name(this IMessage order) => camel_to_title_case(order.Descriptor.Name); diff --git a/src/client/spark/view/Spark/Ladder/LadderVM.cs b/src/client/spark/view/Spark/Ladder/LadderVM.cs index 7d8be0ab2..b7cc84265 100644 --- a/src/client/spark/view/Spark/Ladder/LadderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderVM.cs @@ -48,7 +48,7 @@ namespace mbts.spark show_ticket_command = new DelegateCommand(show_ticket); // Orders - _internal_orders = _model.order_gateway.get_security_orders_collection(security.Id); + _internal_orders = _model.order_gateway.get_active_security_orders_collection(security.Id); orders = new ObservableAutoWrapper(_internal_orders, create_ordervm); // Settings diff --git a/src/client/spark/view/Spark/Orders/OrdersModel.cs b/src/client/spark/view/Spark/Orders/OrdersModel.cs index d8fee6530..98d3d22f9 100644 --- a/src/client/spark/view/Spark/Orders/OrdersModel.cs +++ b/src/client/spark/view/Spark/Orders/OrdersModel.cs @@ -118,6 +118,12 @@ namespace mbts.spark public static ITableUpdateCollection get_security_orders_collection(this OrdersModel orders_model, HashSet securities) => new TableUpdateCollection(orders_model.on_orders.ObserveOnDispatcher(), o => securities.Contains(o.Def.SecurityKey)); + + public static ITableUpdateCollection get_active_security_orders_collection(this OrdersModel orders_model, uint security) => + get_active_security_orders_collection(orders_model, new HashSet(new[] { security })); + + public static ITableUpdateCollection get_active_security_orders_collection(this OrdersModel orders_model, HashSet securities) => + new TableUpdateCollection(orders_model.on_orders.ObserveOnDispatcher(), o => securities.Contains(o.Def.SecurityKey) && o.is_active()); #endregion #region Cancel Orders