SPARK-350: Modify Order behavior changes
This commit is contained in:
1 parent
8c24936702
commit
b44d3c869e
3 files changed
+34
-3
No files matched your search
@@ -41,6 +41,9 @@ namespace bts.spark {
|
||||
public static SparkCommand<T> create<T>(string title, ImageSource icon, ITag<T> tag, Func<T> parameter) =>
|
||||
new SparkCommand<T>(title, icon, tag, parameter, null);
|
||||
|
||||
public static SparkCommand<T> create<T>(string title, ImageSource icon, ITag<T> tag, Func<T> parameter, Func<bool> can_execute) =>
|
||||
new SparkCommand<T>(title, icon, tag, parameter, can_execute);
|
||||
|
||||
public static SparkCommandParamObserver<T> create<T>(string title, ImageSource icon, ITag<T> tag, IObservable<T> parameter) =>
|
||||
create(title, icon, tag, parameter, _ => true);
|
||||
|
||||
@@ -76,6 +79,9 @@ namespace bts.spark {
|
||||
public SparkCommandParamObserver<T> complete(IObservable<T> value) =>
|
||||
SparkCommand.create(title, icon, tag, value);
|
||||
|
||||
public SparkCommand<T> complete(Func<T> value, Func<bool> can_execute) =>
|
||||
SparkCommand.create(title, icon, tag, value, can_execute);
|
||||
|
||||
public SparkCommandParamObserver<T> complete(IObservable<T> value, Func<T, bool> can_execute) =>
|
||||
SparkCommand.create(title, icon, tag, value, can_execute);
|
||||
|
||||
|
||||
@@ -123,6 +123,7 @@ namespace mbts.spark
|
||||
var selection_count = selection.Count();
|
||||
var row = selection.Cast<OrderBookRowVM>().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<OrderRecordImmutable?> selected_order_changed;
|
||||
|
||||
protected virtual void on_selected_order_changed(OrderRecordImmutable? order) {
|
||||
selected_order_changed?.Invoke(this, order);
|
||||
}
|
||||
|
||||
|
||||
private ObservableCollection<OrderBookRowVM> _orders = new ObservableCollection<OrderBookRowVM>();
|
||||
|
||||
private IEnumerable<OrderRecordImmutable> _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<OrderBookRowVM, DoubleMinMaxState> price_filter { get; } = new DoubleMinMax<OrderBookRowVM>(r => r.price, nameof(OrderBookRowVM.price));
|
||||
|
||||
@@ -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(
|
||||
|
||||
Reference in new issue
Block a user