Merge pull request #100 from CodebreakerApp/79-reports-add-a-filter

79 reports add a filter

Author: christiannagel

src/CodeBreaker.Blazor.Client/Pages/ReportsPage.razor

@@ -6,11 +6,26 @@
     <h2>@Loc["ReportsPage_Title"]</h2>
 
     <FluentGrid Class="align-items-end">
-        <FluentGridItem xs="12" md="8">
-            <FluentDatePicker Class="full-width" Label="@Loc["ReportsPage_SelectDate_Label"]" @bind-Value="@_selectedDate" />
+        <FluentGridItem xs="12" md="3">
+            <FluentDatePicker Class="full-width" Label="@Loc["ReportsPage_SelectDate_Label"]" @bind-Value="@_selectedDate" Required />
         </FluentGridItem>
-        <FluentGridItem xs="12" md="4">
-            <FluentButton Class="full-width" Disabled="_isLoadingGames" OnClick="GetGamesAsync" Loading="_isLoadingGames">@Loc["ReportsPage_LoadGames_Action"]</FluentButton>
+        <FluentGridItem xs="12" md="3">
+           <FluentSelect
+               Label="@Loc["ReportsPage_SelectGameType_Label"]"
+               Items="_gameTypes"
+               Class="full-width"
+               OptionText="@(x => x.Key)"
+               @bind-Value="_selectedGameTypeKey" />
+        </FluentGridItem>
+        <FluentGridItem xs="12" md="3">
+            <FluentTextField
+                Class="full-width"
+                Label="@Loc["ReportsPage_GamerName_Label"]"
+                Placeholder="@Loc["ReportsPage_GamerName_Placeholder"]"
+                @bind-Value="_enteredPlayerName" />
+        </FluentGridItem>
+        <FluentGridItem xs="12" md="3">
+            <FluentButton Appearance="Appearance.Accent" Class="full-width" Disabled="_isLoadingGames" OnClick="GetGamesAsync" Loading="_isLoadingGames">@Loc["ReportsPage_LoadGames_Action"]</FluentButton>
         </FluentGridItem>
         @if (_games is not null && !_isLoadingGames)
         {

src/CodeBreaker.Blazor.Client/Pages/ReportsPage.razor.cs

@@ -6,6 +6,7 @@
 using Microsoft.Extensions.Localization;
 using Microsoft.FluentUI.AspNetCore.Components;
 using Microsoft.FluentUI.AspNetCore.Components.Extensions;
+using System.Collections.Frozen;
 
 namespace CodeBreaker.Blazor.Client.Pages;
 
@@ -14,6 +15,11 @@ public partial class ReportsPage
     private GameInfo[]? _games;
     private bool _isLoadingGames = false;
     private DateTime? _selectedDate = DateTime.Now;
+    private string? _selectedGameTypeKey = null;
+    private string? _enteredPlayerName = null;
+    private IDictionary<string, GameType?> _gameTypes = null!;
+
+    private GameType? SelectedGameType => string.IsNullOrEmpty(_selectedGameTypeKey) ? null : _gameTypes[_selectedGameTypeKey];
 
     [Inject] private IDialogService DialogService { get; set; } = default!;
 
@@ -25,6 +31,17 @@ public partial class ReportsPage
 
     private string[] Headers => [.. Loc.GetString("ReportsPage_Table_Headers").Value.Split(",")];
 
+    protected override void OnInitialized()
+    {
+        _gameTypes = new Dictionary<string, GameType?>() {
+            { Loc["ReportsPage_GameType_All"], null },
+            { "6x4", GameType.Game6x4 },
+            { "6x4 Mini", GameType.Game6x4Mini },
+            { "8x5", GameType.Game8x5 },
+            { "5x5x4", GameType.Game5x5x4 },
+        }.ToFrozenDictionary();
+    }
+
     public async Task GetGamesAsync()
     {
         var date = _selectedDate.ToDateOnly();
@@ -33,7 +50,7 @@ public async Task GetGamesAsync()
         _isLoadingGames = true;
         try
         {
-            var query = new GamesQuery(Date: date, Ended: true);
+            var query = new GamesQuery(Date: date, Ended: true, GameType: SelectedGameType, PlayerName: _enteredPlayerName);
             var response = await GameClient.GetGamesAsync(query);
             Logger?.LogDebug("Got response: {response}", response);
             _games = [..response ?? []];

src/CodeBreaker.Blazor.Client/Resources/Resource.Designer.cs

@@ -380,4 +380,16 @@
   <data name="GamePage_NameInput_Placeholder" xml:space="preserve">
     <value>Wählen Sie Ihren Spielernamen</value>
   </data>
+  <data name="ReportsPage_SelectGameType_Label" xml:space="preserve">
+    <value>Wähle einen Spieltyp (optional)</value>
+  </data>
+  <data name="ReportsPage_GamerName_Label" xml:space="preserve">
+    <value>Gib einen Spielernamen ein (optional)</value>
+  </data>
+  <data name="ReportsPage_GameType_Placeholder" xml:space="preserve">
+    <value>Alle</value>
+  </data>
+  <data name="ReportsPage_GamerName_Placeholder" xml:space="preserve">
+    <value>Alle</value>
+  </data>
 </root>

src/CodeBreaker.Blazor.Client/Resources/Resource.de.resx

@@ -392,4 +392,16 @@
   <data name="GamePage_NameInput_Placeholder" xml:space="preserve">
     <value>Choose your gamername</value>
   </data>
+  <data name="ReportsPage_SelectGameType_Label" xml:space="preserve">
+    <value>Select a gametype (optional)</value>
+  </data>
+  <data name="ReportsPage_GamerName_Label" xml:space="preserve">
+    <value>Enter a gamer name (optional)</value>
+  </data>
+  <data name="ReportsPage_GameType_All" xml:space="preserve">
+    <value>All</value>
+  </data>
+  <data name="ReportsPage_GamerName_Placeholder" xml:space="preserve">
+    <value>All</value>
+  </data>
 </root>