Implement sorting functionality for prospects with a dialog and custom sort options

FoodsharingSiegen.Contracts/Enums/ProspectSortOption.cs

@@ -0,0 +1,10 @@
+namespace FoodsharingSiegen.Contracts.Enums
+{
+    public enum ProspectSortOption
+    {
+        NameAscending,
+        NameDescending,
+        ModifiedAscending,
+        ModifiedDescending
+    }
+}

FoodsharingSiegen.Server/Controls/ProspectContainer.razor

@@ -12,8 +12,23 @@
 <div class="@divClass">
     <h5 class="mb-2 d-flex">
         <div class="flex-grow-1">
+            @if(string.IsNullOrWhiteSpace(Prospect?.Name))
+            {
+                <i class="fa-solid fa-exclamation-triangle text-warning"></i>
+                <doublearrows></doublearrows>
+                
+                <em>»Name fehlt«</em>
+            }
+            else
+            {
                 @Prospect?.Name
-            <small style="font-size: .9rem;">@Prospect?.FsId</small>
+            }
+
+            @if (Prospect?.FsId != null && Prospect.FsId != 0)
+            {
+                <small style="font-size: .9rem; margin-left: 0.5rem;">@Prospect?.FsId</small>
+            }
+            
         </div>
         <div>
             @if (CurrentUser.IsInGroup(UserGroup.WelcomeTeam, UserGroup.Ambassador))

FoodsharingSiegen.Server/Dialogs/ProspectSortDialog.razor

@@ -0,0 +1,9 @@
+@inherits FsBase
+@using FoodsharingSiegen.Contracts.Enums
+
+<div class="d-grid gap-2">
+    <Button Color="@GetSortButtonColor(ProspectSortOption.NameAscending)" Clicked="() => SelectAsync(ProspectSortOption.NameAscending)">Name (aufsteigend)</Button>
+    <Button Color="@GetSortButtonColor(ProspectSortOption.NameDescending)" Clicked="() => SelectAsync(ProspectSortOption.NameDescending)">Name (absteigend)</Button>
+    <Button Color="@GetSortButtonColor(ProspectSortOption.ModifiedAscending)" Clicked="() => SelectAsync(ProspectSortOption.ModifiedAscending)">Geändert (aufsteigend)</Button>
+    <Button Color="@GetSortButtonColor(ProspectSortOption.ModifiedDescending)" Clicked="() => SelectAsync(ProspectSortOption.ModifiedDescending)">Geändert (absteigend)</Button>
+</div>

FoodsharingSiegen.Server/Dialogs/ProspectSortDialog.razor.cs

@@ -0,0 +1,39 @@
+using Blazorise;
+using FoodsharingSiegen.Contracts.Enums;
+using FoodsharingSiegen.Server.BaseClasses;
+using Microsoft.AspNetCore.Components;
+
+namespace FoodsharingSiegen.Server.Dialogs
+{
+    public partial class ProspectSortDialog : FsBase
+    {
+        [Parameter]
+        public ProspectSortOption CurrentSort { get; set; } = ProspectSortOption.NameAscending;
+
+        [Parameter]
+        public Func<ProspectSortOption, Task>? OnSortSelected { get; set; }
+
+        public static async Task ShowAsync(IModalService modalService, ProspectSortOption currentSort, Func<ProspectSortOption, Task> onSortSelected)
+        {
+            await modalService.Show<ProspectSortDialog>("Sortieren", p =>
+            {
+                p.Add(nameof(CurrentSort), currentSort);
+                p.Add(nameof(OnSortSelected), onSortSelected);
+            }, new ModalInstanceOptions
+            {
+                Size = ModalSize.Small,
+            });
+        }
+
+        private Color GetSortButtonColor(ProspectSortOption option)
+        {
+            return CurrentSort == option ? Color.Success : Color.Secondary;
+        }
+
+        private async Task SelectAsync(ProspectSortOption option)
+        {
+            if (OnSortSelected != null) await OnSortSelected(option);
+            await ModalService.Hide();
+        }
+    }
+}

FoodsharingSiegen.Server/Pages/Prospects.razor

@@ -16,20 +16,44 @@
 
 <Button
     Color="Color.Primary"
