Trial - boosting prospect grid loading performance

.cursor/plans/einab_interaction_edit_79be74e0.plan.md

@@ -0,0 +1,155 @@
+---
+name: EinAb Interaction Edit
+overview: Add edit mode for EinAb (Einführung) interactions by extending the existing InteractionDialog with an update path, a new ProspectService.UpdateInteraction method, and an edit button in InteractionRow — scoped to EinAb initially but designed for future interaction types.
+todos:
+  - id: service-update
+    content: Add ProspectService.UpdateInteraction + AuditType.EditInteraction + AuditHelper case
+    status: completed
+  - id: dialog-edit-mode
+    content: Extend InteractionDialog with IsEditMode, IsEditable helper, and unified SaveAsync
+    status: completed
+  - id: row-edit-button
+    content: Add AllowEdit/EditClick to InteractionRow with pencil icon in item list
+    status: completed
+  - id: container-wire
+    content: Add EditInteraction handler in ProspectContainer and enable AllowEdit on EinAb row
+    status: completed
+isProject: false
+---
+
+# EinAb Interaction Edit Mode
+
+## Current State
+
+EinAb interactions ("Einführung") are multi-entry (minimum 3) and support date, business/person fields (`Info1`/`Info2`), and feedback (thumbs up/down/neutral). Users can **add** via [`InteractionDialog`](FoodsharingSiegen.Server/Dialogs/InteractionDialog.razor) and **remove** via the X icon in [`InteractionRow`](FoodsharingSiegen.Server/Controls/InteractionRow.razor). There is no update path at any layer.
+
+```mermaid
+flowchart LR
+    subgraph current [Current Flow]
+        AddBtn["+ Button"] --> Dialog["InteractionDialog"]
+        Dialog --> AddSvc["ProspectService.AddInteraction"]
+        XBtn["X Button"] --> Confirm["ConfirmDialog"]
+        Confirm --> RemoveSvc["ProspectService.RemoveInteraction"]
+    end
+```
+
+## Target Flow
+
+```mermaid
+flowchart LR
+    subgraph target [New Edit Flow]
+        EditBtn["Pencil Button"] --> EditDialog["InteractionDialog (edit mode)"]
+        EditDialog --> UpdateSvc["ProspectService.UpdateInteraction"]
+    end
+    AddBtn["+ Button"] --> AddDialog["InteractionDialog (add mode)"]
+    AddDialog --> AddSvc["ProspectService.AddInteraction"]
+    XBtn["X Button"] --> RemoveSvc["ProspectService.RemoveInteraction"]
+```
+
+Edit and remove will coexist. Only EinAb gets the edit button initially.
+
+---
+
+## 1. Service Layer — `UpdateInteraction`
+
+**File:** [`FoodsharingSiegen.Server/Data/Service/ProspectService.cs`](FoodsharingSiegen.Server/Data/Service/ProspectService.cs)
+
+Add `UpdateInteraction(Interaction interaction)` following the existing `UpdateAsync(Prospect)` pattern:
+
+- Load tracked entity by `interaction.Id`; return error if not found
+- Update editable fields only: `Date`, `Info1`, `Info2`, `Feedback`, `FeedbackInfo`, `Alert`
+- Do **not** change: `Id`, `Created`, `UserID` (preserves original creator), `Type`, `ProspectID`, `NotNeeded`
+- Set parent `Prospect.Modified = DateTime.UtcNow`
+- Audit via new `AuditType.EditInteraction` (prospect name + interaction type as data)
+- Detach entities after save (consistent with `AddInteraction`)
+
+---
+
+## 2. Audit Support
+
+**Files:**
+- [`FoodsharingSiegen.Contracts/Enums/AuditType.cs`](FoodsharingSiegen.Contracts/Enums/AuditType.cs) — add `EditInteraction = 160`
+- [`FoodsharingSiegen.Server/Data/AuditHelper.cs`](FoodsharingSiegen.Server/Data/AuditHelper.cs) — add case: `"hat eine Interaktion bei {Data1} bearbeitet: {Data2}"`
+
+---
+
+## 3. InteractionDialog — Add/Edit Mode
+
+**Files:** [`InteractionDialog.razor.cs`](FoodsharingSiegen.Server/Dialogs/InteractionDialog.razor.cs), [`InteractionDialog.razor`](FoodsharingSiegen.Server/Dialogs/InteractionDialog.razor)
+
+Follow the [`EditProspectDialog`](FoodsharingSiegen.Server/Dialogs/EditProspectDialog.razor.cs) pattern (`IsUpdateMode` + conditional save):
+
+- Add `IsEditMode` parameter and a static extensibility helper:
+
+```csharp
+public static bool IsEditable(InteractionType type) => type switch
+{
+    InteractionType.EinAb => true,
+    _ => false
+};
+```
+
+- Extend `InteractionDialogParameter` with optional `Interaction? ExistingInteraction = null`
+- In `ShowAsync`: when `ExistingInteraction` is provided, pass it as the bound `Interaction` and set `IsEditMode = true`; otherwise keep current "new interaction" behavior
+- Replace `AddInteractionAsync` with a unified `SaveAsync`:
+  - **Add mode:** `Interaction.UserID = CurrentUser.Id` → `ProspectService.AddInteraction`
+  - **Edit mode:** `ProspectService.UpdateInteraction`
+- In the razor template, change OK button label: `"OK"` (add) / `"Speichern"` (edit) — same fields render in both modes (date, Betrieb, Mit wem, feedback)
+
+**Header text** (in `ProspectContainer`): `"Einführung für {Name} bearbeiten"` for edit vs existing `"… eintragen"` for add.
+
+---
+
+## 4. InteractionRow — Edit Button
+
+**Files:** [`InteractionRow.razor`](FoodsharingSiegen.Server/Controls/InteractionRow.razor), [`InteractionRow.razor.cs`](FoodsharingSiegen.Server/Controls/InteractionRow.razor.cs)
+
+- Add parameters:
+  - `bool AllowEdit { get; set; }` — controls visibility
+  - `Func<Guid, Task>? EditClick { get; set; }` — callback with interaction Id
+- In the per-item loop (lines 46–66), show a pencil icon (`fa-solid fa-pen-to-square`) next to the existing X remove icon when `AllowEdit && AllowInteraction`
+- Same visibility guard as remove: hidden when prospect is complete (unless Complete-type interaction)
+
+---
+
+## 5. ProspectContainer — Wire Up Edit
+
+**Files:** [`ProspectContainer.razor`](FoodsharingSiegen.Server/Controls/ProspectContainer.razor), [`ProspectContainer.razor.cs`](FoodsharingSiegen.Server/Controls/ProspectContainer.razor.cs)
+
+- Add `EditInteraction(Guid interactionId)`:
+  - Look up interaction from `Prospect.Interactions`
+  - Guard: only proceed if `InteractionDialog.IsEditable(interaction.Type)`
+  - Open dialog with existing interaction and header `"Einführung für {Name} bearbeiten"`
+  - On success → `OnDataChanged()`
+- On the EinAb `InteractionRow`, add:
+  - `AllowEdit="true"`
+  - `EditClick="@EditInteraction"`
+
+Other interaction rows remain unchanged (no edit button).
+
+---
+
+## Extensibility Notes
+
+To enable edit for another type later:
+1. Add the type to `InteractionDialog.IsEditable()`
+2. Set `AllowEdit="true"` on that row in `ProspectContainer.razor`
+3. Ensure field labels in `ShowAsync`'s type switch cover that type (already done for several types)
+
+No separate edit dialog component is needed — the same form handles both modes.
+
+---
+
+## Files Changed (summary)
+
+| File | Change |
+|------|--------|
+| `ProspectService.cs` | New `UpdateInteraction` method |
+| `AuditType.cs` | New `EditInteraction` enum value |
+| `AuditHelper.cs` | New audit text case |
+| `InteractionDialog.razor.cs` | Edit mode, `IsEditable`, unified save |
+| `InteractionDialog.razor` | Conditional button label |
+| `InteractionRow.razor` / `.cs` | Edit button + parameters |
+| `ProspectContainer.razor` / `.cs` | `EditInteraction` handler, EinAb wiring |
+
+No database migration required — all editable fields already exist on the `Interaction` entity.

