From c30f3afdfd5bf61efb4997f7af8625cb16bc00ae Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 26 Mar 2018 11:51:41 -0400 Subject: [PATCH] SPARK-697 trade ticket when brought up to modify an order should not have a cancel order button --- .../spark/Orders/ExistingOrderTicketVM.cs | 42 ++++++++++++------- .../spark/Orders/OrderModificationDialog.xaml | 21 +++++++--- 2 files changed, 43 insertions(+), 20 deletions(-) diff --git a/src/client/spark/Orders/ExistingOrderTicketVM.cs b/src/client/spark/Orders/ExistingOrderTicketVM.cs index d97cdf632..de7b99b2e 100644 --- a/src/client/spark/Orders/ExistingOrderTicketVM.cs +++ b/src/client/spark/Orders/ExistingOrderTicketVM.cs @@ -14,6 +14,7 @@ namespace mbts.spark { readonly Property _current_time_in_force; readonly Property _current_order_type; readonly DelegateProperty _price_dirty, _size_dirty, _account_dirty, _time_in_force_dirty, _order_type_dirty; + IDisposable _modify_enabled_sub; public ExistingOrderTicketVM(OrdersModel model, IObservable order_source, IObservable calculator_buttons) : base(model, order_source.Where(ot => ot.security_md.HasValue).Select(ot => ot.security_md.Value.security), @@ -41,7 +42,7 @@ namespace mbts.spark { Observable.Merge(_price_dirty, _size_dirty, _account_dirty, _time_in_force_dirty, _order_type_dirty) .ObserveOnDispatcher().Subscribe(_ => RaisePropertyChanged(nameof(dirty_items_text))) ); - modify_order = new DelegateCommand(() => { + var modify_order = new ObservantCommand(() => { if (key.HasValue) { _price_dirty.refresh(); _size_dirty.refresh(); @@ -61,12 +62,14 @@ namespace mbts.spark { RequestClose?.Invoke(this, new EventArgs()); } }); - cancel_order = new DelegateCommand(() => { - if (key.HasValue) { - model.cancel_order(key.Value).ignore(); - RequestClose?.Invoke(this, new EventArgs()); - } - }); + var price_dirty_source = _price_dirty.Select(vals => vals.newval).StartWith(false); + var size_dirty_source = _size_dirty.Select(vals => vals.newval).StartWith(false); + _modify_enabled_sub = price_dirty_source + .CombineLatest(size_dirty_source, (pd, sd) => pd || sd) + .DistinctUntilChanged() + .ObserveOnDispatcher() + .Subscribe(modify_order); + this.modify_order = modify_order; } public event EventHandler RequestClose; @@ -81,13 +84,29 @@ namespace mbts.spark { public override bool? account_dirty => _account_dirty.Value; public override bool? time_in_force_dirty => _time_in_force_dirty.Value; public override bool? order_type_dirty => _order_type_dirty.Value; - public string dirty_items_text => string.Join(", ", _dirty_items()); + public string dirty_items_text { + get { + var dirty_items = _dirty_items().ToList(); + if (dirty_items.Count == 0) + return "(no changes)"; + else return "changes " + string.Join(", ", dirty_items); + } + } public bool can_change_account { get; } = false; public bool can_change_time_in_force { get; } = false; public bool can_change_order_type { get; } = false; public BBOVM bbo { get; } public ICommand modify_order { get; } - public ICommand cancel_order { get; } + + protected override void _on_price_changed(double value) => _price_dirty.refresh(); + protected override void _on_size_changed(uint? value) => _size_dirty.refresh(); + protected override void _on_selected_account_changed(string value) => _account_dirty.refresh(); + protected override void _on_selected_time_in_force_changed(TimeInForce value) => _time_in_force_dirty.refresh(); + protected override void _on_selected_order_type_changed(IOrderTypeVM value) => _order_type_dirty.refresh(); + protected override void Dispose(bool disposing) { + Disposable.dispose(ref _modify_enabled_sub); + base.Dispose(disposing); + } IEnumerable _dirty_items() { if (_price_dirty.Value) yield return "price"; @@ -96,10 +115,5 @@ namespace mbts.spark { if (_time_in_force_dirty.Value) yield return "tif"; if (_order_type_dirty.Value) yield return "type"; } - protected override void _on_price_changed(double value) => _price_dirty.refresh(); - protected override void _on_size_changed(uint? value) => _size_dirty.refresh(); - protected override void _on_selected_account_changed(string value) => _account_dirty.refresh(); - protected override void _on_selected_time_in_force_changed(TimeInForce value) => _time_in_force_dirty.refresh(); - protected override void _on_selected_order_type_changed(IOrderTypeVM value) => _order_type_dirty.refresh(); } } \ No newline at end of file diff --git a/src/client/spark/Orders/OrderModificationDialog.xaml b/src/client/spark/Orders/OrderModificationDialog.xaml index 168a86a74..880ac1d7f 100644 --- a/src/client/spark/Orders/OrderModificationDialog.xaml +++ b/src/client/spark/Orders/OrderModificationDialog.xaml @@ -35,22 +35,31 @@