Merge branch 'main' of https://github.com/benjaminsampica/DynamoLeagu…

…eBlazor

DynamoLeagueBlazor/Client/Features/Fines/List.razor.cs

@@ -18,6 +18,11 @@ public partial class List : IDisposable
     private readonly CancellationTokenSource _cts = new();
 
     protected override async Task OnInitializedAsync()
+    {
+        await LoadDataAsync();
+    }
+
+    private async Task LoadDataAsync()
     {
         try
         {
@@ -44,7 +49,8 @@ private void OpenManageFineDialog(int fineId)
     {
         var parameters = new DialogParameters
         {
-            { nameof(Manage.FineId), fineId }
+            { nameof(Manage.FineId), fineId },
+            { nameof(Manage.OnManageButtonClick), EventCallback.Factory.Create(this, () => LoadDataAsync())}
         };
 
         DialogService.Show<Manage>("Manage Fine", parameters);

DynamoLeagueBlazor/Client/Features/Fines/Manage.razor

@@ -7,7 +7,9 @@
         <DialogActions>
             <MudGrid Spacing=1>
                 <MudItem xs=12>
-                    <MudButton Color="Color.Error" Variant=Variant.Text StartIcon=@Icons.Outlined.Delete ButtonType=ButtonType.Submit Disabled="@_processingForm" FullWidth=true Size=Size.Large>
+                    <MudButton Color="Color.Error" Variant=Variant.Text StartIcon=@Icons.Outlined.Delete 
+                    ButtonType=ButtonType.Submit Disabled="@_processingForm" FullWidth=true 
+                    Size=Size.Large OnClick="@(() => IsApproved(false))">
                         @if (_processingForm)
                         {
                             <MudProgressCircular Class="ms-n1" Size="Size.Small" Indeterminate="true"/>
@@ -20,7 +22,10 @@
                     </MudButton>
                 </MudItem>
                 <MudItem xs=12>
-                    <MudButton Color="Color.Success" Variant=Variant.Text StartIcon=@Icons.Outlined.Check ButtonType=ButtonType.Submit Disabled="@_processingForm" FullWidth=true  Size=Size.Large>
+                    <MudButton 
+                        Color="Color.Success" Variant=Variant.Text StartIcon=@Icons.Outlined.Check 
+                        ButtonType=ButtonType.Submit Disabled="@_processingForm" FullWidth=true 
+                        Size=Size.Large OnClick="@(() => IsApproved(true))">
                         @if (_processingForm)
                         {
                             <MudProgressCircular Class="ms-n1" Size="Size.Small" Indeterminate="true"/>

DynamoLeagueBlazor/Client/Features/Fines/Manage.razor.cs

@@ -12,6 +12,7 @@ public partial class Manage : IDisposable
     [Inject] private ISnackbar SnackBar { get; set; } = null!;
     [CascadingParameter] MudDialogInstance MudDialogInstance { get; set; } = null!;
     [Parameter, EditorRequired] public int FineId { get; set; }
+    [Parameter, EditorRequired] public EventCallback OnManageButtonClick { get; set; }
 
     private ManageFineRequest _form = null!;
     private bool _processingForm;
@@ -33,6 +34,7 @@ private async Task OnValidSubmitAsync()
             if (response.IsSuccessStatusCode)
             {
                 SnackBar.Add("Successfully updated fine.", Severity.Success);
+                await OnManageButtonClick.InvokeAsync();
             }
             else
             {
@@ -48,7 +50,10 @@ private async Task OnValidSubmitAsync()
         MudDialogInstance.Close();
     }
 
-    private void Cancel() => MudDialogInstance.Close();
+    private void IsApproved(bool approved)
+    {
+        _form.Approved = approved;
+    }
 
     public void Dispose()
     {

DynamoLeagueBlazor/Client/Features/Players/AddFine.razor.cs

@@ -49,7 +49,7 @@ private async Task OnValidSubmitAsync()
 
             if (response.IsSuccessStatusCode)
             {
-                SnackBar.Add("Successfully added fine.", Severity.Success);
+                SnackBar.Add("Successfully added a fine. An administrator will either approve or deny the fine.", Severity.Success);
             }
             else
             {

DynamoLeagueBlazor/Server/Features/Fines/List.cs

@@ -46,6 +46,7 @@ public async Task<FineListResult> Handle(ListQuery request, CancellationToken ca
     {
         var fines = await _dbContext.Fines
             .Include(p => p.Player)
+            .OrderBy(f => f.Status)
             .ProjectTo<FineListResult.FineItem>(_mapper.ConfigurationProvider)
             .ToListAsync(cancellationToken);