.github/prompts/plan-prospectPerformance.prompt.md

@@ -0,0 +1,56 @@
+## Plan: Prospect list performance overhaul
+
+The current bottleneck is not just data volume; it is the combination of loading every prospect and every nested interaction at once, then rendering all cards in the browser. In the current flow, each page loads the full list from `ProspectService.GetProspectsAsync`, includes all `Images` and `Interactions` plus each `User`, and then `ProspectGrid` renders every card through `Repeater` without virtualization. With hundreds of records, the UI does repeated LINQ work per card and hits a lot of DOM work in one render.
+
+### Recommended approach
+Use a two-part fix: reduce the server-side payload and virtualize the client-side rendering. The best gains will come from paginating or virtualizing the list, then trimming unnecessary nested load and repeated per-row calculations.
+
+### Steps
+1. Profile the bottleneck and cap the visible list size
+   - Confirm the prospect pages are loading all records at once because `GetProspectsAsync` currently does `ToListAsync()` without paging or limit.
+   - Add a page-size/virtualized flow so only the visible slice is fetched and rendered.
+   - This change must happen in the page and service layer before any UI refactor.
+
+2. Reduce EF payload in `ProspectService.GetProspectsAsync`
+   - Update `FoodsharingSiegen.Server/Data/Service/ProspectService.cs` so it accepts pagination arguments (`skip`, `take`, optional filters) instead of returning the full unbounded list.
+   - Keep the query as `AsNoTracking()` but avoid eager-loading all `Images` and every `User` for every prospect when the page only needs a summary view.
+   - For the list pages, load only the subset needed for the grid and defer expensive image/user data until a detail action opens.
+   - Filter and sort should happen server-side when possible to avoid moving hundreds of full entities into memory and then filtering again in the browser.
+
+3. Replace the full list render with virtualization
+   - Convert the repeated list in `FoodsharingSiegen.Server/Controls/ProspectGrid.razor` to a virtualized list or paged container, rather than rendering a full `<Repeater Items="@Prospects">` for all rows.
+   - Keep the visible cards only; the hidden rows should not be in the DOM.
+   - This removes the biggest DOM cost on pages with hundreds of entries.
+
+4. Remove repeated per-row computation in the card components
+   - In `FoodsharingSiegen.Server/Controls/InteractionRow.razor.cs`, the properties `Interactions`, `Done`, `Alert`, `NotNeeded` recalculate on every render from a list of nested items. With hundreds of cards this becomes expensive.
+   - Replace repeated `Where()` chains with precomputed values from the loaded model or cached values at the prospect object level.
+   - In `FoodsharingSiegen.Contracts/Entity/Prospect.cs`, avoid deriving `Complete` from `Interactions.Any()` on every render when a summary value is already known in the data model.
+   - Keep the card logic free of repeated `ToList()` and `Any()` chains during render.
+
+5. Tighten data shaping for each list page
+   - The onboarding, verification, archive, and done pages all load the same full set of entities and then apply client-side filters with `ApplyFilter` and `ApplySort` in `FoodsharingSiegen.Shared/Helper/FilterHelper.cs`.
+   - Move the expensive filtering/sorting to SQL or at least to the server-side query layer; reduce the list to a smaller result set before it reaches the UI.
+   - Keep `ProspectList.ApplyFilter` only as a fallback for small local slices, not as the primary path for large lists.
+
+6. Verify the improvement with focused checks
+   - Measure page load time before and after with a realistic dataset of several hundred prospects.
+   - Validate that the list stays responsive during scrolling and interaction changes.
+   - Run the relevant .NET tests and render-check the prospect pages manually.
+
+### Relevant files
+- `FoodsharingSiegen.Server/Data/Service/ProspectService.cs` — main query and database fetch point.
+- `FoodsharingSiegen.Server/Controls/ProspectGrid.razor` — full-list rendering path.
+- `FoodsharingSiegen.Server/Controls/ProspectContainer.razor` — per-card DOM and nested component rendering.
+- `FoodsharingSiegen.Server/Controls/InteractionRow.razor.cs` — repeated LINQ work in each row.
+- `FoodsharingSiegen.Contracts/Entity/Prospect.cs` — computed values that trigger repeated work.
+- `FoodsharingSiegen.Shared/Helper/FilterHelper.cs` — client-side list filtering/sorting on large sets.
+- `FoodsharingSiegen.Server/Pages/Prospects.razor`, `FoodsharingSiegen.Server/Pages/ProspectsAll.razor`, `FoodsharingSiegen.Server/Pages/ProspectsVerify.razor`, `FoodsharingSiegen.Server/Pages/ProspectsDone.razor` — list page orchestration and data flow.
+
+### Key decision
+The highest-value fix is to stop returning and rendering all prospects at once. A virtualized/paged list with a trimmed query shape will provide the biggest speedup and should be the first implementation target.
+
+### Optional follow-up improvements
+- Precompute a lightweight summary model for the grid instead of the full `Prospect` entity.
+- Add a server-side count query to support proper paging without loading every record.
+- Consider splitting the list into “summary” and “detail” data so the main dashboard never loads full nested relationship graphs by default.

FoodsharingSiegen.Contracts/Entity/User.cs

@@ -42,7 +42,12 @@ namespace FoodsharingSiegen.Contracts.Entity
             {
                 if (string.IsNullOrWhiteSpace(Groups)) return new List<UserGroup>();
                 var stringList = Groups.Split(",");
-                var enumList = stringList.Where(x => !string.IsNullOrWhiteSpace(x)).Select(Enum.Parse<UserGroup>).ToList();
+                var enumList = stringList
+                    .Where(x => !string.IsNullOrWhiteSpace(x))
+                    .Select(x => Enum.TryParse<UserGroup>(x.Trim(), out var result) ? result : (UserGroup?)null)
+                    .Where(x => x.HasValue)
+                    .Select(x => x!.Value)
+                    .ToList();
                 return enumList;
             }
             set => Groups = string.Join(",", value);

FoodsharingSiegen.Contracts/Enums/AuditType.cs

@@ -87,7 +87,12 @@ namespace FoodsharingSiegen.Contracts.Enums
         /// <summary>
         ///     The change own password audit type
         /// </summary>
-        ChangeOwnPassword = 150
+        ChangeOwnPassword = 150,
+
+        /// <summary>
+        ///     The edit interaction audit type
+        /// </summary>
+        EditInteraction = 160
 
         #endregion Prospects
     }

FoodsharingSiegen.Contracts/Helper/AttributeExtensions.cs

@@ -34,6 +34,7 @@ namespace FoodsharingSiegen.Contracts.Helper
         {
             var type = enumVal.GetType();
             var memInfo = type.GetMember(enumVal.ToString());
+            if (memInfo.Length == 0) return null;
             var attributes = memInfo[0].GetCustomAttributes(typeof(T), false);
             return attributes.Length > 0 ? (T)attributes[0] : null;
         }

FoodsharingSiegen.Contracts/Model/Parameters.cs

@@ -6,5 +6,10 @@ namespace FoodsharingSiegen.Contracts.Model
     /// <summary>
     ///     The get prospects parameter
     /// </summary>
-    public record GetProspectsParameter(List<InteractionType>? MustHaveInteractions = null, List<InteractionType>? CannotHaveInteractions = null, bool IncludeDeleted = false);
+    public record GetProspectsParameter(
+        List<InteractionType>? MustHaveInteractions = null,
+        List<InteractionType>? CannotHaveInteractions = null,
+        bool IncludeDeleted = false,
+        int Skip = 0,
+        int Take = 50);
 }

FoodsharingSiegen.Server/Controls/InteractionRow.razor

