diff --git a/src/client/spark/Images/Icons.cs b/src/client/spark/Images/Icons.cs
index 930e03b10..a9eb2a8bf 100644
--- a/src/client/spark/Images/Icons.cs
+++ b/src/client/spark/Images/Icons.cs
@@ -74,6 +74,7 @@ namespace mbts.ui
public static ImageSource Beaker { get { return (DrawingImage)_resources["Beaker"]; } }
public static ImageSource Book { get { return (DrawingImage)_resources["Book"]; } }
public static ImageSource CancelOrders { get { return (DrawingImage)_resources["CancelOrders"]; } }
+ public static ImageSource ModifyOrder { get { return (DrawingImage)_resources["Pencil"]; } }
public static ImageSource Clock { get { return (DrawingImage)_resources["Clock"]; } }
public static ImageSource Defrag { get { return (DrawingImage)_resources["Defrag"]; } }
public static ImageSource Display { get { return (DrawingImage)_resources["Display"]; } }
diff --git a/src/client/spark/Images/Vector/Icons.xaml b/src/client/spark/Images/Vector/Icons.xaml
index f520d76b5..1d7c60e3e 100644
--- a/src/client/spark/Images/Vector/Icons.xaml
+++ b/src/client/spark/Images/Vector/Icons.xaml
@@ -450,7 +450,18 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z">
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/client/spark/core/Bus/SparkCommands.cs b/src/client/spark/core/Bus/SparkCommands.cs
index 33220a528..dd313b74d 100644
--- a/src/client/spark/core/Bus/SparkCommands.cs
+++ b/src/client/spark/core/Bus/SparkCommands.cs
@@ -83,6 +83,8 @@ namespace bts.spark
SparkCommand.create("Cancel Buys", Icons.CancelOrders, SparkTags.NotImplemented);
public static SparkCommand CancelSellOrders =>
SparkCommand.create("Cancel Sells", Icons.CancelOrders, SparkTags.NotImplemented);
-
- }
+ public static SparkCommand ModifyOrder =>
+ SparkCommand.create("Modify Order", Icons.ModifyOrder, SparkTags.NotImplemented);
+
+ }
}
diff --git a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookRowVM.cs b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookRowVM.cs
index 08c6a010f..a956d34e2 100644
--- a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookRowVM.cs
+++ b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookRowVM.cs
@@ -9,7 +9,7 @@ using System.Windows.Input;
namespace mbts.spark
{
- class OrderBookRowVM : ViewModelBase {
+ class OrderBookRowVM : ViewModelBase, IEquatable {
// implement Equals to be sync_with -friendly; Equals will defer to the OrderRecordImmutable
readonly OrderBookVM _parent;
readonly OrdersModel _model;
@@ -38,6 +38,10 @@ namespace mbts.spark
void ignore() {/*These setters are just for WPF databinding :(*/ throw new NotImplementedException(); }
+ public bool Equals(OrderBookRowVM other) {
+ return this._order.Equals(other._order);
+ }
+
// the grid view uses this for sorting, it was just a bts.api.Security once upon a time, but that class no longer implements IComparable
// this SelectableViewModeBase is essentially a wrapper class, which implements ISelecatble and IComparable
public SecurityImmutable security { get; }
@@ -129,7 +133,12 @@ namespace mbts.spark
}
public DateTime last_change {
- get => _order.State.LastChange.ToDateTime();
+ get {
+ if (_order.State !=null && _order.State.LastChange != null) {
+ return _order.State.LastChange.ToDateTime();
+ }
+ return DateTime.MinValue;
+ }
set => ignore();
}
@@ -174,7 +183,7 @@ namespace mbts.spark
public bool is_paused { get; set; }
- public bool is_parent => _order.ParentKey == 0;
+ public bool is_parent => _parent.order_has_children(_order.Key);
public bool is_child => _order.ParentKey != 0;
Property _expanded;
@@ -192,6 +201,8 @@ namespace mbts.spark
public ICommand details_command { get; }
public ICommand toggle_command { get; }
+
+
}
}
\ No newline at end of file
diff --git a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookVM.cs b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookVM.cs
index 8c1199f8f..41d451e23 100644
--- a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookVM.cs
+++ b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookVM.cs
@@ -26,16 +26,18 @@ namespace mbts.spark {
ObservableCollection _order_records;
OrderBookRowVM wrap(OrderRecordImmutable record, SecurityImmutable s) => new OrderBookRowVM(this, _model, record, s);
- //IReadOnlyDictionary _complete_order_state;
- //Task t;
+ Task t;
private async Task send_an_order() {
var result = await _model.send_order(
new OrderDefinition() {
+ Login = "W.O.P.R.",
+ Account = "BTS",
Side = Side.Buy,
- SecurityKey = 1,
- Market = new MarketOrderDefinition() { }
+ SecurityKey = 176868,
+ Market = new MarketOrderDefinition() { },
+ TimeInForce = TimeInForce.Day
},
6.66,
6
@@ -49,7 +51,7 @@ namespace mbts.spark {
_bus = bus;
_model = model;
- //t = send_an_order();
+ t = send_an_order();
_order_records = new ObservableCollection();
var orders_sequence = _model.on_orders;
@@ -101,17 +103,7 @@ namespace mbts.spark {
//_dispose = _context_menu = new ContextMenuVM(_context_menu_item_factory);
}
- //private void _update_with_new_orders() {
- // System.Windows.MessageBox.Show($"We have {_complete_order_state.Count} orders");
- // List all_updated = new List();
- // foreach( var x in _complete_order_state.Values) {
- // all_updated.Add(wrap(x));
- // }
- // orders.sync_with(all_updated);
- //}
-
private readonly IBus _bus;
- OrderIDComparer _order_cmp = new OrderIDComparer();
//void orders_updated(IOrderBook order_book) {
// var all = order_book.get_all_orders();
// _order_books.sync_with(all, _order_cmp);
@@ -120,14 +112,18 @@ namespace mbts.spark {
// }
//}
- internal void set_expanded(bool visible, uint target_parent) {
+ internal void set_expanded(bool visible, uint target_parent_key) {
foreach (var order in orders) {
- if (order.parent_order_key == target_parent) {
+ if (order.parent_order_key == target_parent_key) {
order.is_visible = visible;
}
}
}
+ internal bool order_has_children(uint order_key) {
+ return orders.Any(row_vm => row_vm.parent_order_key == order_key);
+ }
+
@@ -210,7 +206,8 @@ namespace mbts.spark {
//private ContextMenuVM _context_menu;
//public ContextMenuVM context_menu => _context_menu;
private ObservableCollection _orders = new ObservableCollection();
- public ObservableCollection orders { get { return _orders; }
+ public ObservableCollection orders {
+ get { return _orders; }
}
// Bind column visibility
diff --git a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml
index 3c8ec7e58..b11a9bcb9 100644
--- a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml
+++ b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml
@@ -129,6 +129,7 @@
+
diff --git a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookWindow.cs b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookWindow.cs
index 80adfea6c..0c3ccc16b 100644
--- a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookWindow.cs
+++ b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookWindow.cs
@@ -8,6 +8,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Media;
+using bts.api.orderman2;
namespace mbts.spark {
internal class OrderBookWindow : SparkWindow {
@@ -30,10 +31,24 @@ namespace mbts.spark {
_view.DataContext = _vm;
Commands = new SparkCommand[] {
+ SparkCommands.ModifyOrder,
SparkCommands.CancelBuyOrders,
SparkCommands.CancelSellOrders,
SparkCommands.CancelOrders,
- new SparkCommandCommand("Create a random order", ui.Icons.Beaker, new ui.DelegateCommand(() => model.send_order(new bts.api.orderman2.OrderDefinition() { SecurityKey = 1, Side = Side.Buy, TimeInForce = bts.api.orderman2.TimeInForce.Day }, 6.9, 42).ignore()))
+ new SparkCommandCommand("Create a random order", ui.Icons.Beaker, new ui.DelegateCommand(
+ () =>
+ model.send_order(new OrderDefinition() {
+ Login = "W.O.P.R.",
+ Account = "BTS",
+ Side = Side.Buy,
+ SecurityKey = 176868,
+ Market = new MarketOrderDefinition() { },
+ TimeInForce = TimeInForce.Day
+ },
+ 6.9, 42)
+ .ignore()
+ )
+ )
};
}