+    Width="Width.Px(50)"
+    Height="Height.Px(50)"
+    title="Hinzufügen"
+    style="min-width: auto;"
     Clicked="@CreateProspectAsync"
     Visibility="@(CurrentUser.IsInGroup(UserGroup.WelcomeTeam, UserGroup.Ambassador) ? Visibility.Default : Visibility.Invisible)"
->Hinzufügen
+><i class="fa-solid fa-plus"></i>
 </Button>
 
+<Button
+    Color="Color.Primary"
+    Width="Width.Px(50)"
+    Height="Height.Px(50)"
+    title="Sortieren"
+    style="min-width: auto;"
+    Clicked="@OpenSortDialogAsync"
+><i class="fa-solid fa-sort"></i>
+</Button>
+
+<div class="badge-row mt-2">
+    @if (HasCustomSort)
+    {
+        <Badge Color="Color.Primary" Closable="true" CloseClicked="@EventCallback.Factory.Create(this, ResetSortAsync)">@CurrentSortText</Badge>
+    }
+</div>
+
+
+
 @{
     var filterList = ProspectList.ApplyFilter(Filter);
+    var sortList = SortProspects(filterList);
 }
 
 <hr/>
 <ProspectFilterControl Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.OnBoarding"></ProspectFilterControl>
 <hr />
 <ProspectGrid
-    Prospects="filterList"
+    Prospects="sortList"
     OnDataChanged="@LoadProspects"
     StateFilter="ProspectStateFilter.OnBoarding">
 </ProspectGrid>

FoodsharingSiegen.Server/Pages/Prospects.razor.cs

@@ -36,6 +36,8 @@ namespace FoodsharingSiegen.Server.Pages
         /// </summary>
         private List<Prospect>? ProspectList { get; set; }
 
+        private ProspectSortOption CurrentSort { get; set; } = ProspectSortOption.NameAscending;
+
         #endregion
 
         #region Override InitializeDataAsync
@@ -63,6 +65,32 @@ namespace FoodsharingSiegen.Server.Pages
             await EditProspectDialog.ShowAsync(ModalService, LoadProspects);
         }
 
+        private async Task OpenSortDialogAsync()
+        {
+            await ProspectSortDialog.ShowAsync(ModalService, CurrentSort, async option =>
+            {
+                CurrentSort = option;
+
+                await InvokeAsync(StateHasChanged);
+            });
+        }
+
+        private bool HasCustomSort => CurrentSort != ProspectSortOption.NameAscending;
+
+        private string CurrentSortText => CurrentSort switch
+        {
+            ProspectSortOption.NameDescending => "Sortierung: Name (absteigend)",
+            ProspectSortOption.ModifiedAscending => "Sortierung: Zuletzt geaendert (aufsteigend) ",
+            ProspectSortOption.ModifiedDescending => "Sortierung: Zuletzt geaendert (absteigend) ",
+            _ => string.Empty
+        };
+
+        private async Task ResetSortAsync()
+        {
+            CurrentSort = ProspectSortOption.NameAscending;
+            await InvokeAsync(StateHasChanged);
+        }
+
         #endregion
 
         #region Private Method FilterChangedAsync
@@ -78,6 +106,18 @@ namespace FoodsharingSiegen.Server.Pages
             await LocalStorageService.SetItem(StorageKeys.ProspectFilter, Filter);
         }
 
+        private List<Prospect> SortProspects(List<Prospect> prospects)
+        {
+            return CurrentSort switch
+            {
+                ProspectSortOption.NameAscending => prospects.OrderBy(x => x.Name, StringComparer.OrdinalIgnoreCase).ToList(),
+                ProspectSortOption.NameDescending => prospects.OrderByDescending(x => x.Name, StringComparer.OrdinalIgnoreCase).ToList(),
+                ProspectSortOption.ModifiedAscending => prospects.OrderBy(x => x.Modified ?? x.Created).ToList(),
+                ProspectSortOption.ModifiedDescending => prospects.OrderByDescending(x => x.Modified ?? x.Created).ToList(),
+                _ => prospects
+            };
+        }
+
         #endregion
 
         #region Private Method LoadProspects

FoodsharingSiegen.Server/wwwroot/buildinfo.txt

@@ -1 +1 @@
-20260410
+20260416