From 5a60c8e9060b3f8092d1b83b6f0e34e7f34bafb6 Mon Sep 17 00:00:00 2001 From: Mikhail Shabanov Date: Mon, 22 Aug 2022 10:24:02 +0200 Subject: [PATCH] feat: tanks tree vertical cards ready --- .../Pages/PlayerInfoTanksTreeBase.cs | 6 ++ .../Pages/PlayerInfoTanksTreeSmall.razor | 75 ++++++++++++++++--- 2 files changed, 69 insertions(+), 12 deletions(-) diff --git a/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoTanksTreeBase.cs b/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoTanksTreeBase.cs index 32b0cc3..1bf3968 100644 --- a/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoTanksTreeBase.cs +++ b/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoTanksTreeBase.cs @@ -43,12 +43,16 @@ namespace WotBlitzStatisticsPro.Blazor.Pages public int CardWidth { get; } = 200; public int CardHeigth { get; } = 120; + public int LeftMargin { get; } = 30; + public List TreeItems { get; set; } = new(); public string SelectedNation { get; set; } public List Connections { get; set; } = new List(); + public List ConnectionsInVerticalView { get; set; } = new List(); + public List> NationsFilter { get; set; } = new(); public string FrameStyle @@ -76,6 +80,7 @@ namespace WotBlitzStatisticsPro.Blazor.Pages { TreeItems.Clear(); Connections.Clear(); + ConnectionsInVerticalView.Clear(); var vehiclesTree = VehiclesLibrary?.Where(v => v != null && v.IsPremium == false).ToList(); for (int tier = 1; tier < 11; tier++) { @@ -105,6 +110,7 @@ namespace WotBlitzStatisticsPro.Blazor.Pages foreach (var nextRow in treeItem.NextRows) { Connections.Add(SvgHelper.TankTreeConnectionPath(treeItem.Row, nextRow.Row, tier, CardWidth, CardHeigth)); + // TODO: Calc ConnectionsInVerticalView } } diff --git a/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoTanksTreeSmall.razor b/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoTanksTreeSmall.razor index 90f41d7..826076c 100644 --- a/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoTanksTreeSmall.razor +++ b/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoTanksTreeSmall.razor @@ -11,19 +11,33 @@
+ width="@(FrameHeigth + LeftMargin)"> @for (int i = 0; i < 10; i++) { - - + + + + + + @((10 - i).RomanNumber()) + + } + + + @foreach (var pathConnection in ConnectionsInVerticalView) + { + + } + + @if (TreeItems != null) { @for (int tier = 1; tier < 11; tier++) @@ -32,7 +46,7 @@ { @@ -49,10 +63,6 @@ - - - @tank.Tier.RomanNumber() - @@ -60,6 +70,47 @@ @tank.Name + + @if (tank.IsResearched && tank.MarkOfMastery.HasValue && tank.WinRate.HasValue && tank.AvgDamage.HasValue && tank.Battles.HasValue && tank.LastBattleTime.HasValue) + { + + + + + + + @(tank.WinRate.Value.ToString("N0"))% + + + + + + @tank.AvgDamage.Value.ToString("N0") + + + + + @tank.Battles.Value.ToString("N0") + + + + + @tank.LastBattleTime.Value.ToString("d") + + + } + + @if (!tank.IsResearched) + { + + + + + @((tank.PriceCredit / 1000).ToString("N0")) K + + + } + }