From ebc4e202fea4dbac078926d414f3e4f58a9894b5 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 14 May 2019 14:23:43 -0500 Subject: [PATCH] mf_vm: rows should be populated now --- .../Trading/ManualFills/ManualFillsVM.cs | 36 ++++++++++++++++--- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/src/client/spark/Modules/Trading/ManualFills/ManualFillsVM.cs b/src/client/spark/Modules/Trading/ManualFills/ManualFillsVM.cs index e2d0a8036..a6bf8be8c 100644 --- a/src/client/spark/Modules/Trading/ManualFills/ManualFillsVM.cs +++ b/src/client/spark/Modules/Trading/ManualFills/ManualFillsVM.cs @@ -1,4 +1,6 @@ using bts.api; +using bts.api.position; +using bts.collections; using bts.utils; using mbts.collections; using mbts.persist; @@ -25,11 +27,28 @@ using System.Windows.Media; namespace mbts.spark { - class ManualFillsVM { + class ManualFillsVM : DisposableViewModelBase { + readonly IBus _bus; + readonly OrdersModel _model; + readonly OperableCollection _rows; - public ManualFillsVM() { } - public ObservableCollection rows { get; set; } + public ManualFillsVM(IBus bus, OrdersModel model) { + _bus = bus; + _model = model; + + _rows = new OperableCollection( + (s_mf, _) => new Row(s_mf), + s_mf => s_mf.mf.RecordId, + Comparer<(SecurityImmutable? s, ManualFillImmutable mf)>.Create((a,b) => a.mf.RecordId.CompareTo(b.mf.RecordId)) + ); + + _dispose = Disposable.Create( + model.on_manual_fills_securities.OnDispatcher().Subscribe(_rows.update) + ); + } + + public ObservableCollection rows => _rows; public ICommand add_fill_cmd { get; } public ICommand modify_fill_cmd { get; } @@ -40,9 +59,16 @@ namespace mbts.spark { public class Row : IEditableObject { - public Row() { } + public Row((SecurityImmutable? s, ManualFillImmutable mf) data) { + security = data.s ?? SecurityDataHelper.Defaults.SecurityImmutable; + //account = + //user = + side = data.mf.Side; + size = data.mf.Quantity; + price = data.mf.Price; + } - public string display_name => "a security!"; + public string display_name => security.ToString(); public SecurityImmutable security { get; private set; } public string account { get; private set; }