@@ -45,11 +45,29 @@ else
     
     @foreach (var interaction in Interactions)
     {
-        <div class="d-flex justify-content-end">
+        <div class="d-flex justify-content-end align-items-center interaction-row-action-group">
             @if ((Prospect is not { Complete: true } || interaction.Type == InteractionType.Complete) && AllowInteraction)
             {
-                <a style="display: inline-block;"" href=""><i class="fa-solid fa-square-xmark" @onclick="async () => { if (RemoveClick != null) await RemoveClick.Invoke(interaction.Id); }" @onclick:preventDefault></i></a>
+                <div class="d-flex align-items-center interaction-row-actions">
-            } else {
+                    @if (AllowEdit)
+                    {
+                        <Button Size="Size.Small"
+                                Class="interaction-row-action interaction-row-action-edit"
+                                title="Eintrag bearbeiten"
+                                Clicked="@(async () => { if (EditClick != null) await EditClick.Invoke(interaction.Id); })">
+                            <i class="fa-solid fa-pen-to-square"></i>
+                        </Button>
+                    }
+                    <Button Size="Size.Small"
+                            Class="interaction-row-action interaction-row-action-delete"
+                            title="Eintrag löschen"
+                            Clicked="@(async () => { if (RemoveClick != null) await RemoveClick.Invoke(interaction.Id); })">
+                        <i class="fa-solid fa-square-xmark"></i>
+                    </Button>
+                </div>
+            }
+            else
+            {
                 <span>&bull;</span>
             }
         </div>

FoodsharingSiegen.Server/Controls/InteractionRow.razor.cs

@@ -62,6 +62,18 @@ namespace FoodsharingSiegen.Server.Controls
         [Parameter]
         public Func<Guid, Task>? RemoveClick { get; set; }
 
+        /// <summary>
+        ///     Gets or sets whether editing existing interactions is allowed.
+        /// </summary>
+        [Parameter]
+        public bool AllowEdit { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the callback invoked when an interaction is edited.
+        /// </summary>
+        [Parameter]
+        public Func<Guid, Task>? EditClick { get; set; }
+
         /// <summary>
         ///     Gets or sets the value of the type (ab)
         /// </summary>
@@ -85,7 +97,9 @@ namespace FoodsharingSiegen.Server.Controls
         /// <summary>
         ///     Gets the value of the interactions (ab)
         /// </summary>
-        private List<Interaction> Interactions => Prospect?.Interactions.Where(x => x.Type == Type).ToList() ?? [];
+        private List<Interaction> Interactions => Prospect?.Interactions is null
+            ? []
+            : [.. Prospect.Interactions.Where(x => x.Type == Type)];
 
         /// <summary>
         ///     Gets the value of the not needed (ab)

FoodsharingSiegen.Server/Controls/InteractionRow.razor.css

@@ -1,4 +1,38 @@
-tr.done th {
+.interaction-row-action-group {
+    gap: 0.25rem;
+    min-width: 2.7rem;
+}
+
+.interaction-row-actions {
+    gap: 0.25rem;
+}
+
+.interaction-row-action {
+    width: 1rem;
+    min-width: 1.25rem;
+    height: 1.25rem;
+    min-height: 1.25rem;
+    padding: 0;
+    display: inline-flex !important;
+    align-items: center;
+    justify-content: center;
+    font-size: 0.7rem;
+    line-height: 1;
+}
+
+.interaction-row-action i {
+    font-size: 0.95rem;
+}
+
+.interaction-row-action-edit i {
+    color: #1f2f3a;
+}
+
+.interaction-row-action-delete i {
+    color: rgb(153, 0, 0);
+}
+
+tr.done th {
     color: #64ae24;
 }
 

FoodsharingSiegen.Server/Controls/ProspectContainer.razor

@@ -81,6 +81,8 @@
             AllowInteraction="@(StateFilter == ProspectStateFilter.OnBoarding && CurrentUser.IsInGroup(UserGroup.WelcomeTeam, UserGroup.Ambassador))"
             AddClick="AddInteraction"
             RemoveClick="@RemoveInteraction"
+            AllowEdit="true"
+            EditClick="@EditInteraction"
             Multiple="true"
             Minimum="3"
             ButtonIconClass="fa-solid fa-plus"

FoodsharingSiegen.Server/Controls/ProspectContainer.razor.cs

@@ -62,6 +62,24 @@ namespace FoodsharingSiegen.Server.Controls
 
         #endregion
 
+        #region Private Method EditInteraction
+
+        private async Task EditInteraction(Guid interactionId)
+        {
+            if (Prospect == null || OnDataChanged == null) return;
+
+            var interaction = Prospect.Interactions.FirstOrDefault(x => x.Id == interactionId);
+            if (interaction == null || !InteractionDialog.IsEditable(interaction.Type)) return;
+
+            var headerText = $"{interaction.Type.Translate(AppSettings)} für {Prospect.Name} bearbeiten";
+
+            Func<Task> onSuccess = async () => await OnDataChanged();
+
+            await InteractionDialog.ShowAsync(ModalService, new(interaction.Type, Prospect.Id, headerText, onSuccess, interaction));
+        }
+
+        #endregion
+
         #region Private Method DeleteProspectAsync
 
         /// <summary>

FoodsharingSiegen.Server/Controls/ProspectGrid.razor

@@ -1,4 +1,7 @@
 @using FoodsharingSiegen.Contracts.Enums
+@using Microsoft.JSInterop
+@implements IAsyncDisposable
+@inject IJSRuntime JSRuntime
 @code {
 
   [Parameter] public List<Prospect>? Prospects { get; set; }
@@ -7,19 +10,95 @@
   
   [Parameter] public Func<Task>? OnDataChanged { get; set; }
 
+  [Parameter] public EventCallback OnLoadMore { get; set; }
+
+  [Parameter] public bool IsLoadingMore { get; set; }
+
+  [Parameter] public bool HasMore { get; set; }
+
   [Parameter] public string GridClass { get; set; } = string.Empty;
 
+  private IJSObjectReference? _module;
+  private DotNetObjectReference<ProspectGrid>? _dotNetHelper;
+  private string _gridId = $"prospect-grid-{Guid.NewGuid():N}";
+  private bool _isJsBound;
+  private bool _disposed;
+
+  protected override async Task OnAfterRenderAsync(bool firstRender)
+  {
+      if (_disposed || !firstRender || _isJsBound) return;
+
+      try
+      {
+          _dotNetHelper ??= DotNetObjectReference.Create(this);
+          _module ??= await JSRuntime.InvokeAsync<IJSObjectReference>("import", "./js/prospect-grid.js");
+          await _module.InvokeVoidAsync("attachScrollLoader", _gridId, _dotNetHelper);
+          _isJsBound = true;
+      }
+      catch (JSDisconnectedException)
+      {
+          // Ignore browser disconnect during teardown.
+      }
+      catch (ObjectDisposedException)
+      {
+          // Ignore late render after the component is being torn down.
+      }
+  }
+
+  [JSInvokable]
+  public async Task OnScrollNearBottom()
+  {
+      if (OnLoadMore.HasDelegate && !IsLoadingMore && HasMore)
+      {
+         await OnLoadMore.InvokeAsync();
+      }
+  }
+
+  public async ValueTask DisposeAsync()
+  {
+      _disposed = true;
+
+      if (_module is not null)
+      {
+          try
+          {
+              await _module.InvokeVoidAsync("disposeScrollLoader", _gridId);
+          }
+          catch (JSDisconnectedException)
+          {
+              // ignored; the circuit is already disconnected
+          }
+          catch (ObjectDisposedException)
+          {
+              // ignored; the JS runtime is already disposed
+          }
+      }
+
+      _dotNetHelper?.Dispose();
+      _dotNetHelper = null;
+      _isJsBound = false;
+  }
+
 }
 <h6>@(Prospects?.Count ?? 0) Ergebnisse</h6>
 
 @if (Prospects?.Any() == true)
 {
-  <div class="prospect-grid @GridClass">
+  <div id="@_gridId" class="prospect-grid @GridClass" style="max-height: calc(100vh - 250px); overflow-y: auto;">
-    <Repeater Items="@Prospects">
+    @foreach (var prospect in Prospects)
-      <ProspectContainer 
+    {
-        Prospect="context" 
+      <ProspectContainer @key="prospect.Id"
+        Prospect="prospect" 
         OnDataChanged="@OnDataChanged"
         StateFilter="StateFilter"></ProspectContainer>
-    </Repeater>
+    }
+
+    @if (IsLoadingMore)
+    {
+      <div class="d-flex justify-content-center py-3 text-muted">
+        <span class="me-2"><i class="fa-solid fa-spinner fa-spin"></i></span>
+        Weitere laden...
+      </div>
+    }
   </div>
 }

FoodsharingSiegen.Server/Data/AuditHelper.cs

@@ -37,6 +37,8 @@ namespace FoodsharingSiegen.Server.Data
                     return $"hat dem Neuling {audit.Data1} folgendes hinzugefügt: {audit.Data2}";
                 case AuditType.RemoveInteraction:
                     return $"hat eine Interaktion bei {audit.Data1} gelöscht.";
+                case AuditType.EditInteraction:
+                    return $"hat eine Interaktion bei {audit.Data1} bearbeitet: {audit.Data2}";
                 case AuditType.DeleteProspectImages:
                     return $"hat die Bilder von {audit.Data1} gelöscht.";
                 case AuditType.ViewProspectImages:

FoodsharingSiegen.Server/Data/Service/ProspectService.cs

@@ -116,15 +116,21 @@ namespace FoodsharingSiegen.Server.Data.Service
                     .Include(x => x.Interactions.OrderBy(i => i.Date)).ThenInclude(x => x.User)
                     .OrderBy(x => x.Name).AsQueryable();
 
-                if(parameter.MustHaveInteractions != null && parameter.MustHaveInteractions.Any()) 
+                if (parameter.MustHaveInteractions != null && parameter.MustHaveInteractions.Any())
                     prospectsQuery = prospectsQuery.Where(x => x.Interactions.Any(i => parameter.MustHaveInteractions.Contains(i.Type)));
 
-                if(parameter.CannotHaveInteractions != null && parameter.CannotHaveInteractions.Any())
+                if (parameter.CannotHaveInteractions != null && parameter.CannotHaveInteractions.Any())
                     prospectsQuery = prospectsQuery.Where(x => x.Interactions.All(i => !parameter.CannotHaveInteractions.Contains(i.Type)));
 
                 if (!parameter.IncludeDeleted)
                     prospectsQuery = prospectsQuery.Where(x => x.RecordState != RecordState.Archived);
 
+                if (parameter.Skip > 0)
+                    prospectsQuery = prospectsQuery.Skip(parameter.Skip);
+
+                if (parameter.Take > 0)
+                    prospectsQuery = prospectsQuery.Take(parameter.Take);
+
                 var prospects = await prospectsQuery.ToListAsync();
 
                 return new(prospects);
@@ -174,6 +180,53 @@ namespace FoodsharingSiegen.Server.Data.Service
 
         #endregion
 
+        #region Public Method UpdateInteraction
+
+        /// <summary>
+        /// Updates an existing interaction with the specified values.
+        /// </summary>
+        /// <param name="interaction">The interaction with updated values.</param>
+        /// <returns>A task containing an operation result of interaction.</returns>
+        public async Task<OperationResult<Interaction>> UpdateInteraction(Interaction interaction)
+        {
+            try
+            {
+                var entityInteraction = await Context.Interactions!.FirstOrDefaultAsync(x => x.Id == interaction.Id);
+                if (entityInteraction == null) return new(new Exception("Interaction not found"));
+
+                entityInteraction.Date = interaction.Date;
+                entityInteraction.Info1 = interaction.Info1;
+                entityInteraction.Info2 = interaction.Info2;
+                entityInteraction.Feedback = interaction.Feedback;
+                entityInteraction.FeedbackInfo = interaction.FeedbackInfo;
+                entityInteraction.Alert = interaction.Alert;
+
+                var prospect = await Context.Prospects!.FirstOrDefaultAsync(x => x.Id == entityInteraction.ProspectID);
+                if (prospect != null)
+                {
+                    prospect.Modified = DateTime.UtcNow;
+                }
+
+                await Context.SaveChangesAsync();
+
+                if (prospect != null)
+                {
+                    await AuditService.Insert(AuditType.EditInteraction, prospect.Name, entityInteraction.Type.ToString());
+                }
+
+                Context.Entry(entityInteraction).State = EntityState.Detached;
+                if (prospect != null) Context.Entry(prospect).State = EntityState.Detached;
+
+                return new(entityInteraction);
+            }
+            catch (Exception e)
+            {
+                return new(e);
+            }
+        }
+
+        #endregion
+
         #region Public Method UpdateAsync
 
         /// <summary>

FoodsharingSiegen.Server/Dialogs/EditProspectDialog.razor

@@ -11,7 +11,7 @@
     <div class="col">
         <Field>
             <FieldLabel>Foodsharing-ID</FieldLabel>
-            <NumericEdit TValue="int?" Value="Prospect.FsId" ValueChanged="@((int? v) => Prospect.FsId = v ?? 0)"></NumericEdit>
+            <NumericEdit TValue="int?" Value="@(Prospect.FsId == 0 ? (int?)null : Prospect.FsId)" ValueChanged="@((int? v) => Prospect.FsId = v ?? 0)"></NumericEdit>
         </Field>
     </div>
 </div>

FoodsharingSiegen.Server/Dialogs/InteractionDialog.razor

@@ -76,5 +76,5 @@
 
 <div class="d-flex justify-content-end">
     <Button Color="Color.Secondary" Clicked="@ModalService.Hide">Abbrechen</Button>
-    <Button Color="Color.Primary" Clicked="@AddInteractionAsync" Class="ml-2">OK</Button>
+    <Button Color="Color.Primary" Clicked="@SaveAsync" Class="ml-2">@(IsEditMode ? "Speichern" : "OK")</Button>
 </div>

FoodsharingSiegen.Server/Dialogs/InteractionDialog.razor.cs

@@ -1,4 +1,5 @@
 using Blazorise;
+using FoodsharingSiegen.Contracts;
 using FoodsharingSiegen.Contracts.Entity;
 using FoodsharingSiegen.Contracts.Enums;
 using FoodsharingSiegen.Server.BaseClasses;
@@ -7,7 +8,7 @@ using Microsoft.AspNetCore.Components;
 
 namespace FoodsharingSiegen.Server.Dialogs
 {
-    public record InteractionDialogParameter(InteractionType Type, Guid ProspectId, string HeaderText, Func<Task> OnSuccess);
+    public record InteractionDialogParameter(InteractionType Type, Guid ProspectId, string HeaderText, Func<Task> OnSuccess, Interaction? ExistingInteraction = null);
 
     public partial class InteractionDialog : FsBase
     {
@@ -44,6 +45,19 @@ namespace FoodsharingSiegen.Server.Dialogs
         [Parameter]
         public bool ShowNotNeeded { get; set; }
 
+        [Parameter]
+        public bool IsEditMode { get; set; }
+
+        #endregion
+
+        #region Public Method IsEditable
+
+        public static bool IsEditable(InteractionType type) => type switch
+        {
+            InteractionType.EinAb => true,
+            _ => false
+        };
+
         #endregion
 
         #region Public Method ShowAsync
@@ -93,12 +107,29 @@ namespace FoodsharingSiegen.Server.Dialogs
                 _ => false
             };
 
-            var interaction = new Interaction
+            var isEditMode = parameter.ExistingInteraction != null;
-            {
+            var interaction = isEditMode
-                Type = parameter.Type,
+                ? new Interaction
-                Date = DateTime.UtcNow,
+                {
-                ProspectID = parameter.ProspectId
+                    Id = parameter.ExistingInteraction!.Id,
-            };
+                    Type = parameter.ExistingInteraction.Type,
+                    Date = parameter.ExistingInteraction.Date,
+                    ProspectID = parameter.ExistingInteraction.ProspectID,
+                    UserID = parameter.ExistingInteraction.UserID,
+                    Info1 = parameter.ExistingInteraction.Info1,
+                    Info2 = parameter.ExistingInteraction.Info2,
+                    Feedback = parameter.ExistingInteraction.Feedback,
+                    FeedbackInfo = parameter.ExistingInteraction.FeedbackInfo,
+                    Alert = parameter.ExistingInteraction.Alert,
+                    NotNeeded = parameter.ExistingInteraction.NotNeeded,
+                    Created = parameter.ExistingInteraction.Created
+                }
+                : new Interaction
+                {
+                    Type = parameter.Type,
+                    Date = DateTime.UtcNow,
+                    ProspectID = parameter.ProspectId
+                };
 
             await modalService.Show<InteractionDialog>(parameter.HeaderText, p =>
             {
@@ -108,29 +139,41 @@ namespace FoodsharingSiegen.Server.Dialogs
                 p.Add(nameof(Info2Name), info2Name);
                 p.Add(nameof(ShowAlert), showAlert);
                 p.Add(nameof(ShowNotNeeded), showNotNeeded);
+                p.Add(nameof(IsEditMode), isEditMode);
                 p.Add(nameof(OnSuccess), parameter.OnSuccess);
             });
         }
 
         #endregion
 
-        #region Private Method AddInteractionAsync
+        #region Private Method SaveAsync
 
         /// <summary>
-        ///     Adds a new interaction for the current user using the ProspectService and hides the modal.
+        ///     Saves the interaction (add or update) and hides the modal on success.
         /// </summary>
-        /// <returns>
+        private async Task SaveAsync()
-        ///     A task representing the asynchronous operation.
-        /// </returns>
-        private async Task AddInteractionAsync()
         {
-            Interaction.UserID = CurrentUser.Id;
+            OperationResult<Interaction> result;
 
-            var addR = await ProspectService.AddInteraction(Interaction);
+            if (IsEditMode)
+            {
+                result = await ProspectService.UpdateInteraction(Interaction);
+            }
+            else
+            {
+                Interaction.UserID = CurrentUser.Id;
+                result = await ProspectService.AddInteraction(Interaction);
+            }
 
-            await ModalService.Hide();
+            if (result.Success)
-
+            {
-            if (addR.Success && OnSuccess != null) await OnSuccess.Invoke();
+                await ModalService.Hide();
+                if (OnSuccess != null) await OnSuccess.Invoke();
+            }
+            else
+            {
+                await Notification.Error(result.Exception?.Message ?? "Unbekannter Fehler beim Speichern.", "Fehler");
+            }
         }
 
         #endregion

FoodsharingSiegen.Server/Extensions.cs

@@ -72,8 +72,10 @@ namespace FoodsharingSiegen.Server
             // Check if the directory exists
             if (Directory.Exists(configDir))
             {
-                // Get all JSON files that start with "appsettings" in the directory and its subdirectories
+                // In local development, skip the template-only example config so a debug override
-                var configFiles = Directory.EnumerateFiles(configDir, "appsettings*.json", SearchOption.AllDirectories);
+                // such as ASPNETCORE_URLS can take effect without changing the container image setup.
+                var configFiles = Directory.EnumerateFiles(configDir, "appsettings*.json", SearchOption.AllDirectories)
+                    .Where(file => !builder.Environment.IsDevelopment() || !Path.GetFileName(file).Equals("appsettings.example.json", StringComparison.OrdinalIgnoreCase));
 
                 // Add each file to the configuration
                 foreach (var file in configFiles) builder.Configuration.AddJsonFile(file, true, true);

FoodsharingSiegen.Server/Pages/AuditView.razor.css.map

@@ -0,0 +1 @@
+{"version":3,"sourceRoot":"","sources":["AuditView.razor.scss"],"names":[],"mappings":"AAAA;EACE","file":"AuditView.razor.css"}

FoodsharingSiegen.Server/Pages/Prospects.razor

@@ -29,13 +29,25 @@
 <ProspectSortControl @bind-CurrentSort="CurrentSort" StorageKey="@StorageKeys.SortProspects" OnSortChanged="StateHasChanged" Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.OnBoarding" />
 
 @{
-    var filterList = ProspectList.ApplyFilter(Filter);
+    var filtered = ProspectList.ApplyFilter(Filter);
-    var sortList = filterList.ApplySort(CurrentSort);
+    var sortList = filtered.ApplySort(CurrentSort);
 }
 
-
+@if (IsLoadingProspects)
-<ProspectGrid
+{
-    Prospects="sortList"
+    <div class="d-flex justify-content-center align-items-center py-5 text-muted">
-    OnDataChanged="@LoadProspects"
+        <span class="me-2"><i class="fa-solid fa-spinner fa-spin"></i></span>
-    StateFilter="ProspectStateFilter.OnBoarding">
+        Lade Einarbeitungen...
-</ProspectGrid>
+    </div>
+}
+else
+{
+    <ProspectGrid
+        Prospects="sortList"
+        OnDataChanged="@LoadProspects"
+        OnLoadMore="@LoadMoreProspects"
+        IsLoadingMore="IsLoadingMoreProspects"
+        HasMore="HasMoreProspects"
+        StateFilter="ProspectStateFilter.OnBoarding">
+    </ProspectGrid>
+}

FoodsharingSiegen.Server/Pages/Prospects.razor.cs

@@ -3,6 +3,7 @@ using FoodsharingSiegen.Contracts.Entity;
 using FoodsharingSiegen.Contracts.Enums;
 using FoodsharingSiegen.Contracts.Model;
 using FoodsharingSiegen.Server.Data.Service;
+using FoodsharingSiegen.Shared.Helper;
 using FoodsharingSiegen.Server.Dialogs;
 using FoodsharingSiegen.Server.Service;
 using Microsoft.AspNetCore.Components;
@@ -34,7 +35,17 @@ namespace FoodsharingSiegen.Server.Pages
         /// <summary>
         ///     Gets or sets the value of the prospect list (ab)
         /// </summary>
-        private List<Prospect>? ProspectList { get; set; }
+        private List<Prospect> ProspectList { get; set; } = [];
+
+        private bool IsLoadingProspects { get; set; }
+
+        private bool IsLoadingMoreProspects { get; set; }
+
+        private bool HasMoreProspects { get; set; }
+
+        private int CurrentPageSize { get; set; } = 50;
+
+        private int CurrentSkip { get; set; }
 
         private ProspectSortOption CurrentSort { get; set; } = ProspectSortOption.NameAscending;
 
@@ -89,6 +100,9 @@ namespace FoodsharingSiegen.Server.Pages
         {
             Filter = arg;
             await LocalStorageService.SetItem(StorageKeys.ProspectFilter, Filter);
+            CurrentSkip = 0;
+            ProspectList = [];
+            await LoadProspects();
         }
 
         #endregion
@@ -98,17 +112,68 @@ namespace FoodsharingSiegen.Server.Pages
         /// <summary>
         ///     Loads the prospects (a. beging, 11.04.2022)
         /// </summary>
+        private bool HasActiveFilter()
+        {
+            return !string.IsNullOrWhiteSpace(Filter.Text)
+                || Filter.WithoutStepInBriefing
+                || Filter.WithoutIdCheck
+                || Filter.DeletedOnly
+                || Filter.IdCheckPossible
+                || Filter.NoActivity
+                || Filter.RecentActivity;
+        }
+
         private async Task LoadProspects()
         {
+            if (IsLoadingProspects || IsLoadingMoreProspects) return;
+
             try
             {
-                var parameter = new GetProspectsParameter
+                if (CurrentSkip == 0)
                 {
-                    CannotHaveInteractions = [InteractionType.Complete, InteractionType.Verify, InteractionType.ReleasedForVerification]
+                    IsLoadingProspects = true;
-                };
+                }
+                else
+                {
+                    IsLoadingMoreProspects = true;
+                }
 
-                var prospectsR = await ProspectService.GetProspectsAsync(parameter);
+                await InvokeAsync(StateHasChanged);
-                if (prospectsR.Success) ProspectList = prospectsR.Data;
+
+                while (true)
+                {
+                    var parameter = new GetProspectsParameter
+                    {
+                        Skip = CurrentSkip,
+                        Take = CurrentPageSize,
+                        CannotHaveInteractions = [InteractionType.Complete, InteractionType.Verify, InteractionType.ReleasedForVerification]
+                    };
+
+                    var prospectsR = await ProspectService.GetProspectsAsync(parameter);
+                    if (!prospectsR.Success)
+                    {
+                        break;
+                    }
+
+                    var loadedProspects = prospectsR.Data ?? [];
+                    if (CurrentSkip == 0)
+                    {
+                        ProspectList = loadedProspects;
+                    }
+                    else
+                    {
+                        ProspectList = [.. ProspectList, .. loadedProspects];
+                    }
+
+                    CurrentSkip += loadedProspects.Count;
+                    HasMoreProspects = loadedProspects.Count == CurrentPageSize;
+
+                    var filteredCount = ProspectList.ApplyFilter(Filter).Count;
+                    if (!HasActiveFilter() || filteredCount > 0 || !HasMoreProspects || loadedProspects.Count == 0)
+                    {
+                        break;
+                    }
+                }
 
                 await InvokeAsync(StateHasChanged);
             }
@@ -116,6 +181,18 @@ namespace FoodsharingSiegen.Server.Pages
             {
                 await Notification.Error(ex.Message, "Fehler beim Laden");
             }
+            finally
+            {
+                IsLoadingProspects = false;
+                IsLoadingMoreProspects = false;
+                await InvokeAsync(StateHasChanged);
+            }
+        }
+
+        private async Task LoadMoreProspects()
+        {
+            if (IsLoadingProspects || IsLoadingMoreProspects || !HasMoreProspects) return;
+            await LoadProspects();
         }
 
         #endregion

FoodsharingSiegen.Server/Pages/ProspectsAll.razor

@@ -17,12 +17,25 @@
 <ProspectSortControl @bind-CurrentSort="CurrentSort" StorageKey="@StorageKeys.SortProspectsAll" OnSortChanged="StateHasChanged" Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.All" />
 
 @{
-    var filterList = ProspectList.ApplyFilter(Filter);
+    var filtered = ProspectList.ApplyFilter(Filter);
-    var sortList = filterList.ApplySort(CurrentSort);
+    var sortList = filtered.ApplySort(CurrentSort);
 }
 
-<ProspectGrid
+@if (IsLoadingProspects)
-    Prospects="sortList"
+{
-    OnDataChanged="@LoadProspects"
+    <div class="d-flex justify-content-center align-items-center py-5 text-muted">
-    StateFilter="ProspectStateFilter.All">
+        <span class="me-2"><i class="fa-solid fa-spinner fa-spin"></i></span>
-</ProspectGrid>
+        Lade Einarbeitungen...
+    </div>
+}
+else
+{
+    <ProspectGrid
+        Prospects="sortList"
+        OnDataChanged="@LoadProspects"
+        OnLoadMore="@LoadMoreProspects"
+        IsLoadingMore="IsLoadingMoreProspects"
+        HasMore="HasMoreProspects"
+        StateFilter="ProspectStateFilter.All">
+    </ProspectGrid>
+}

FoodsharingSiegen.Server/Pages/ProspectsAll.razor.cs

@@ -5,6 +5,7 @@ using FoodsharingSiegen.Contracts.Helper;
 using FoodsharingSiegen.Contracts.Model;
 using FoodsharingSiegen.Server.Data.Service;
 using FoodsharingSiegen.Server.Dialogs;
+using FoodsharingSiegen.Shared.Helper;
 using Microsoft.AspNetCore.Components;
 
 namespace FoodsharingSiegen.Server.Pages
@@ -37,7 +38,17 @@ namespace FoodsharingSiegen.Server.Pages
         /// <summary>
         ///     Gets or sets the value of the prospect list (ab)
         /// </summary>
-        private List<Prospect>? ProspectList { get; set; }
+        private List<Prospect> ProspectList { get; set; } = [];
+
+        private bool IsLoadingProspects { get; set; }
+
+        private bool IsLoadingMoreProspects { get; set; }
+
+        private bool HasMoreProspects { get; set; }
+
+        private int CurrentPageSize { get; set; } = 50;
+
+        private int CurrentSkip { get; set; }
 
         private ProspectSortOption CurrentSort { get; set; } = ProspectSortOption.NameAscending;
 
@@ -71,6 +82,9 @@ namespace FoodsharingSiegen.Server.Pages
         {
             Filter = arg;
             await LocalStorageService.SetItem(StorageKeys.ProspectFilter, Filter);
+            CurrentSkip = 0;
+            ProspectList = [];
+            await LoadProspects();
         }
 
         #endregion
@@ -80,17 +94,83 @@ namespace FoodsharingSiegen.Server.Pages
         /// <summary>
         ///     Loads the prospects (a. beging, 11.04.2022)
         /// </summary>
+        private bool HasActiveFilter()
+        {
+            return !string.IsNullOrWhiteSpace(Filter.Text)
+                || Filter.WithoutStepInBriefing
+                || Filter.WithoutIdCheck
+                || Filter.DeletedOnly
+                || Filter.IdCheckPossible
+                || Filter.NoActivity
+                || Filter.RecentActivity;
+        }
+
         private async Task LoadProspects()
         {
-            var parameter = new GetProspectsParameter
+            if (IsLoadingProspects || IsLoadingMoreProspects) return;
+
+            try
             {
-                IncludeDeleted = true
+                if (CurrentSkip == 0)
-            };
+                {
+                    IsLoadingProspects = true;
+                }
+                else
+                {
+                    IsLoadingMoreProspects = true;
+                }
 
-            var prospectsR = await ProspectService.GetProspectsAsync(parameter);
+                await InvokeAsync(StateHasChanged);
-            if (prospectsR.Success) ProspectList = prospectsR.Data;
 
-            await InvokeAsync(StateHasChanged);
+                while (true)
+                {
+                    var parameter = new GetProspectsParameter
+                    {
+                        Skip = CurrentSkip,
+                        Take = CurrentPageSize,
+                        IncludeDeleted = true
+                    };
+
+                    var prospectsR = await ProspectService.GetProspectsAsync(parameter);
+                    if (!prospectsR.Success)
+                    {
+                        break;
+                    }
+
+                    var loadedProspects = prospectsR.Data ?? [];
+                    if (CurrentSkip == 0)
+                    {
+                        ProspectList = loadedProspects;
+                    }
+                    else
+                    {
+                        ProspectList = [.. ProspectList, .. loadedProspects];
+                    }
+
+                    CurrentSkip += loadedProspects.Count;
+                    HasMoreProspects = loadedProspects.Count == CurrentPageSize;
+
+                    var filteredCount = ProspectList.ApplyFilter(Filter).Count;
+                    if (!HasActiveFilter() || filteredCount > 0 || !HasMoreProspects || loadedProspects.Count == 0)
+                    {
+                        break;
+                    }
+                }
+
+                await InvokeAsync(StateHasChanged);
+            }
+            finally
+            {
+                IsLoadingProspects = false;
+                IsLoadingMoreProspects = false;
+                await InvokeAsync(StateHasChanged);
+            }
+        }
+
+        private async Task LoadMoreProspects()
+        {
+            if (IsLoadingProspects || IsLoadingMoreProspects || !HasMoreProspects) return;
+            await LoadProspects();
         }
 
         #endregion

FoodsharingSiegen.Server/Pages/ProspectsDone.razor

@@ -16,12 +16,25 @@
 <ProspectSortControl @bind-CurrentSort="CurrentSort" StorageKey="@StorageKeys.SortProspectsDone" OnSortChanged="StateHasChanged" Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.Completed" />
 
 @{
-    var filterList = ProspectList.ApplyFilter(Filter);
+    var filtered = ProspectList.ApplyFilter(Filter);
-    var sortList = filterList.ApplySort(CurrentSort);
+    var sortList = filtered.ApplySort(CurrentSort);
 }
 
-<ProspectGrid
+@if (IsLoadingProspects)
-    Prospects="sortList"
+{
-    OnDataChanged="@LoadProspects"
+    <div class="d-flex justify-content-center align-items-center py-5 text-muted">
-    StateFilter="ProspectStateFilter.Completed">
+        <span class="me-2"><i class="fa-solid fa-spinner fa-spin"></i></span>
-</ProspectGrid>
+        Lade Einarbeitungen...
+    </div>
+}
+else
+{
+    <ProspectGrid
+        Prospects="sortList"
+        OnDataChanged="@LoadProspects"
+        OnLoadMore="@LoadMoreProspects"
+        IsLoadingMore="IsLoadingMoreProspects"
+        HasMore="HasMoreProspects"
+        StateFilter="ProspectStateFilter.Completed">
+    </ProspectGrid>
+}

FoodsharingSiegen.Server/Pages/ProspectsDone.razor.cs

@@ -3,6 +3,7 @@ using FoodsharingSiegen.Contracts.Entity;
 using FoodsharingSiegen.Contracts.Enums;
 using FoodsharingSiegen.Contracts.Model;
 using FoodsharingSiegen.Server.Data.Service;
+using FoodsharingSiegen.Shared.Helper;
 using Microsoft.AspNetCore.Components;
 
 namespace FoodsharingSiegen.Server.Pages
@@ -29,7 +30,17 @@ namespace FoodsharingSiegen.Server.Pages
         /// <summary>
         ///     Gets or sets the value of the prospect list (ab)
         /// </summary>
-        private List<Prospect>? ProspectList { get; set; }
+        private List<Prospect> ProspectList { get; set; } = [];
+
+        private bool IsLoadingProspects { get; set; }
+
+        private bool IsLoadingMoreProspects { get; set; }
+
+        private bool HasMoreProspects { get; set; }
+
+        private int CurrentPageSize { get; set; } = 50;
+
+        private int CurrentSkip { get; set; }
 
         private ProspectSortOption CurrentSort { get; set; } = ProspectSortOption.NameAscending;
 
@@ -60,6 +71,9 @@ namespace FoodsharingSiegen.Server.Pages
         {
             Filter = arg;
             await LocalStorageService.SetItem(StorageKeys.ProspectFilter, Filter);
+            CurrentSkip = 0;
+            ProspectList = [];
+            await LoadProspects();
         }
 
         #endregion
@@ -69,13 +83,82 @@ namespace FoodsharingSiegen.Server.Pages
         /// <summary>
         ///     Loads the prospects (a. beging, 11.04.2022)
         /// </summary>
+        private bool HasActiveFilter()
+        {
+            return !string.IsNullOrWhiteSpace(Filter.Text)
+                || Filter.WithoutStepInBriefing
+                || Filter.WithoutIdCheck
+                || Filter.DeletedOnly
+                || Filter.IdCheckPossible
+                || Filter.NoActivity
+                || Filter.RecentActivity;
+        }
+
         private async Task LoadProspects()
         {
-            var parameter = new GetProspectsParameter { MustHaveInteractions = [InteractionType.Complete] };
+            if (IsLoadingProspects || IsLoadingMoreProspects) return;
-            var prospectsR = await ProspectService.GetProspectsAsync(parameter);
-            if (prospectsR.Success) ProspectList = prospectsR.Data;
 
-            await InvokeAsync(StateHasChanged);
+            try
+            {
+                if (CurrentSkip == 0)
+                {
+                    IsLoadingProspects = true;
+                }
+                else
+                {
+                    IsLoadingMoreProspects = true;
+                }
+
+                await InvokeAsync(StateHasChanged);
+
+                while (true)
+                {
+                    var parameter = new GetProspectsParameter
+                    {
+                        Skip = CurrentSkip,
+                        Take = CurrentPageSize,
+                        MustHaveInteractions = [InteractionType.Complete]
+                    };
+                    var prospectsR = await ProspectService.GetProspectsAsync(parameter);
+                    if (!prospectsR.Success)
+                    {
+                        break;
+                    }
+
+                    var loadedProspects = prospectsR.Data ?? [];
+                    if (CurrentSkip == 0)
+                    {
+                        ProspectList = loadedProspects;
+                    }
+                    else
+                    {
+                        ProspectList = [.. ProspectList, .. loadedProspects];
+                    }
+
+                    CurrentSkip += loadedProspects.Count;
+                    HasMoreProspects = loadedProspects.Count == CurrentPageSize;
+
+                    var filteredCount = ProspectList.ApplyFilter(Filter).Count;
+                    if (!HasActiveFilter() || filteredCount > 0 || !HasMoreProspects || loadedProspects.Count == 0)
+                    {
+                        break;
+                    }
+                }
+
+                await InvokeAsync(StateHasChanged);
+            }
+            finally
+            {
+                IsLoadingProspects = false;
+                IsLoadingMoreProspects = false;
+                await InvokeAsync(StateHasChanged);
+            }
+        }
+
+        private async Task LoadMoreProspects()
+        {
+            if (IsLoadingProspects || IsLoadingMoreProspects || !HasMoreProspects) return;
+            await LoadProspects();
         }
 
         #endregion

FoodsharingSiegen.Server/Pages/ProspectsVerify.razor

@@ -16,13 +16,25 @@
 <ProspectSortControl @bind-CurrentSort="CurrentSort" StorageKey="@StorageKeys.SortProspectsVerify" OnSortChanged="StateHasChanged" Filter="Filter" FilterChanged="FilterChangedAsync" StateFilter="ProspectStateFilter.Verification" />
 
 @{
-    var filterList = ProspectList.ApplyFilter(Filter);
+    var filtered = ProspectList.ApplyFilter(Filter);
-    var sortList = filterList.ApplySort(CurrentSort);
+    var sortList = filtered.ApplySort(CurrentSort);
 }
 
-
+@if (IsLoadingProspects)
-<ProspectGrid
+{
-    Prospects="sortList"
+    <div class="d-flex justify-content-center align-items-center py-5 text-muted">
-    OnDataChanged="@LoadProspects"
+        <span class="me-2"><i class="fa-solid fa-spinner fa-spin"></i></span>
-    StateFilter="ProspectStateFilter.Verification">
+        Lade Einarbeitungen...
-</ProspectGrid>
+    </div>
+}
+else
+{
+    <ProspectGrid
+        Prospects="sortList"
+        OnDataChanged="@LoadProspects"
+        OnLoadMore="@LoadMoreProspects"
+        IsLoadingMore="IsLoadingMoreProspects"
+        HasMore="HasMoreProspects"
+        StateFilter="ProspectStateFilter.Verification">
+    </ProspectGrid>
+}

FoodsharingSiegen.Server/Pages/ProspectsVerify.razor.cs

@@ -3,6 +3,7 @@ using FoodsharingSiegen.Contracts.Entity;
 using FoodsharingSiegen.Contracts.Enums;
 using FoodsharingSiegen.Contracts.Model;
 using FoodsharingSiegen.Server.Data.Service;
+using FoodsharingSiegen.Shared.Helper;
 using Microsoft.AspNetCore.Components;
 
 namespace FoodsharingSiegen.Server.Pages
@@ -35,7 +36,17 @@ namespace FoodsharingSiegen.Server.Pages
         /// <summary>
         ///     Gets or sets the value of the prospect list (ab)
         /// </summary>
-        private List<Prospect>? ProspectList { get; set; }
+        private List<Prospect> ProspectList { get; set; } = [];
+
+        private bool IsLoadingProspects { get; set; }
+
+        private bool IsLoadingMoreProspects { get; set; }
+
+        private bool HasMoreProspects { get; set; }
+
+        private int CurrentPageSize { get; set; } = 50;
+
+        private int CurrentSkip { get; set; }
 
         private ProspectSortOption CurrentSort { get; set; } = ProspectSortOption.NameAscending;
 
@@ -67,6 +78,9 @@ namespace FoodsharingSiegen.Server.Pages
         {
             Filter = arg;
             await LocalStorageService.SetItem(StorageKeys.ProspectFilter, Filter);
+            CurrentSkip = 0;
+            ProspectList = [];
+            await LoadProspects();
         }
 
         #endregion
@@ -76,17 +90,83 @@ namespace FoodsharingSiegen.Server.Pages
         /// <summary>
         ///     Loads the prospects (a. beging, 11.04.2022)
         /// </summary>
+        private bool HasActiveFilter()
+        {
+            return !string.IsNullOrWhiteSpace(Filter.Text)
+                || Filter.WithoutStepInBriefing
+                || Filter.WithoutIdCheck
+                || Filter.DeletedOnly
+                || Filter.IdCheckPossible
+                || Filter.NoActivity
+                || Filter.RecentActivity;
+        }
+
         private async Task LoadProspects()
         {
-            var parameter = new GetProspectsParameter
+            if (IsLoadingProspects || IsLoadingMoreProspects) return;
-            {
-                CannotHaveInteractions = [InteractionType.Complete],
-                MustHaveInteractions = [InteractionType.ReleasedForVerification]
-            };
-            var prospectsR = await ProspectService.GetProspectsAsync(parameter);
-            if (prospectsR.Success) ProspectList = prospectsR.Data;
 
-            await InvokeAsync(StateHasChanged);
+            try
+            {
+                if (CurrentSkip == 0)
+                {
+                    IsLoadingProspects = true;
+                }
+                else
+                {
+                    IsLoadingMoreProspects = true;
+                }
+
+                await InvokeAsync(StateHasChanged);
+
+                while (true)
+                {
+                    var parameter = new GetProspectsParameter
+                    {
+                        Skip = CurrentSkip,
+                        Take = CurrentPageSize,
+                        CannotHaveInteractions = [InteractionType.Complete],
+                        MustHaveInteractions = [InteractionType.ReleasedForVerification]
+                    };
+                    var prospectsR = await ProspectService.GetProspectsAsync(parameter);
+                    if (!prospectsR.Success)
+                    {
+                        break;
+                    }
+
+                    var loadedProspects = prospectsR.Data ?? [];
+                    if (CurrentSkip == 0)
+                    {
+                        ProspectList = loadedProspects;
+                    }
+                    else
+                    {
+                        ProspectList = [.. ProspectList, .. loadedProspects];
+                    }
+
+                    CurrentSkip += loadedProspects.Count;
+                    HasMoreProspects = loadedProspects.Count == CurrentPageSize;
+
+                    var filteredCount = ProspectList.ApplyFilter(Filter).Count;
+                    if (!HasActiveFilter() || filteredCount > 0 || !HasMoreProspects || loadedProspects.Count == 0)
+                    {
+                        break;
+                    }
+                }
+
+                await InvokeAsync(StateHasChanged);
+            }
+            finally
+            {
+                IsLoadingProspects = false;
+                IsLoadingMoreProspects = false;
+                await InvokeAsync(StateHasChanged);
+            }
+        }
+
+        private async Task LoadMoreProspects()
+        {
+            if (IsLoadingProspects || IsLoadingMoreProspects || !HasMoreProspects) return;
+            await LoadProspects();
         }
 
         #endregion

FoodsharingSiegen.Server/Program.cs

@@ -14,7 +14,8 @@ using Microsoft.EntityFrameworkCore;
 var builder = WebApplication.CreateBuilder(args);
 builder.LoadAppSettings();
 
-builder.WebHost.UseUrls("http://+:8700");
+// Keep the app default binding in config for Docker/container deployment.
+// Local debugging can override it via ASPNETCORE_URLS in launchSettings.
 
 // Add services to the container.
 builder.Services.AddRazorPages();

FoodsharingSiegen.Server/Properties/launchSettings.json

@@ -12,10 +12,11 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "launchUrl": "http://localhost:56000/",
+      "launchUrl": "http://localhost:5010/",
-      "applicationUrl": "http://localhost:56000",
+      "applicationUrl": "http://localhost:5010",
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "ASPNETCORE_URLS": "http://localhost:5010"
       }
     },
     "IIS Express": {

FoodsharingSiegen.Server/Shared/NavMenu.razor.css.map

@@ -0,0 +1 @@
+{"version":3,"sourceRoot":"","sources":["NavMenu.razor.scss"],"names":[],"mappings":"AAEA;EACI;;AAEA;EAHJ;IAIQ;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EATJ;IAUQ;IACA;;;;AAKZ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGA;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;;AAGR;EACI;EACA;;;AAGJ;EACI;EACA","file":"NavMenu.razor.css"}

FoodsharingSiegen.Server/wwwroot/js/prospect-grid.js

@@ -0,0 +1,23 @@
+export function attachScrollLoader(gridId, component) {
+    const grid = document.getElementById(gridId);
+    if (!grid) return;
+
+    const checkScroll = () => {
+        const distanceFromBottom = grid.scrollHeight - (grid.scrollTop + grid.clientHeight);
+        if (distanceFromBottom < 250) {
+            component.invokeMethodAsync('OnScrollNearBottom');
+        }
+    };
+
+    grid.addEventListener('scroll', checkScroll, { passive: true });
+    grid.__prospectScrollCheck = checkScroll;
+    checkScroll();
+}
+
+export function disposeScrollLoader(gridId) {
+    const grid = document.getElementById(gridId);
+    if (!grid || !grid.__prospectScrollCheck) return;
+
+    grid.removeEventListener('scroll', grid.__prospectScrollCheck);
+    delete grid.__prospectScrollCheck;
+}

FoodsharingSiegen.Tests/ProspectServiceTests.cs

@@ -0,0 +1,74 @@
+using FoodsharingSiegen.Contracts.Entity;
+using FoodsharingSiegen.Contracts.Enums;
+using FoodsharingSiegen.Contracts.Model;
+using FoodsharingSiegen.Server.Auth;
+using FoodsharingSiegen.Server.Data;
+using FoodsharingSiegen.Server.Data.Service;
+using FoodsharingSiegen.Server.Service;
+using Microsoft.AspNetCore.Components.Authorization;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Options;
+using Microsoft.JSInterop;
+using Moq;
+using Xunit;
+
+namespace FoodsharingSiegen.Tests;
+
+public class ProspectServiceTests
+{
+    private static FsContext CreateInMemoryContext(string dbName)
+    {
+        var options = new DbContextOptionsBuilder<FsContext>()
+            .UseInMemoryDatabase(databaseName: dbName)
+            .Options;
+
+        return new FsContext(options);
+    }
+
+    private static AuthService CreateAuthService(FsContext context)
+    {
+        var mockJsRuntime = new Mock<IJSRuntime>();
+        var localStorageService = new LocalStorageService(mockJsRuntime.Object);
+        var authStateProvider = new Mock<AuthenticationStateProvider>();
+        var mailService = new Mock<IMailService>();
+        var appSettings = new Mock<IOptions<AppSettings>>();
+        appSettings.Setup(x => x.Value).Returns(new AppSettings());
+
+        return new AuthService(context, localStorageService, authStateProvider.Object, mailService.Object, appSettings.Object);
+    }
+
+    [Fact]
+    public async Task GetProspectsAsync_RespectsSkipAndTake()
+    {
+        var dbName = Guid.NewGuid().ToString();
+        using var context = CreateInMemoryContext(dbName);
+        var authService = CreateAuthService(context);
+        var auditService = new AuditService(context, authService);
+        var prospectService = new ProspectService(context, authService, auditService);
+
+        for (var i = 0; i < 5; i++)
+        {
+            context.Prospects!.Add(new Prospect
+            {
+                Id = Guid.NewGuid(),
+                Name = $"Prospect {i}",
+                Modified = DateTime.UtcNow.AddDays(-i),
+                Interactions = new List<Interaction>()
+            });
+        }
+
+        await context.SaveChangesAsync();
+
+        var result = await prospectService.GetProspectsAsync(new GetProspectsParameter
+        {
+            Skip = 1,
+            Take = 2,
+            IncludeDeleted = true
+        });
+
+        Assert.True(result.Success);
+        Assert.Equal(2, result.Data.Count);
+        Assert.Equal("Prospect 1", result.Data[0].Name);
+        Assert.Equal("Prospect 2", result.Data[1].Name);
+    }
+}