From b205961d766613f15f7e12aaf4b7ee585b5e9318 Mon Sep 17 00:00:00 2001
From: Mikhail Shabanov <dr.mboga@yahoo.com>
Date: Wed, 24 Nov 2021 14:59:10 +0100
Subject: [PATCH] feat: added tanks winrate tooltip and tank last battle with
 time

---
 .../Pages/PlayerInfoLayout.razor              |  2 +-
 .../Pages/PlayerInfoTanksList.razor           | 43 ++++++++++---------
 WotBlitzStatisticsPro.Blazor/Program.cs       |  4 +-
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoLayout.razor b/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoLayout.razor
index 1225187..15cca5c 100644
--- a/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoLayout.razor
+++ b/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoLayout.razor
@@ -4,7 +4,6 @@
 <RadzenProgressBar Value="100" ShowValue="false" Mode="ProgressBarMode.Indeterminate"
                    Visible="@(AccountInfo == null)"
                    Style="width: 100%; margin-top: 10px;" />
-SmallScreen = @SmallScreen
 @if (AccountInfo != null)
 {
     <h1>
@@ -30,6 +29,7 @@ SmallScreen = @SmallScreen
                 <PlayerInfoStatistics TanksList="@AccountInfo.Tanks"></PlayerInfoStatistics>
             </RadzenTabsItem>
             <RadzenTabsItem Icon="agriculture">
+                @*TODO: In case of @SmallScreen == true, then show new tanks list component - mobile version *@
                 <PlayerInfoTanksList TanksList="@AccountInfo.Tanks"></PlayerInfoTanksList>
             </RadzenTabsItem>
             <RadzenTabsItem Icon="military_tech">
diff --git a/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoTanksList.razor b/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoTanksList.razor
index d102d55..ec64946 100644
--- a/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoTanksList.razor
+++ b/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoTanksList.razor
@@ -83,7 +83,7 @@
         </RadzenDataGridColumn>
         <RadzenDataGridColumn TItem="ITank" Title="" Sortable="false" Filterable="false" Width="55px">
             <Template Context="data">
-                <RadzenImage Path="@data.PreviewImage" style="width: 50px; height: 40px; border-radius: 8px;" 
+                <RadzenImage Path="@data.PreviewImage" style="width: 50px; height: 40px; border-radius: 8px;"
                              MouseEnter="@(args => ShowTankTooltip(args, data.PreviewImage, data.TankNationId, new TooltipOptions(){ Style = "background-color:#2F3D43" }) )" />
             </Template>
         </RadzenDataGridColumn>
@@ -94,7 +94,7 @@
         </RadzenDataGridColumn>
         <RadzenDataGridColumn TItem="ITank" Property="Battles" Filterable="false" Sortable="true" Title="⚔" Frozen="false" Width="70px" TextAlign="TextAlign.Center">
             <FooterTemplate>
-               <b>@TotalBattles.ToString("N0")</b>
+                <b>@TotalBattles.ToString("N0")</b>
             </FooterTemplate>
         </RadzenDataGridColumn>
         <RadzenDataGridColumn TItem="ITank" Property="WinRate"
@@ -105,7 +105,7 @@
                               Width="50px"
                               TextAlign="TextAlign.Center">
             <Template Context="data">
-                @data.WinRate.ToString("N0")%
+                <span title="@($"{data.Wins:N0} / {data.Battles:N0}")">@data.WinRate.ToString("N0")%</span>
                 <div style="background-color: @data.WinRate.ScaleColor(); width: 100%; height: 5px; margin-left: 2px; margin-right: 2px;"></div>
             </Template>
             <FooterTemplate>
@@ -119,8 +119,7 @@
                               Title="@Localize["Wn7"]"
                               Frozen="false"
                               Width="80px"
-                              TextAlign="TextAlign.Center"
-                              >
+                              TextAlign="TextAlign.Center">
             <Template Context="data">
                 @data.Wn7.ToString("N0")
                 <div style="background-color: @data.Wn7.Wn7ScaleColor(); width: 100%; height: 5px; margin-left: 2px; margin-right: 2px;"></div>
@@ -154,14 +153,14 @@
                 <b>∼@AvgTotalXp.ToString("N0")</b>
             </FooterTemplate>
         </RadzenDataGridColumn>
-        <RadzenDataGridColumn TItem="ITank" Property="MaxXp" 
-                              Filterable="false" 
-                              Sortable="true" 
-                              Title="🌟" 
-                              Frozen="false" 
-                              Width="80px" 
-                              TextAlign="TextAlign.Center" 
-                              FormatString="{0:N0}"/>
+        <RadzenDataGridColumn TItem="ITank" Property="MaxXp"
+                              Filterable="false"
+                              Sortable="true"
+                              Title="🌟"
+                              Frozen="false"
+                              Width="80px"
+                              TextAlign="TextAlign.Center"
+                              FormatString="{0:N0}" />
         <RadzenDataGridColumn TItem="ITank" Property="SurvivalRate"
                               Filterable="false"
                               Sortable="true"
@@ -174,15 +173,19 @@
                 <b>∼@AvgSurvivalRate.ToString("N0")%</b>
             </FooterTemplate>
         </RadzenDataGridColumn>
-        <RadzenDataGridColumn TItem="ITank" Property="LastBattleTime" 
-                              Filterable="false" 
-                              Sortable="true" 
-                              Title="⌚" 
-                              Frozen="false" 
-                              Width="100px" 
+        <RadzenDataGridColumn TItem="ITank" Property="LastBattleTime"
+                              Filterable="false"
+                              Sortable="true"
+                              Title="⌚"
+                              Frozen="false"
+                              Width="100px"
                               TextAlign="TextAlign.Center"
                               FormatString="{0:d}"
-                              SortOrder="SortOrder.Descending"/>
+                              SortOrder="SortOrder.Descending">
+            <Template Context="data">
+                @data.LastBattleTime.ConvertToLocalTime().ToString("g")
+            </Template>
+        </RadzenDataGridColumn>
     </Columns>
 </RadzenDataGrid>
 
diff --git a/WotBlitzStatisticsPro.Blazor/Program.cs b/WotBlitzStatisticsPro.Blazor/Program.cs
index a815dd6..0c00c86 100644
--- a/WotBlitzStatisticsPro.Blazor/Program.cs
+++ b/WotBlitzStatisticsPro.Blazor/Program.cs
@@ -52,11 +52,11 @@ namespace WotBlitzStatisticsPro.Blazor
             //var useMock = Environment.GetEnvironmentVariable("USE_GRAPH_QL_MOCK");
             //if (useMock != null && useMock == "true")
             //{
-            builder.Services.AddTransient<IGraphQlBackendService, GraphQlBackendMockService>();
+            //builder.Services.AddTransient<IGraphQlBackendService, GraphQlBackendMockService>();
             //}
             //else
             //{
-            //builder.Services.AddTransient<IGraphQlBackendService, GraphQlBackendService>();
+            builder.Services.AddTransient<IGraphQlBackendService, GraphQlBackendService>();
             //}
 
             var host = builder.Build();