From b44d3c869ebff5d4e03f2bb9c32d62b634b82fa4 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 23 Jan 2018 13:36:13 -0600 Subject: [PATCH] SPARK-350: Modify Order behavior changes --- src/client/spark/core/Bus/SparkCommand.cs | 6 ++++++ .../view/Spark/Shell/OrderBook/OrderBookVM.cs | 10 ++++++++- .../Spark/Shell/OrderBook/OrderBookWindow.cs | 21 +++++++++++++++++-- 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/src/client/spark/core/Bus/SparkCommand.cs b/src/client/spark/core/Bus/SparkCommand.cs index a64c6076c..38c90c47f 100644 --- a/src/client/spark/core/Bus/SparkCommand.cs +++ b/src/client/spark/core/Bus/SparkCommand.cs @@ -41,6 +41,9 @@ namespace bts.spark { public static SparkCommand create(string title, ImageSource icon, ITag tag, Func parameter) => new SparkCommand(title, icon, tag, parameter, null); + public static SparkCommand create(string title, ImageSource icon, ITag tag, Func parameter, Func can_execute) => + new SparkCommand(title, icon, tag, parameter, can_execute); + public static SparkCommandParamObserver create(string title, ImageSource icon, ITag tag, IObservable parameter) => create(title, icon, tag, parameter, _ => true); @@ -76,6 +79,9 @@ namespace bts.spark { public SparkCommandParamObserver complete(IObservable value) => SparkCommand.create(title, icon, tag, value); + public SparkCommand complete(Func value, Func can_execute) => + SparkCommand.create(title, icon, tag, value, can_execute); + public SparkCommandParamObserver complete(IObservable value, Func can_execute) => SparkCommand.create(title, icon, tag, value, can_execute); diff --git a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookVM.cs b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookVM.cs index 9aa623416..1f2444ad8 100644 --- a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookVM.cs +++ b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookVM.cs @@ -123,6 +123,7 @@ namespace mbts.spark var selection_count = selection.Count(); var row = selection.Cast().FirstOrDefault(); selected_order = row.order; + on_selected_order_changed(selected_order); } else { selected_order = null; @@ -165,6 +166,13 @@ namespace mbts.spark #endregion + public event EventHandler selected_order_changed; + + protected virtual void on_selected_order_changed(OrderRecordImmutable? order) { + selected_order_changed?.Invoke(this, order); + } + + private ObservableCollection _orders = new ObservableCollection(); private IEnumerable _active_order_records => _orders.Where(x => x.order.State.Status != bts.api.orderman2.OrderStatus.Canceled).Select(x => x.order); @@ -179,7 +187,7 @@ namespace mbts.spark //public OrderBookSettings settings => _settings.Value; public double row_height { get; set; } = 18; - public OrderRecordImmutable selected_order { get; set; } + public OrderRecordImmutable? selected_order { get; set; } #region Filters public IDataGridColumnPersistentFilter price_filter { get; } = new DoubleMinMax(r => r.price, nameof(OrderBookRowVM.price)); diff --git a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookWindow.cs b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookWindow.cs index 87e16a34c..9fdbf316b 100644 --- a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookWindow.cs +++ b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookWindow.cs @@ -20,6 +20,8 @@ namespace mbts.spark { OrderBookView _view; OrderBookWindowFactory _factory; + SparkCommand _modify_order_command; + //IDisposable _subscriptions; public OrderBookWindow(OrdersModel model, OrderBookWindowFactory factory, IBus bus, OrderBookWindowFactory.OrderBookStartupData state, ImageSource icon) : base("Order Book", bus, factory, SparkCommands.ShowOrders.icon) { @@ -31,15 +33,30 @@ namespace mbts.spark { _view = new OrderBookView(_vm); _view.DataContext = _vm; + _modify_order_command = SparkCommands.ShowModifyOrder.complete( + () => _vm.selected_order.Value, + can_execute: () => { + if (_vm.selected_order.HasValue) { + return _vm.selected_order.Value.State.Status == bts.api.orderman2.OrderStatus.Working; + } + return false; + } + ); + Commands = new SparkCommand[] { - SparkCommands.ShowModifyOrder.complete( () => _vm.selected_order), + _modify_order_command, SparkCommands.CancelBuyOrders.complete( () => _vm.active_buy_order_keys), SparkCommands.CancelSellOrders.complete( () => _vm.active_sell_order_keys), SparkCommands.CancelOrders.complete( () => _vm.active_order_keys) }; + _vm.selected_order_changed += _vm_selected_order_changed; } - + private void _vm_selected_order_changed(object sender, OrderRecordImmutable? e) { + if (e.HasValue) { + _modify_order_command.raiseCanExecuteChanged(); + } + } public override OrderBookWindowFactory.OrderBookStartupData SaveState => _state = new OrderBookWindowFactory.OrderBookStartupData(