SPARK-571 Multiple issues with Synthetic Management Form
This commit is contained in:
1 parent
6526a9760c
commit
e63e3c76d3
4 files changed
+39
-42
No files matched your search
@@ -11,21 +11,21 @@
|
||||
</ResourceDictionary>
|
||||
</UserControl.Resources>
|
||||
<Grid>
|
||||
<c:DataGridEx x:Name="grid" ItemsSource="{Binding rows_view}" BorderThickness="0">
|
||||
<c:DataGridEx x:Name="grid" BorderThickness="0" IsReadOnly="True" CanUserSortColumns="True" GridLinesVisibility="None" ItemsSource="{Binding rows_view}">
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Header="Create Time" Binding="{Binding create_time}"
|
||||
c:DataGridFilterProperties.Filter="{Binding DataContext.create_time_filter, Source={u:DirectReference grid}}"
|
||||
c:DataGridFilterProperties.FilterActive="{Binding DataContext.create_time_filter.active, Source={u:DirectReference grid}}"
|
||||
c:DataGridFilterProperties.FilterTemplate="{StaticResource DiscreteValuesTemplate}"/>
|
||||
<DataGridTextColumn Header="Name" Binding="{Binding name}" CellStyle="{StaticResource RowHeaderCell}"
|
||||
<DataGridTextColumn Header="Name" Binding="{Binding name}"
|
||||
c:DataGridFilterProperties.Filter="{Binding DataContext.name_filter, Source={u:DirectReference grid}}"
|
||||
c:DataGridFilterProperties.FilterActive="{Binding DataContext.name_filter.active, Source={u:DirectReference grid}}"
|
||||
c:DataGridFilterProperties.FilterTemplate="{StaticResource RegexFinder}"/>
|
||||
<DataGridTextColumn Header="Desc" Binding="{Binding security}" CellStyle="{StaticResource RowHeaderCell}"
|
||||
<DataGridTextColumn Header="Description" Binding="{Binding description}"
|
||||
c:DataGridFilterProperties.Filter="{Binding DataContext.security_filter, Source={u:DirectReference grid}}"
|
||||
c:DataGridFilterProperties.FilterActive="{Binding DataContext.security_filter.active, Source={u:DirectReference grid}}"
|
||||
c:DataGridFilterProperties.FilterTemplate="{StaticResource DiscreteValuesTemplate}"/>
|
||||
<DataGridTextColumn Header="# Legs" Binding="{Binding n_legs}"
|
||||
c:DataGridFilterProperties.FilterTemplate="{StaticResource RegexFinder}"/>
|
||||
<DataGridTextColumn Header="# Legs" Binding="{Binding n_legs}" Width="*"
|
||||
c:DataGridFilterProperties.Filter="{Binding DataContext.n_legs_filter, Source={u:DirectReference grid}}"
|
||||
c:DataGridFilterProperties.FilterActive="{Binding DataContext.n_legs_filter.active, Source={u:DirectReference grid}}"
|
||||
c:DataGridFilterProperties.FilterTemplate="{StaticResource IntMinMaxTemplate}"/>
|
||||
|
||||
@@ -44,6 +44,7 @@ namespace mbts.spark {
|
||||
public override UIElement Content => _view;
|
||||
public override IEnumerable<SparkCommand> Commands { get; }
|
||||
public override SyntheticManagementWindowFactory.StartupData SaveState => _state = new SyntheticManagementWindowFactory.StartupData(_vm.Current.rows_view.GetSortingCriteria(), _vm.Current.get_filter_states());
|
||||
public override double MinWidth => 700;
|
||||
|
||||
public override void Dispose() {
|
||||
Disposable.dispose(ref _vm);
|
||||
|
||||
@@ -8,19 +8,17 @@ using System.Reactive.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using static mbts.spark.DataGridColumnFilters;
|
||||
|
||||
namespace bts.shell
|
||||
{
|
||||
class SyntheticManagementWindowFactory : ShellWindowFactory<SyntheticManagementWindowFactory.StartupData>
|
||||
{
|
||||
namespace bts.shell {
|
||||
class SyntheticManagementWindowFactory : ShellWindowFactory<SyntheticManagementWindowFactory.StartupData> {
|
||||
readonly IBus _bus;
|
||||
readonly SpreaderModel _model;
|
||||
|
||||
public SyntheticManagementWindowFactory(SpreaderShellModule module, IBus bus, SpreaderModel model) : base(module, "SyntheticManagement") {
|
||||
_bus = bus;
|
||||
_model = model;
|
||||
_dispose = bus.subscribe(SparkTags.ShowSyntheticManagementTag).ObserveOnDispatcher().Subscribe(show);
|
||||
}
|
||||
|
||||
readonly IBus _bus;
|
||||
readonly SpreaderModel _model;
|
||||
|
||||
public override Task<IShellWindow> load(StartupData state) =>
|
||||
Task.FromResult<IShellWindow>(SyntheticManagementWindow.create(this, _bus, _model, state));
|
||||
|
||||
@@ -28,8 +26,7 @@ namespace bts.shell
|
||||
_bus.post(SparkTags.ShowWindow, await load(new StartupData()));
|
||||
|
||||
[ProtoContract]
|
||||
public class StartupData
|
||||
{
|
||||
public class StartupData {
|
||||
public const int Version = 1;
|
||||
public StartupData() : this(new List<SortingCriteria>(), null) { }
|
||||
public StartupData(List<SortingCriteria> sorting_criteria, FilterStates filters) {
|
||||
@@ -43,10 +40,9 @@ namespace bts.shell
|
||||
}
|
||||
|
||||
[ProtoContract]
|
||||
public class FilterStates
|
||||
{
|
||||
public class FilterStates {
|
||||
[ProtoMember(1)]
|
||||
public SecurityCriteria security;
|
||||
public string description;
|
||||
[ProtoMember(2)]
|
||||
public TimeFilterTuple create_time;
|
||||
[ProtoMember(3)]
|
||||
|
||||
@@ -5,55 +5,55 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Reactive.Linq;
|
||||
using static bts.api.SecurityFormatter;
|
||||
using static bts.shell.SyntheticManagementWindowFactory;
|
||||
using static mbts.spark.DataGridColumnFilters;
|
||||
|
||||
namespace mbts.spark
|
||||
{
|
||||
class SyntheticManagementVM : SecurityMDGrid<SyntheticManagementVM.Row, (ExecutionStrategyImmutable strategy, SecurityMD md)>
|
||||
{
|
||||
namespace mbts.spark {
|
||||
class SyntheticManagementVM : SecurityMDGrid<SyntheticManagementVM.Row, (ExecutionStrategyImmutable strategy, SecurityMD md)> {
|
||||
readonly SpreaderModel _model;
|
||||
|
||||
public SyntheticManagementVM(IBus bus, SpreaderModel model) : this(bus, model, null, null) { }
|
||||
public SyntheticManagementVM(IBus bus, SpreaderModel model, IReadOnlyCollection<SortingCriteria> sorting, FilterStates filters)
|
||||
: base(model.strategy_tuple.Select(map => map.Values), sorting) {
|
||||
: base(model.strategy_tuple.Select(map => map.Values), sorting) =>
|
||||
_model = model;
|
||||
security_filter = new DiscreteValuesOneof<Row, SecurityImmutable, SecurityCriteria>(
|
||||
filters.security.subscribe(bus),
|
||||
sc => sc.subscribe(bus),
|
||||
secs => new SecurityCriteria(secs),
|
||||
r => r.security.Synthetic.Legs.Select(l => l.Security),
|
||||
nameof(Row.security)
|
||||
);
|
||||
}
|
||||
|
||||
readonly SpreaderModel _model;
|
||||
|
||||
protected override Row row_factory((ExecutionStrategyImmutable strategy, SecurityMD md) row_model) => new Row(row_model.md, row_model.strategy);
|
||||
|
||||
#region Filters
|
||||
public IDataGridColumnPersistentFilter<Row, TimeFilterTuple> create_time_filter { get; } = new Time<Row>(r => r.create_time, nameof(Row.create_time));
|
||||
public IDataGridColumnPersistentFilter<Row, string> name_filter { get; } = new RegexFinder<Row>(r => r.name, nameof(Row.name));
|
||||
public IDataGridColumnPersistentFilter<Row, SecurityCriteria> security_filter { get; }
|
||||
public IDataGridColumnPersistentFilter<Row, string> description_filter { get; } = new RegexFinder<Row>(r => r.description, nameof(Row.description));
|
||||
public IDataGridColumnPersistentFilter<Row, IntMinMaxState> n_legs_filter { get; } = new IntMinMax<Row>(r => r.n_legs, nameof(Row.n_legs));
|
||||
|
||||
public FilterStates get_filter_states() =>
|
||||
new FilterStates {
|
||||
security = security_filter.get_state(),
|
||||
description = description_filter.get_state(),
|
||||
create_time = create_time_filter.get_state(),
|
||||
name = name_filter.get_state(),
|
||||
n_legs = n_legs_filter.get_state()
|
||||
};
|
||||
#endregion
|
||||
|
||||
public class Row : SecurityMDRow
|
||||
{
|
||||
public Row(SecurityMD security_md, ExecutionStrategyImmutable strategy) : base(security_md) =>
|
||||
_strategy = strategy;
|
||||
|
||||
public class Row : SecurityMDRow {
|
||||
static readonly PartFormattingTuple[] _desc_parts = new[] {
|
||||
new PartFormattingTuple(ContractParts.Quantity),
|
||||
new PartFormattingTuple(ContractParts.Symbol),
|
||||
new PartFormattingTuple(ContractParts.RawExp, "l")
|
||||
};
|
||||
readonly ExecutionStrategyImmutable _strategy;
|
||||
|
||||
public DateTime create_time => DateTime.Now;
|
||||
public string name => security.Synthetic.Name;
|
||||
public int n_legs => security.Synthetic.Legs.Count();
|
||||
public Row(SecurityMD security_md, ExecutionStrategyImmutable strategy) : base(security_md) {
|
||||
_strategy = strategy;
|
||||
name = security.Synthetic.Name;
|
||||
n_legs = security.Synthetic.Legs.Count();
|
||||
description = Format(security, _desc_parts);
|
||||
}
|
||||
|
||||
public DateTime create_time => DateTime.MinValue; //TODO
|
||||
public string name { get; }
|
||||
public int n_legs { get; }
|
||||
public string description { get; }
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user