From cc485a83e40b525b8004eaf16f13c4e0fe42c87f Mon Sep 17 00:00:00 2001
From: PhilBradbury <phil.bradbury@manchester.ac.uk>
Date: Wed, 10 Jun 2026 11:42:03 +0100
Subject: [PATCH 01/16] Added new property to hold the current calculated grde
 so we can filter on it as a simple integer where required.

---
 PPMTool.Data/Entities/Person.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/PPMTool.Data/Entities/Person.cs b/PPMTool.Data/Entities/Person.cs
index 7823693e..418af7a7 100644
--- a/PPMTool.Data/Entities/Person.cs
+++ b/PPMTool.Data/Entities/Person.cs
@@ -308,5 +308,13 @@ public double GetWorkloadModelTotalOnDate(DateTime date)
                 .OrderBy(x => x.ChangeDate)
                 .LastOrDefault();
         }
+
+        /// <summary>
+        /// Stores the calculated grade based on the person's current WLM and the date.
+        /// Used for filtering by Grade on the Manage People page currently.
+        /// </summary>
+        /// <returns></returns>
+        [NotMapped]
+        public int CurrentGrade { get; set; }
     }
 }

From d92f4ee14abc59409b00cb5f2288c191f970d1f5 Mon Sep 17 00:00:00 2001
From: PhilBradbury <phil.bradbury@manchester.ac.uk>
Date: Wed, 10 Jun 2026 11:43:02 +0100
Subject: [PATCH 02/16] Altered the filtering for Line Manager to use the
 Person.LineManager.Name property rather than custom filtering based on
 pattern matching and Linq.

---
 PPMTool/Pages/People.razor | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/PPMTool/Pages/People.razor b/PPMTool/Pages/People.razor
index 52e01d8e..a048dbf0 100644
--- a/PPMTool/Pages/People.razor
+++ b/PPMTool/Pages/People.razor
@@ -64,7 +64,7 @@ SPDX-License-Identifier: apache-2.0
                         </Template>
                     </RadzenDataGridColumn>
                     <RadzenDataGridColumn TItem="Person" Property="ShortName" Title="Initials" Width="80px" FilterOperator="FilterOperator.Contains" MinWidth="10px" />
-                    <RadzenDataGridColumn TItem="Person" Property="LineManager" Title="Line Manager" MinWidth="10px">
+                    <RadzenDataGridColumn TItem="Person" Property="LineManager.Name" Title="Line Manager" FilterProperty="LineManager.Name" SortProperty="LineManager.Name" MinWidth="10px">
                         <Template Context="p">
                             <span style="display: flex; align-items: center">
                                 @if (p.LineManager?.IsCurrentlyAbsent() ?? false)
@@ -75,16 +75,16 @@ SPDX-License-Identifier: apache-2.0
                             </span>
                         </Template>
                     </RadzenDataGridColumn>
-                    <RadzenDataGridColumn TItem="Person" Property="StartDate" Title="Started" Width="80px" FormatString="{0:d}" MinWidth="10px" />
-                    <RadzenDataGridColumn TItem="Person" Property="EndDate" Title="Left" Width="80px" FormatString="{0:d}" MinWidth="10px" />
-                    <RadzenDataGridColumn TItem="Person" Property="WorkloadModelChanges" Title="Current Project Work FTE" Width="50px" MinWidth="10px" Sortable="false">
+                    <RadzenDataGridColumn TItem="Person" Property="StartDate" Title="Started" Width="80px" FormatString="{0:d}" MinWidth="10px" Filterable="false" />
+                    <RadzenDataGridColumn TItem="Person" Property="EndDate" Title="Left" Width="80px" FormatString="{0:d}" MinWidth="10px" Filterable="false" />
+                    <RadzenDataGridColumn TItem="Person" Property="WorkloadModelChanges" Title="Current Project Work FTE" Width="50px" MinWidth="10px" Sortable="false" Filterable="false">
                         <Template Context="p">
                             @p.WorkloadModelChanges.Where(x => x.ChangeDate <= DateTime.Today).OrderBy(x => x.ChangeDate).LastOrDefault()?.ProjectWorkFTE
                         </Template>
                     </RadzenDataGridColumn>
-                    <RadzenDataGridColumn TItem="Person" Property="WorkloadModelChanges" Title="Current Grade" Width="50px" MinWidth="10px" Sortable="false">
+                    <RadzenDataGridColumn TItem="Person" Property="CurrentGrade" Title="Current Grade" Width="50px" MinWidth="10px" Sortable="false" TextAlign="TextAlign.Center">
                         <Template Context="p">
-                            @p.WorkloadModelChanges.Where(x => x.ChangeDate <= DateTime.Today).OrderBy(x => x.ChangeDate).LastOrDefault()?.Grade
+                            @p.CurrentGrade
                         </Template>
                     </RadzenDataGridColumn>
                     @if (skillsEnabled)
@@ -95,7 +95,7 @@ SPDX-License-Identifier: apache-2.0
                             </Template>
                         </RadzenDataGridColumn>
 
-                        <RadzenDataGridColumn TItem="Person" Property="SkillsCount" Title="Skill Count" Width="3rem" MinWidth="10px">
+                        <RadzenDataGridColumn TItem="Person" Property="SkillsCount" Title="Skill Count" Width="3rem" MinWidth="10px" Filterable="false">
                             <Template Context="p">
                                 @TagService.GetCountForPerson(Context, p.PersonId).ToString()
                             </Template>

From bc0f797d94a0e47db725ec0c462bf79329c6ffb2 Mon Sep 17 00:00:00 2001
From: PhilBradbury <phil.bradbury@manchester.ac.uk>
Date: Wed, 10 Jun 2026 11:44:27 +0100
Subject: [PATCH 03/16] Kept the Skilltag filtering as custom but removed
 similar for Line Manager filtering. Also adjusted filtering by CurrentGrade
 to use a calculated integer value.

---
 PPMTool/Pages/People.razor.cs | 113 +++++++++++++++-------------------
 1 file changed, 50 insertions(+), 63 deletions(-)

diff --git a/PPMTool/Pages/People.razor.cs b/PPMTool/Pages/People.razor.cs
index bd54972e..f5659f6b 100644
--- a/PPMTool/Pages/People.razor.cs
+++ b/PPMTool/Pages/People.razor.cs
@@ -112,87 +112,74 @@ private void LoadData(LoadDataArgs args)
                 query = query.Where(x => ActiveUser.Person != null && x.PersonId == ActiveUser.Person!.PersonId);
             }
 
-            // Now apply the custom filters (pattern matching syntax for non-null object)
+
+            // ---- CUSTOM FILTERS ONLY ----
             if (args.Filters is { } filters && filters.Any())
             {
-                // Filter on Skill Tags
-                var filter = args.Filters.FirstOrDefault(x => x.Property == "SkillTags");
-                var filterValue = filter?.FilterValue as string;
-                if (filter != null && filterValue != null)
-                {
-                    query = query.Where(x => x.OwnedSkills.Any(x => x.SkillTag.Name.Trim().ToLower().Contains(filterValue.Trim().ToLower())));
-                }
+                // SkillTags custom filter
+                var skillFilter = filters.FirstOrDefault(x => x.Property == "SkillTags");
+                var skillFilterValue = (skillFilter?.FilterValue as string)?.Trim();
 
-                // Add filter on Line Manager
-                filter = filters.FirstOrDefault(f => f.Property == "LineManager");
-                filterValue = (filter?.FilterValue as string)?.Trim();
-                if (!string.IsNullOrEmpty(filterValue))
+                if (!string.IsNullOrWhiteSpace(skillFilterValue))
                 {
-                    var filterValueLower = filterValue.ToLower();
+                    var filterValueLower = skillFilterValue.ToLower();
+
                     query = query.Where(x =>
-                        x.LineManager != null &&
-                        (x.LineManager.Name ?? "").Trim().ToLower().Contains(filterValueLower));
+                        x.OwnedSkills.Any(s =>
+                            (s.SkillTag.Name ?? "").Trim().ToLower().Contains(filterValueLower)));
                 }
+            }
 
-                // Add any filters than are none of the special ones
-                var stdFilters = args.Filters.Where(x => x.Property != "SkillTags" && x.Property != "LineManager");
-                if (stdFilters.Any())
-                {
-                    // Filter via the Where method
-                    query = query.Where(args.Filter);
-                }
+            // ---- BUILT-IN RADZEN FILTERING ----
+            if (!string.IsNullOrWhiteSpace(args.Filter))
+            {
+                query = query.Where(args.Filter);
             }
 
-            // Sorting needed
-            if (!string.IsNullOrEmpty(args.OrderBy))
+            // ---- SORTING ----
+            if (args.Sorts != null && args.Sorts.Count() > 0)
             {
-                // Check details of the sort
-                if (args.Sorts is { } sorts && sorts.Any())
+                var sort = args.Sorts.First();
+
+                // Special-case sort
+                if (sort.Property == "SkillsCount")
+                {
+                    query = sort.SortOrder == SortOrder.Ascending
+                        ? query.OrderBy(x => x.OwnedSkills.Count())
+                        : query.OrderByDescending(x => x.OwnedSkills.Count());
+                }
+                else
                 {
-                    var sort = args.Sorts?.First();
-                    if (sort.Property == "SkillsCount")
-                    {
-                        // Apply the ordering process on skills count manually
-                        if (sort.SortOrder == SortOrder.Ascending)
-                        {
-                            query = query.OrderBy(x => TagService.GetCountForPerson(Context, x.PersonId));
-                        }
-                        else
-                        {
-                            query = query.OrderByDescending(x => TagService.GetCountForPerson(Context, x.PersonId));
-                        }
-                    }
-                    else if (sort.Property == "LineManager")
-                    {
-                        query = sort.SortOrder == SortOrder.Ascending ?
-                            query.OrderBy(x => x.LineManager != null ? x.LineManager.Name : "") :
-                            query.OrderByDescending(x => x.LineManager != null ? x.LineManager.Name : "");
-                    }
-
-                    // No special handling required
-                    else
-                    {
-                        // Sort via the OrderBy method
-                        query = query.OrderBy(args.OrderBy);
-                    }
+                    query = query.OrderBy(args.OrderBy);
                 }
             }
-
-            // Important!!! Make sure the Count property of RadzenDataGrid is set.
-            var data = query.ToList();
-            count = data.Count();
-
-            // Perform paging via Skip and Take.
-            if (args.Skip == null)
+            else if (!string.IsNullOrWhiteSpace(args.OrderBy))
             {
-                people = data.Take(pageCount).ToList();
+                query = query.OrderBy(args.OrderBy);
             }
-            else
+
+            // ---- COUNT BEFORE PAGING ----
+            count = query.Count();
+
+
+            foreach (Person p in query)
             {
-                people = data.Skip(args.Skip.Value).Take(args.Top.Value).ToList();
+                p.CurrentGrade = p.WorkloadModelChanges
+                                .Where(x => x.ChangeDate <= DateTime.Today)
+                                .OrderBy(x => x.ChangeDate)
+                                .Select(x => x.Grade)
+                                .LastOrDefault();
             }
 
-            Debug.WriteLine($"** {data.Count()} people loaded. {people.Count()} displayed.");
+
+            // ---- PAGING ----
+            var skip = args.Skip ?? 0;
+            var take = args.Top ?? pageCount;
+
+            people = query.Skip(skip).Take(take).ToList();
+
+            Debug.WriteLine($"** {count} people loaded. {people.Count()} displayed.");
+
         }
     }
 }
\ No newline at end of file

From a097e1e9bb8d73b2b58e063356302b8dc8490842 Mon Sep 17 00:00:00 2001
From: PhilBradbury <phil.bradbury@manchester.ac.uk>
Date: Wed, 10 Jun 2026 13:14:01 +0100
Subject: [PATCH 04/16] Updated the CurrenGrade property to get the grade based
 on today's date rather than being set in the calling code.

---
 PPMTool.Data/Entities/Person.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PPMTool.Data/Entities/Person.cs b/PPMTool.Data/Entities/Person.cs
index 418af7a7..f30e427b 100644
--- a/PPMTool.Data/Entities/Person.cs
+++ b/PPMTool.Data/Entities/Person.cs
@@ -315,6 +315,6 @@ public double GetWorkloadModelTotalOnDate(DateTime date)
         /// </summary>
         /// <returns></returns>
         [NotMapped]
-        public int CurrentGrade { get; set; }
+        public int? CurrentGrade { get => GetGradeOnDate(DateTime.Today); }
     }
 }

From 622b517080ce704dac22a49d173cd5ec0208acd1 Mon Sep 17 00:00:00 2001
From: PhilBradbury <phil.bradbury@manchester.ac.uk>
Date: Wed, 10 Jun 2026 13:14:45 +0100
Subject: [PATCH 05/16] Removed population of the CurrentGrade property from
 the code as it's been moved into the entity.

---
 PPMTool/Pages/People.razor.cs | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/PPMTool/Pages/People.razor.cs b/PPMTool/Pages/People.razor.cs
index f5659f6b..744a4326 100644
--- a/PPMTool/Pages/People.razor.cs
+++ b/PPMTool/Pages/People.razor.cs
@@ -161,17 +161,6 @@ private void LoadData(LoadDataArgs args)
             // ---- COUNT BEFORE PAGING ----
             count = query.Count();
 
-
-            foreach (Person p in query)
-            {
-                p.CurrentGrade = p.WorkloadModelChanges
-                                .Where(x => x.ChangeDate <= DateTime.Today)
-                                .OrderBy(x => x.ChangeDate)
-                                .Select(x => x.Grade)
-                                .LastOrDefault();
-            }
-
-
             // ---- PAGING ----
             var skip = args.Skip ?? 0;
             var take = args.Top ?? pageCount;

From 15ff715200ffaf56469b3fd48f51ba9fc7b3b49f Mon Sep 17 00:00:00 2001
From: PhilBradbury <phil.bradbury@manchester.ac.uk>
Date: Wed, 10 Jun 2026 13:47:57 +0100
Subject: [PATCH 06/16] Adjusted default FilterMode to be simple. Adjusted
 Faculty and School filtering to use the Code for each as the filterable
 property. Removed filter from some columns where it didn't make much sense
 (costs, day rate, dates etc.)

---
 PPMTool/Pages/Projects.razor | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/PPMTool/Pages/Projects.razor b/PPMTool/Pages/Projects.razor
index 1ccabce3..03d33715 100644
--- a/PPMTool/Pages/Projects.razor
+++ b/PPMTool/Pages/Projects.razor
@@ -44,7 +44,7 @@ SPDX-License-Identifier: apache-2.0
             <RadzenDataGrid AllowFiltering="true"
                             AllowColumnResize="true"
                             AllowSorting="true"
-                            FilterMode="FilterMode.SimpleWithMenu"
+                            FilterMode="FilterMode.Simple"
                             PageSize="@pageCount"
                             Count="@count"
                             AllowPaging="true"
@@ -58,7 +58,7 @@ SPDX-License-Identifier: apache-2.0
                             @ref="dataGrid"
                             LoadData="@OnLoadData">
                 <Columns>
-                    <RadzenDataGridColumn TItem="Project" Property="RTP" Title="@($"{GetSetting(SettingType.ProjectAbbreviation)}")" Frozen="true" Width="7rem" MinWidth="10px" />
+                    <RadzenDataGridColumn TItem="Project" Property="RTP" Title="@($"{GetSetting(SettingType.ProjectAbbreviation)}")" Frozen="true" Width="7rem" MinWidth="10px" FilterMode="FilterMode.SimpleWithMenu" />
                     <RadzenDataGridColumn TItem="Project" Property="Name" Title="Name" Frozen="true" Width="15rem" MinWidth="10px" />
                     <RadzenDataGridColumn TItem="Project" Property="PI" Title="PI" Width="14rem" MinWidth="10px" />
                     <RadzenDataGridColumn TItem="Project" Property="ProjectManager.Name" Title="PM" Width="15rem" MinWidth="10px">
@@ -71,18 +71,18 @@ SPDX-License-Identifier: apache-2.0
                             @p.ProjectStatus.ToNiceString()
                         </Template>
                     </RadzenDataGridColumn>
-                    <RadzenDataGridColumn TItem="Project" Property="Faculty" Title="@($"{GetSetting(SettingType.OrgUnitUpper)}")" MinWidth="10px" FilterMode="FilterMode.Simple">
+                    <RadzenDataGridColumn TItem="Project" Property="School.Faculty.Code" Title="@($"{GetSetting(SettingType.OrgUnitUpper)}")" MinWidth="10px" FilterMode="FilterMode.Simple" FilterProperty="School.Faculty.Code" SortProperty="School.Faculty.Code">
                         <Template Context="p">
                             <span title="@p.School.Faculty.Name">@p.School.Faculty.Code</span>
                         </Template>
                     </RadzenDataGridColumn>
-                    <RadzenDataGridColumn TItem="Project" Property="School" Title="@($"{GetSetting(SettingType.OrgUnitLower)}")" MinWidth="10px" FilterMode="FilterMode.Simple">
+                    <RadzenDataGridColumn TItem="Project" Property="School.Code" Title="@($"{GetSetting(SettingType.OrgUnitLower)}")" MinWidth="10px" FilterMode="FilterMode.Simple" FilterProperty="School.Code" SortProperty="School.Code">
                         <Template Context="p">
                              <span title="@p.School.Name">@p.School.Code</span>
                         </Template>
                     </RadzenDataGridColumn>
                     <!-- Default datetimes added when creating a Project are Max and Min to be shaped when tasks are added -->
-                    <RadzenDataGridColumn TItem="Project" Property="StartDate" Title="Start Date" MinWidth="10px">
+                    <RadzenDataGridColumn TItem="Project" Property="StartDate" Title="Start Date" MinWidth="10px" Filterable="false">
                         <Template Context="p">
                             @if (p.StartDate == DateTime.MaxValue)
                             {
@@ -94,7 +94,7 @@ SPDX-License-Identifier: apache-2.0
                             }
                         </Template>
                     </RadzenDataGridColumn>
-                    <RadzenDataGridColumn TItem="Project" Property="EndDate" Title="End Date" MinWidth="10px">
+                    <RadzenDataGridColumn TItem="Project" Property="EndDate" Title="End Date" MinWidth="10px" Filterable="false">
                         <Template Context="p">
                             @if (p.EndDate == DateTime.MinValue)
                             {
@@ -113,20 +113,20 @@ SPDX-License-Identifier: apache-2.0
                                 @(p.CostModel.GetAttribute<DisplayAttribute>().Name)
                             </Template>
                         </RadzenDataGridColumn>
-                        <RadzenDataGridColumn TItem="Project" Property="DayRate" Title="Day Rate" Width="8rem" MinWidth="10px">
+                        <RadzenDataGridColumn TItem="Project" Property="DayRate" Title="Day Rate" Width="8rem" MinWidth="10px" Filterable="false">
                             <Template Context="p">
                                 @(p.CostModel == CostModel.DayRate ? p.DayRate.ToString("C0") : "N/A")
                             </Template>
                         </RadzenDataGridColumn>
-                        <RadzenDataGridColumn TItem="Project" Property="Budget" Title="Budget" FormatString="{0:C0}" MinWidth="10px" />
-                        <RadzenDataGridColumn TItem="Project" Property="ActualCost" Title="Actual Cost" FormatString="{0:C0}" MinWidth="10px" />
+                        <RadzenDataGridColumn TItem="Project" Property="Budget" Title="Budget" FormatString="{0:C0}" MinWidth="10px" Filterable="false" />
+                        <RadzenDataGridColumn TItem="Project" Property="ActualCost" Title="Actual Cost" FormatString="{0:C0}" MinWidth="10px" Filterable="false" />
                         <RadzenDataGridColumn TItem="Project" Property="FundsReceived" Title="Funds Received" Filterable="false" MinWidth="10px">
                             <Template Context="p">
                                 @(PaymentService.GetFundsReceived(Context, p.ProjectId).ToString("C0"))
                             </Template>
                         </RadzenDataGridColumn>
                     }
-                    <RadzenDataGridColumn TItem="Project" Property="ActualWorkHours" Title="Actual Work" FormatString="{0:F0}" MinWidth="10px" />
+                    <RadzenDataGridColumn TItem="Project" Property="ActualWorkHours" Title="Actual Work" FormatString="{0:F0}" MinWidth="10px" Filterable="false" />
                     <RadzenDataGridColumn TItem="Project" Title="Details" Frozen="true" Resizable="false" Filterable="false" Sortable="false" TextAlign="TextAlign.Center" Width="6rem" FrozenPosition="FrozenColumnPosition.Right">
                         <Template Context="p">
                             <RadzenButton Icon="info" ButtonStyle="ButtonStyle.Primary" Class="m-1" Click="@(args => NavigateToProjectDetails(p.ProjectId))" @onclick:stopPropagation="true" MouseEnter="@(args => ShowTooltip(args, "Details"))" />

From 7a40ee6e76bb86eb8516afc095550dc3a4ee3c08 Mon Sep 17 00:00:00 2001
From: PhilBradbury <phil.bradbury@manchester.ac.uk>
Date: Wed, 10 Jun 2026 13:48:09 +0100
Subject: [PATCH 07/16] Removed Custom filtering for Faculty/School.

---
 PPMTool/Pages/Projects.razor.cs | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/PPMTool/Pages/Projects.razor.cs b/PPMTool/Pages/Projects.razor.cs
index 3ca10683..e3e556f1 100644
--- a/PPMTool/Pages/Projects.razor.cs
+++ b/PPMTool/Pages/Projects.razor.cs
@@ -141,34 +141,8 @@ private void OnLoadData(LoadDataArgs args)
                 query = query.Where(args.Filter);
             }
 
-            // Filter on Faculty and School
-            if (args.Filters is { } filters && filters.Any())
-            {
-                var filter = filters.FirstOrDefault(f => f.Property == "Faculty");
-                var filterValue = (filter?.FilterValue as string)?.Trim();
-                if (!string.IsNullOrEmpty(filterValue))
-                {
-                    var filterValueLower = filterValue.ToLower();
-                    query = query.Where(x =>
-                        x.School != null &&
-                        x.School.Faculty != null &&
-                        ((x.School.Faculty.Code ?? "").Trim().ToLower()).Contains(filterValueLower));
-                }
-
-                filter = filters.FirstOrDefault(f => f.Property == "School");
-                filterValue = (filter?.FilterValue as string)?.Trim();
-                if (!string.IsNullOrEmpty(filterValue))
-                {
-                    var filterValueLower = filterValue.ToLower();
-                    query = query.Where(x =>
-                        x.School != null &&
-                        ((x.School.Code ?? "").Trim().ToLower()).Contains(filterValueLower));
-                }
-            }
-
             query = ApplySorting(query, args);
 
-
             // Assign to grid source
             var data = query.ToList();
             count = data.Count;

From d62620298d4a9a44197fce4c20ce97a904bdc72b Mon Sep 17 00:00:00 2001
From: PhilBradbury <phil.bradbury@manchester.ac.uk>
Date: Thu, 11 Jun 2026 16:31:57 +0100
Subject: [PATCH 08/16] Added filtering back to most columns. Had to adjust the
 Project class to have a property to hold FundsReceived data to be able to
 filter on that.

---
 PPMTool.Data/Entities/Project.cs |  8 ++++
 PPMTool/Pages/Projects.razor     | 64 ++++++++++++++++++++++++++------
 PPMTool/Pages/Projects.razor.cs  |  7 ++++
 3 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/PPMTool.Data/Entities/Project.cs b/PPMTool.Data/Entities/Project.cs
index c1fbe84d..74ebb35b 100644
--- a/PPMTool.Data/Entities/Project.cs
+++ b/PPMTool.Data/Entities/Project.cs
@@ -440,5 +440,13 @@ public string GetSensibleObjectName()
         {
             return $"Project {RTP} | {Name}";
         }
+
+        /// <summary>
+        /// Property to allow filtering on FundingReceived in datagrids.
+        /// Can't populate in here without adding the PaymentService though.
+        /// </summary>
+        /// <returns></returns>
+        [NotMapped]
+        public double FundsReceived { get; set; }
     }
 }
diff --git a/PPMTool/Pages/Projects.razor b/PPMTool/Pages/Projects.razor
index 03d33715..3be2e25e 100644
--- a/PPMTool/Pages/Projects.razor
+++ b/PPMTool/Pages/Projects.razor
@@ -82,7 +82,14 @@ SPDX-License-Identifier: apache-2.0
                         </Template>
                     </RadzenDataGridColumn>
                     <!-- Default datetimes added when creating a Project are Max and Min to be shaped when tasks are added -->
-                    <RadzenDataGridColumn TItem="Project" Property="StartDate" Title="Start Date" MinWidth="10px" Filterable="false">
+                    <RadzenDataGridColumn TItem="Project"
+                                          Property="StartDate"
+                                          Title="Start Date"
+                                          FormatString="{0:dd/MM/yyyy}"
+                                          Type="typeof(DateTime)"
+                                          FilterMode="FilterMode.SimpleWithMenu"
+                                          FilterOperator="FilterOperator.GreaterThanOrEquals"
+                                          Width="13rem">
                         <Template Context="p">
                             @if (p.StartDate == DateTime.MaxValue)
                             {
@@ -90,19 +97,26 @@ SPDX-License-Identifier: apache-2.0
                             }
                             else
                             {
-                                p.StartDate.ToString("d");
+                                @p.StartDate.ToShortDateString()
                             }
                         </Template>
                     </RadzenDataGridColumn>
-                    <RadzenDataGridColumn TItem="Project" Property="EndDate" Title="End Date" MinWidth="10px" Filterable="false">
+                    <RadzenDataGridColumn TItem="Project"
+                                          Property="EndDate"
+                                          Title="End Date"
+                                          FormatString="{0:dd/MM/yyyy}"
+                                          Type="typeof(DateTime)"
+                                          FilterMode="FilterMode.SimpleWithMenu"
+                                          FilterOperator="FilterOperator.LessThanOrEquals"
+                                          Width="13rem">
                         <Template Context="p">
-                            @if (p.EndDate == DateTime.MinValue)
+                            @if (p.StartDate == DateTime.MaxValue)
                             {
                                 <StatusMessageComponent Message="@(new StatusMessage("No tasks!", StatusMessage.MessageType.Error))" />
                             }
                             else
                             {
-                                p.EndDate.ToString("d");
+                                @p.StartDate.ToShortDateString()
                             }
                         </Template>
                     </RadzenDataGridColumn>
@@ -113,20 +127,48 @@ SPDX-License-Identifier: apache-2.0
                                 @(p.CostModel.GetAttribute<DisplayAttribute>().Name)
                             </Template>
                         </RadzenDataGridColumn>
-                        <RadzenDataGridColumn TItem="Project" Property="DayRate" Title="Day Rate" Width="8rem" MinWidth="10px" Filterable="false">
+                        <RadzenDataGridColumn TItem="Project" Property="DayRate" Title="Day Rate" Width="8rem" Filterable="false">
                             <Template Context="p">
                                 @(p.CostModel == CostModel.DayRate ? p.DayRate.ToString("C0") : "N/A")
                             </Template>
                         </RadzenDataGridColumn>
-                        <RadzenDataGridColumn TItem="Project" Property="Budget" Title="Budget" FormatString="{0:C0}" MinWidth="10px" Filterable="false" />
-                        <RadzenDataGridColumn TItem="Project" Property="ActualCost" Title="Actual Cost" FormatString="{0:C0}" MinWidth="10px" Filterable="false" />
-                        <RadzenDataGridColumn TItem="Project" Property="FundsReceived" Title="Funds Received" Filterable="false" MinWidth="10px">
+                        <RadzenDataGridColumn TItem="Project" 
+                                              Property="Budget" 
+                                              Title="Budget" 
+                                              FormatString="{0:C0}" 
+                                              Width="10rem" 
+                                              Type="typeof(double)" 
+                                              FilterMode="FilterMode.SimpleWithMenu" 
+                                              FilterOperator="FilterOperator.GreaterThanOrEquals" />
+                        <RadzenDataGridColumn TItem="Project" 
+                                              Property="ActualCost" 
+                                              Title="Actual Cost" 
+                                              FormatString="{0:C0}" 
+                                              Width="10rem"
+                                              Type="typeof(double)"
+                                              FilterMode="FilterMode.SimpleWithMenu"
+                                              FilterOperator="FilterOperator.GreaterThanOrEquals" />
+                        <RadzenDataGridColumn TItem="Project" 
+                                              Property="FundsReceived" 
+                                              Title="Funds Received" 
+                                              Width="10rem"
+                                              Type="typeof(double)"
+                                              FilterMode="FilterMode.SimpleWithMenu"
+                                              FilterOperator="FilterOperator.GreaterThanOrEquals">
                             <Template Context="p">
-                                @(PaymentService.GetFundsReceived(Context, p.ProjectId).ToString("C0"))
+                                @p.FundsReceived.ToString("C0")
                             </Template>
                         </RadzenDataGridColumn>
                     }
-                    <RadzenDataGridColumn TItem="Project" Property="ActualWorkHours" Title="Actual Work" FormatString="{0:F0}" MinWidth="10px" Filterable="false" />
+                    <RadzenDataGridColumn TItem="Project" 
+                                          Property="ActualWorkHours" 
+                                          Title="Actual Work" 
+                                          FormatString="{0:F0}" 
+                                          MinWidth="10px" 
+                                          Width="10rem"
+                                          Type="typeof(double)"
+                                          FilterMode="FilterMode.SimpleWithMenu"
+                                          FilterOperator="FilterOperator.GreaterThanOrEquals" />
                     <RadzenDataGridColumn TItem="Project" Title="Details" Frozen="true" Resizable="false" Filterable="false" Sortable="false" TextAlign="TextAlign.Center" Width="6rem" FrozenPosition="FrozenColumnPosition.Right">
                         <Template Context="p">
                             <RadzenButton Icon="info" ButtonStyle="ButtonStyle.Primary" Class="m-1" Click="@(args => NavigateToProjectDetails(p.ProjectId))" @onclick:stopPropagation="true" MouseEnter="@(args => ShowTooltip(args, "Details"))" />
diff --git a/PPMTool/Pages/Projects.razor.cs b/PPMTool/Pages/Projects.razor.cs
index e3e556f1..e7f5c33a 100644
--- a/PPMTool/Pages/Projects.razor.cs
+++ b/PPMTool/Pages/Projects.razor.cs
@@ -126,6 +126,13 @@ private void OnLoadData(LoadDataArgs args)
 
             // Initialise the project list -- developers can only see projects to which they are assigned
             IQueryable<Project> query = ProjectService.GetAll(Context).OrderBy(x => x.RTP).AsQueryable();
+
+            // Add details of FundsReceived so we can use it for filtering in the grid as a property
+            foreach(Project p in query)
+            {
+                p.FundsReceived = PaymentService.GetFundsReceived(Context, p.ProjectId);
+            }
+
             if (ActiveUserRoleType == RoleType.Developer)
             {
                 query = query.Where(x => ActiveUser.Person != null && x.SubTasks.Any(x => x.AssignedResources.Any(x => x.Person.PersonId == ActiveUser.Person!.PersonId)));

From b041340be700cefeef04ec257b10cc17a31e4e71 Mon Sep 17 00:00:00 2001
From: PhilBradbury <phil.bradbury@manchester.ac.uk>
Date: Thu, 11 Jun 2026 16:34:55 +0100
Subject: [PATCH 09/16] Formatting fix

---
 PPMTool/Pages/Projects.razor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PPMTool/Pages/Projects.razor.cs b/PPMTool/Pages/Projects.razor.cs
index e7f5c33a..34835f49 100644
--- a/PPMTool/Pages/Projects.razor.cs
+++ b/PPMTool/Pages/Projects.razor.cs
@@ -128,7 +128,7 @@ private void OnLoadData(LoadDataArgs args)
             IQueryable<Project> query = ProjectService.GetAll(Context).OrderBy(x => x.RTP).AsQueryable();
 
             // Add details of FundsReceived so we can use it for filtering in the grid as a property
-            foreach(Project p in query)
+            foreach (Project p in query)
             {
                 p.FundsReceived = PaymentService.GetFundsReceived(Context, p.ProjectId);
             }

From d8914732d63da26cb1e828fbdbdeac8fc0ad1c6c Mon Sep 17 00:00:00 2001
From: Adrian Harwood <adrian.harwood@manchester.ac.uk>
Date: Wed, 17 Jun 2026 09:22:14 +0100
Subject: [PATCH 10/16] Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 PPMTool.Data/Entities/Project.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PPMTool.Data/Entities/Project.cs b/PPMTool.Data/Entities/Project.cs
index 74ebb35b..f366e098 100644
--- a/PPMTool.Data/Entities/Project.cs
+++ b/PPMTool.Data/Entities/Project.cs
@@ -442,7 +442,7 @@ public string GetSensibleObjectName()
         }
 
         /// <summary>
-        /// Property to allow filtering on FundingReceived in datagrids.
+        /// Property to allow filtering on FundsReceived in datagrids.
         /// Can't populate in here without adding the PaymentService though.
         /// </summary>
         /// <returns></returns>

From bf5799db77612a8b53b0e391ec81c21d6ade85d4 Mon Sep 17 00:00:00 2001
From: PhilBradbury <phil.bradbury@manchester.ac.uk>
Date: Wed, 17 Jun 2026 10:46:13 +0100
Subject: [PATCH 11/16] Updated EndDate column to be checking against correct
 property.

---
 PPMTool/Pages/Projects.razor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PPMTool/Pages/Projects.razor b/PPMTool/Pages/Projects.razor
index 3be2e25e..385c2414 100644
--- a/PPMTool/Pages/Projects.razor
+++ b/PPMTool/Pages/Projects.razor
@@ -110,13 +110,13 @@ SPDX-License-Identifier: apache-2.0
                                           FilterOperator="FilterOperator.LessThanOrEquals"
                                           Width="13rem">
                         <Template Context="p">
-                            @if (p.StartDate == DateTime.MaxValue)
+                            @if (p.EndDate == DateTime.MinValue)
                             {
                                 <StatusMessageComponent Message="@(new StatusMessage("No tasks!", StatusMessage.MessageType.Error))" />
                             }
                             else
                             {
-                                @p.StartDate.ToShortDateString()
+                                @p.EndDate.ToShortDateString()
                             }
                         </Template>
                     </RadzenDataGridColumn>

From 7339951a92e82605b896a74f181f562b35dcc764 Mon Sep 17 00:00:00 2001
From: AdrianHarwood <adrian.harwood@manchester.ac.uk>
Date: Wed, 1 Jul 2026 07:32:39 +0100
Subject: [PATCH 12/16] Improved documentation of existing shadow properties

---
 PPMTool.Data/Entities/Person.cs         |  2 +-
 PPMTool.Data/Entities/Project.cs        | 16 ++++++++--------
 PPMTool.Data/Entities/Setting.cs        |  3 ++-
 PPMTool.Data/Entities/TimesheetEntry.cs |  5 +++--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/PPMTool.Data/Entities/Person.cs b/PPMTool.Data/Entities/Person.cs
index f30e427b..b4e0c8c6 100644
--- a/PPMTool.Data/Entities/Person.cs
+++ b/PPMTool.Data/Entities/Person.cs
@@ -310,7 +310,7 @@ public double GetWorkloadModelTotalOnDate(DateTime date)
         }
 
         /// <summary>
-        /// Stores the calculated grade based on the person's current WLM and the date.
+        /// Shadow property to store the current grade of the person based on the person's current WLM and the date.
         /// Used for filtering by Grade on the Manage People page currently.
         /// </summary>
         /// <returns></returns>
diff --git a/PPMTool.Data/Entities/Project.cs b/PPMTool.Data/Entities/Project.cs
index f366e098..ab1a1e77 100644
--- a/PPMTool.Data/Entities/Project.cs
+++ b/PPMTool.Data/Entities/Project.cs
@@ -136,6 +136,14 @@ public class Project : BaseTask, ILoggableObject
         /// </summary>
         public virtual ICollection<FundingSource> FundingSources { get; set; } = new List<FundingSource>();
 
+        /// <summary>
+        /// Shadow property to allow easy filtering on FundsReceived in datagrids.
+        /// Requires additional logic in the service layer to populate this property when retrieving projects from the database.
+        /// </summary>
+        /// <returns></returns>
+        [NotMapped]
+        public double FundsReceived { get; set; }
+
         /// <summary>
         /// Constructor also adds default status messages
         /// </summary>
@@ -440,13 +448,5 @@ public string GetSensibleObjectName()
         {
             return $"Project {RTP} | {Name}";
         }
-
-        /// <summary>
-        /// Property to allow filtering on FundsReceived in datagrids.
-        /// Can't populate in here without adding the PaymentService though.
-        /// </summary>
-        /// <returns></returns>
-        [NotMapped]
-        public double FundsReceived { get; set; }
     }
 }
diff --git a/PPMTool.Data/Entities/Setting.cs b/PPMTool.Data/Entities/Setting.cs
index fe2a46d4..d1ac2fbf 100644
--- a/PPMTool.Data/Entities/Setting.cs
+++ b/PPMTool.Data/Entities/Setting.cs
@@ -23,7 +23,8 @@ public class Setting : ILoggableObject
         public SettingType SettingType { get; set; }
 
         /// <summary>
-        /// Shadow property to get the name of the setting type as a string for use in the UI. This is not mapped to the database as it is derived from the SettingType enum.
+        /// Shadow property to get the name of the setting type as a string for use in the UI.
+        /// This is not mapped to the database as it is derived from the SettingType enum.
         /// </summary>
         [NotMapped]
         public string SettingTypeAsText => SettingType.ToString();
diff --git a/PPMTool.Data/Entities/TimesheetEntry.cs b/PPMTool.Data/Entities/TimesheetEntry.cs
index 53903ad5..8d96c983 100644
--- a/PPMTool.Data/Entities/TimesheetEntry.cs
+++ b/PPMTool.Data/Entities/TimesheetEntry.cs
@@ -73,7 +73,7 @@ public class TimesheetEntry : ILoggableObject
         public double SundayHours { get; set; }
 
         /// <summary>
-        /// Total hours for the week for this entry
+        /// Total hours for the week for this entry. This must be explicitly updated with the <see cref="UpdateTotalHours"/> method.
         /// </summary>
         [NotMapped]
         public double TotalHours { get; private set; }
@@ -85,7 +85,8 @@ public class TimesheetEntry : ILoggableObject
         public bool IsInTemplate { get; set; }
 
         /// <summary>
-        /// Method to sum up the hours in the entry
+        /// Method to sum up the hours in the entry and update the TotalHours property.
+        /// This should be called whenever the hours for any day are modified.
         /// </summary>
         /// <returns></returns>
         public void UpdateTotalHours()

From 0cd497d6f09bb82de3ae94fbb2a03d8b8b7ce971 Mon Sep 17 00:00:00 2001
From: AdrianHarwood <adrian.harwood@manchester.ac.uk>
Date: Wed, 1 Jul 2026 07:33:36 +0100
Subject: [PATCH 13/16] Refactor of timesheet template shadow property so that
 it is privately set

---
 PPMTool.Data/Entities/TimesheetEntry.cs | 13 +++++++++++--
 PPMTool/Pages/AddTimesheet.razor.cs     |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/PPMTool.Data/Entities/TimesheetEntry.cs b/PPMTool.Data/Entities/TimesheetEntry.cs
index 8d96c983..704d6928 100644
--- a/PPMTool.Data/Entities/TimesheetEntry.cs
+++ b/PPMTool.Data/Entities/TimesheetEntry.cs
@@ -79,10 +79,10 @@ public class TimesheetEntry : ILoggableObject
         public double TotalHours { get; private set; }
 
         /// <summary>
-        /// Represents whether this task is part of the user's template
+        /// Represents whether this task is part of the user's template. This must be explicitly set with the <see cref="SetIsInTemplate(bool)"/> method.
         /// </summary>
         [NotMapped]
-        public bool IsInTemplate { get; set; }
+        public bool IsInTemplate { get; private set; }
 
         /// <summary>
         /// Method to sum up the hours in the entry and update the TotalHours property.
@@ -94,6 +94,15 @@ public void UpdateTotalHours()
             TotalHours = MondayHours + TuesdayHours + WednesdayHours + ThursdayHours + FridayHours + SaturdayHours + SundayHours;
         }
 
+        /// <summary>
+        /// Sets the IsInTemplate property to indicate whether this task is part of the user's template.
+        /// </summary>
+        /// <param name="isInTemplate"></param>
+        public void SetIsInTemplate(bool isInTemplate)
+        {
+            IsInTemplate = isInTemplate;
+        }
+
         /// <summary>
         /// Returns a useful string to identify the entity
         /// </summary>
diff --git a/PPMTool/Pages/AddTimesheet.razor.cs b/PPMTool/Pages/AddTimesheet.razor.cs
index 6f3a8e9b..5ff63ec2 100644
--- a/PPMTool/Pages/AddTimesheet.razor.cs
+++ b/PPMTool/Pages/AddTimesheet.razor.cs
@@ -234,7 +234,7 @@ private List<TimesheetEntry> OrderByTemplate(Timesheet timesheet, string templat
                 // Sets a boolean for use in the datagrid to show which items are part of the template
                 foreach (TimesheetEntry e in orderedResults)
                 {
-                    e.IsInTemplate = order.Contains(e.InnateCodeTask.InnateCodeTaskId);
+                    e.SetIsInTemplate(order.Contains(e.InnateCodeTask.InnateCodeTaskId));
                 }
 
                 return orderedResults;

From 91d5409f34792184b655d7c789bba8ef3db959b3 Mon Sep 17 00:00:00 2001
From: AdrianHarwood <adrian.harwood@manchester.ac.uk>
Date: Wed, 1 Jul 2026 07:52:03 +0100
Subject: [PATCH 14/16] Addressed review comment from co-pilot regarding the DB
 query complexity on data grid load

---
 PPMTool/Pages/Projects.razor.cs    | 25 +++++++++++++++++--------
 PPMTool/Services/PaymentService.cs | 20 ++++++++++++++++++++
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/PPMTool/Pages/Projects.razor.cs b/PPMTool/Pages/Projects.razor.cs
index 34835f49..5fb64164 100644
--- a/PPMTool/Pages/Projects.razor.cs
+++ b/PPMTool/Pages/Projects.razor.cs
@@ -127,12 +127,6 @@ private void OnLoadData(LoadDataArgs args)
             // Initialise the project list -- developers can only see projects to which they are assigned
             IQueryable<Project> query = ProjectService.GetAll(Context).OrderBy(x => x.RTP).AsQueryable();
 
-            // Add details of FundsReceived so we can use it for filtering in the grid as a property
-            foreach (Project p in query)
-            {
-                p.FundsReceived = PaymentService.GetFundsReceived(Context, p.ProjectId);
-            }
-
             if (ActiveUserRoleType == RoleType.Developer)
             {
                 query = query.Where(x => ActiveUser.Person != null && x.SubTasks.Any(x => x.AssignedResources.Any(x => x.Person.PersonId == ActiveUser.Person!.PersonId)));
@@ -153,15 +147,30 @@ private void OnLoadData(LoadDataArgs args)
             // Assign to grid source
             var data = query.ToList();
             count = data.Count;
+
+            List<Project> projectsToDisplay;
             if (args.Skip == null)
             {
-                projects = data.Take(pageCount).ToList();
+                projectsToDisplay = data.Take(pageCount).ToList();
             }
             else
             {
-                projects = data.Skip(args.Skip.Value).Take(args.Top.Value).ToList();
+                projectsToDisplay = data.Skip(args.Skip.Value).Take(args.Top.Value).ToList();
             }
 
+            // Load FundsReceived for displayed projects only (after filtering and paging)
+            var projectIds = projectsToDisplay.Select(p => p.ProjectId).ToList();
+            var fundsReceivedLookup = PaymentService.GetFundsReceivedForProjects(Context, projectIds);
+
+            // Populate FundsReceived from the lookup
+            foreach (var project in projectsToDisplay)
+            {
+                project.FundsReceived = fundsReceivedLookup.TryGetValue(project.ProjectId, out var funds) ? funds : 0;
+            }
+
+            // Now assign to bound variable for display
+            projects = projectsToDisplay;
+
             Debug.WriteLine($"** {data.Count()} projects loaded. {projects.Count()} displayed.");
         }
 
diff --git a/PPMTool/Services/PaymentService.cs b/PPMTool/Services/PaymentService.cs
index cf00920d..daf18612 100644
--- a/PPMTool/Services/PaymentService.cs
+++ b/PPMTool/Services/PaymentService.cs
@@ -93,6 +93,26 @@ public double GetFundsReceived(PPMToolContext context, int projectId)
                 .RoundedSum(x => x.Value, 0);
         }
 
+        /// <summary>
+        /// Gets funds received for multiple projects in a single query and return as a dictionary mapping ProjectId to FundsReceived.
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="projectIds"></param>
+        /// <returns>Dictionary mapping ProjectId to FundsReceived</returns>
+        public IDictionary<int, double> GetFundsReceivedForProjects(PPMToolContext context, IEnumerable<int> projectIds)
+        {
+            // Return an empty dictionary if the projectIds collection is null or empty
+            var projectIdList = projectIds.ToList();
+            if (!projectIdList.Any())
+                return new Dictionary<int, double>();
+
+            return context.Payments
+                .Where(p => projectIdList.Contains(p.Project.ProjectId))
+                .GroupBy(p => p.Project.ProjectId)
+                .Select(g => new { ProjectId = g.Key, FundsReceived = g.Sum(p => p.Value) })
+                .ToDictionary(x => x.ProjectId, x => Math.Round(x.FundsReceived, 0));
+        }
+
         /// <summary>
         /// Gets the invoice status by evaluating payments made against the invoice value
         /// </summary>

From 1f03b9001659d9768cfa13b7ce41c100345282d9 Mon Sep 17 00:00:00 2001
From: AdrianHarwood <adrian.harwood@manchester.ac.uk>
Date: Wed, 1 Jul 2026 08:40:15 +0100
Subject: [PATCH 15/16] Addition of manual filtering helpers for Radzen data
 grids to allow overriding of LINQ-based filtering consistently

---
 PPMTool/Helpers/FilterHelper.cs | 119 ++++++++++++++++++++++++++++++++
 PPMTool/Pages/People.razor.cs   |  37 +++++-----
 2 files changed, 138 insertions(+), 18 deletions(-)
 create mode 100644 PPMTool/Helpers/FilterHelper.cs

diff --git a/PPMTool/Helpers/FilterHelper.cs b/PPMTool/Helpers/FilterHelper.cs
new file mode 100644
index 00000000..a60750f2
--- /dev/null
+++ b/PPMTool/Helpers/FilterHelper.cs
@@ -0,0 +1,119 @@
+// SPDX-FileCopyrightText: 2026 University of Manchester
+//
+// SPDX-License-Identifier: apache-2.0
+
+using Radzen;
+
+namespace PPMTool.Helpers
+{
+    /// <summary>
+    /// Provides helper methods for applying filters to IQueryable collections.
+    /// </summary>
+    public static class FilterHelper
+    {
+        /// <summary>
+        /// Applies a string filter to the given IQueryable collection based on the specified FilterDescriptor and value selector.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="query"></param>
+        /// <param name="filter"></param>
+        /// <param name="valueSelector"></param>
+        /// <returns></returns>
+        public static IQueryable<T> ApplyStringFilter<T>(
+            IQueryable<T> query,
+            FilterDescriptor filter,
+            Func<T, string> valueSelector)
+        {
+            return filter.FilterOperator switch
+            {
+                FilterOperator.IsNull => query.Where(item => valueSelector(item) == null),
+                FilterOperator.IsNotNull => query.Where(item => valueSelector(item) != null),
+                FilterOperator.IsEmpty => query.Where(item => string.IsNullOrEmpty(valueSelector(item))),
+                FilterOperator.IsNotEmpty => query.Where(item => !string.IsNullOrEmpty(valueSelector(item))),
+                _ => ApplyStringValueFilter(query, filter, valueSelector)
+            };
+        }
+
+        /// <summary>
+        /// Applies a nullable integer filter to the given IQueryable collection based on the specified FilterDescriptor and value selector.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="query"></param>
+        /// <param name="filter"></param>
+        /// <param name="valueSelector"></param>
+        /// <returns></returns>
+        public static IQueryable<T> ApplyNullableIntFilter<T>(
+            IQueryable<T> query,
+            FilterDescriptor filter,
+            Func<T, int?> valueSelector)
+        {
+            if (filter.FilterOperator == FilterOperator.IsNull)
+            {
+                return query.Where(item => valueSelector(item) == null);
+            }
+
+            if (filter.FilterOperator == FilterOperator.IsNotNull)
+            {
+                return query.Where(item => valueSelector(item) != null);
+            }
+
+            var filterValue = filter.FilterValue switch
+            {
+                int intValue => intValue,
+                string stringValue when int.TryParse(stringValue, out var parsedValue) => parsedValue,
+                _ => (int?)null
+            };
+
+            if (filterValue == null)
+            {
+                return query;
+            }
+
+            return filter.FilterOperator switch
+            {
+                FilterOperator.Equals => query.Where(item => valueSelector(item) == filterValue),
+                FilterOperator.NotEquals => query.Where(item => valueSelector(item) != filterValue),
+                FilterOperator.GreaterThan => query.Where(item => valueSelector(item) > filterValue),
+                FilterOperator.GreaterThanOrEquals => query.Where(item => valueSelector(item) >= filterValue),
+                FilterOperator.LessThan => query.Where(item => valueSelector(item) < filterValue),
+                FilterOperator.LessThanOrEquals => query.Where(item => valueSelector(item) <= filterValue),
+                _ => query
+            };
+        }
+
+        /// <summary>
+        /// Applies a string value filter to the given IQueryable collection based on the specified FilterDescriptor and value selector.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="query"></param>
+        /// <param name="filter"></param>
+        /// <param name="valueSelector"></param>
+        /// <returns></returns>
+        private static IQueryable<T> ApplyStringValueFilter<T>(
+            IQueryable<T> query,
+            FilterDescriptor filter,
+            Func<T, string> valueSelector)
+        {
+            // Do nothing if not filter value
+            var filterValue = (filter.FilterValue as string)?.Trim();
+            if (string.IsNullOrWhiteSpace(filterValue))
+            {
+                return query;
+            }
+
+            var filterValueLower = filterValue.ToLowerInvariant();
+
+            // Manually implement the string filter operators to avoid issues with Dynamic LINQ and null values
+            return filter.FilterOperator switch
+            {
+                FilterOperator.Contains => query.Where(item => (valueSelector(item) ?? string.Empty).Trim().ToLowerInvariant().Contains(filterValueLower)),
+                FilterOperator.DoesNotContain => query.Where(item => !(valueSelector(item) ?? string.Empty).Trim().ToLowerInvariant().Contains(filterValueLower)),
+                FilterOperator.StartsWith => query.Where(item => (valueSelector(item) ?? string.Empty).Trim().ToLowerInvariant().StartsWith(filterValueLower)),
+                FilterOperator.EndsWith => query.Where(item => (valueSelector(item) ?? string.Empty).Trim().ToLowerInvariant().EndsWith(filterValueLower)),
+                FilterOperator.Equals => query.Where(item => (valueSelector(item) ?? string.Empty).Trim().ToLowerInvariant() == filterValueLower),
+                FilterOperator.NotEquals => query.Where(item => (valueSelector(item) ?? string.Empty).Trim().ToLowerInvariant() != filterValueLower),
+                _ => query
+            };
+        }
+    }
+}
diff --git a/PPMTool/Pages/People.razor.cs b/PPMTool/Pages/People.razor.cs
index 744a4326..b723b89f 100644
--- a/PPMTool/Pages/People.razor.cs
+++ b/PPMTool/Pages/People.razor.cs
@@ -8,6 +8,7 @@
 using Microsoft.AspNetCore.Components;
 using PPMTool.Data.Entities;
 using PPMTool.Data.Enums;
+using PPMTool.Helpers;
 using PPMTool.Services;
 using Radzen;
 
@@ -112,30 +113,17 @@ private void LoadData(LoadDataArgs args)
                 query = query.Where(x => ActiveUser.Person != null && x.PersonId == ActiveUser.Person!.PersonId);
             }
 
-
-            // ---- CUSTOM FILTERS ONLY ----
+            // ---- GRID FILTERING ----
+            // Apply filters manually so custom columns such as SkillTags do not flow into
+            // Dynamic LINQ against Person, which does not expose a SkillTags property.
             if (args.Filters is { } filters && filters.Any())
             {
-                // SkillTags custom filter
-                var skillFilter = filters.FirstOrDefault(x => x.Property == "SkillTags");
-                var skillFilterValue = (skillFilter?.FilterValue as string)?.Trim();
-
-                if (!string.IsNullOrWhiteSpace(skillFilterValue))
+                foreach (var filter in filters)
                 {
-                    var filterValueLower = skillFilterValue.ToLower();
-
-                    query = query.Where(x =>
-                        x.OwnedSkills.Any(s =>
-                            (s.SkillTag.Name ?? "").Trim().ToLower().Contains(filterValueLower)));
+                    query = ApplyFilter(query, filter);
                 }
             }
 
-            // ---- BUILT-IN RADZEN FILTERING ----
-            if (!string.IsNullOrWhiteSpace(args.Filter))
-            {
-                query = query.Where(args.Filter);
-            }
-
             // ---- SORTING ----
             if (args.Sorts != null && args.Sorts.Count() > 0)
             {
@@ -168,7 +156,20 @@ private void LoadData(LoadDataArgs args)
             people = query.Skip(skip).Take(take).ToList();
 
             Debug.WriteLine($"** {count} people loaded. {people.Count()} displayed.");
+        }
 
+        private IQueryable<Person> ApplyFilter(IQueryable<Person> query, FilterDescriptor filter)
+        {
+            return filter.Property switch
+            {
+                "Name" => FilterHelper.ApplyStringFilter(query, filter, person => person.Name),
+                "ShortName" => FilterHelper.ApplyStringFilter(query, filter, person => person.ShortName),
+                "LineManager.Name" => FilterHelper.ApplyStringFilter(query, filter, person => person.LineManager?.Name),
+                "SkillTags" => FilterHelper.ApplyStringFilter(query, filter,
+                    person => string.Join(", ", person.OwnedSkills.Select(skill => skill.SkillTag.Name).OrderBy(name => name))),
+                "CurrentGrade" => FilterHelper.ApplyNullableIntFilter(query, filter, person => person.CurrentGrade),
+                _ => query
+            };
         }
     }
 }
\ No newline at end of file

From 483e56c1a0ffef45fe98d9387cb27af85f7cba6f Mon Sep 17 00:00:00 2001
From: AdrianHarwood <adrian.harwood@manchester.ac.uk>
Date: Wed, 1 Jul 2026 09:21:24 +0100
Subject: [PATCH 16/16] Switched to use a shadow property instead so at least
 we are consistent

---
 PPMTool.Data/Entities/Person.cs |  10 +++
 PPMTool/Helpers/FilterHelper.cs | 119 --------------------------------
 PPMTool/Pages/People.razor.cs   |  23 +-----
 3 files changed, 12 insertions(+), 140 deletions(-)
 delete mode 100644 PPMTool/Helpers/FilterHelper.cs

diff --git a/PPMTool.Data/Entities/Person.cs b/PPMTool.Data/Entities/Person.cs
index b4e0c8c6..63d049c5 100644
--- a/PPMTool.Data/Entities/Person.cs
+++ b/PPMTool.Data/Entities/Person.cs
@@ -309,6 +309,16 @@ public double GetWorkloadModelTotalOnDate(DateTime date)
                 .LastOrDefault();
         }
 
+        /// <summary>
+        /// Shadow property to store a comma-separated list of the person's skill tag names.
+        /// Used for filtering on the Manage People page.
+        /// </summary>
+        [NotMapped]
+        public string SkillTags
+        {
+            get => string.Join(", ", OwnedSkills.Select(skill => skill.SkillTag.Name).OrderBy(name => name));
+        }
+
         /// <summary>
         /// Shadow property to store the current grade of the person based on the person's current WLM and the date.
         /// Used for filtering by Grade on the Manage People page currently.
diff --git a/PPMTool/Helpers/FilterHelper.cs b/PPMTool/Helpers/FilterHelper.cs
deleted file mode 100644
index a60750f2..00000000
--- a/PPMTool/Helpers/FilterHelper.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-// SPDX-FileCopyrightText: 2026 University of Manchester
-//
-// SPDX-License-Identifier: apache-2.0
-
-using Radzen;
-
-namespace PPMTool.Helpers
-{
-    /// <summary>
-    /// Provides helper methods for applying filters to IQueryable collections.
-    /// </summary>
-    public static class FilterHelper
-    {
-        /// <summary>
-        /// Applies a string filter to the given IQueryable collection based on the specified FilterDescriptor and value selector.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="query"></param>
-        /// <param name="filter"></param>
-        /// <param name="valueSelector"></param>
-        /// <returns></returns>
-        public static IQueryable<T> ApplyStringFilter<T>(
-            IQueryable<T> query,
-            FilterDescriptor filter,
-            Func<T, string> valueSelector)
-        {
-            return filter.FilterOperator switch
-            {
-                FilterOperator.IsNull => query.Where(item => valueSelector(item) == null),
-                FilterOperator.IsNotNull => query.Where(item => valueSelector(item) != null),
-                FilterOperator.IsEmpty => query.Where(item => string.IsNullOrEmpty(valueSelector(item))),
-                FilterOperator.IsNotEmpty => query.Where(item => !string.IsNullOrEmpty(valueSelector(item))),
-                _ => ApplyStringValueFilter(query, filter, valueSelector)
-            };
-        }
-
-        /// <summary>
-        /// Applies a nullable integer filter to the given IQueryable collection based on the specified FilterDescriptor and value selector.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="query"></param>
-        /// <param name="filter"></param>
-        /// <param name="valueSelector"></param>
-        /// <returns></returns>
-        public static IQueryable<T> ApplyNullableIntFilter<T>(
-            IQueryable<T> query,
-            FilterDescriptor filter,
-            Func<T, int?> valueSelector)
-        {
-            if (filter.FilterOperator == FilterOperator.IsNull)
-            {
-                return query.Where(item => valueSelector(item) == null);
-            }
-
-            if (filter.FilterOperator == FilterOperator.IsNotNull)
-            {
-                return query.Where(item => valueSelector(item) != null);
-            }
-
-            var filterValue = filter.FilterValue switch
-            {
-                int intValue => intValue,
-                string stringValue when int.TryParse(stringValue, out var parsedValue) => parsedValue,
-                _ => (int?)null
-            };
-
-            if (filterValue == null)
-            {
-                return query;
-            }
-
-            return filter.FilterOperator switch
-            {
-                FilterOperator.Equals => query.Where(item => valueSelector(item) == filterValue),
-                FilterOperator.NotEquals => query.Where(item => valueSelector(item) != filterValue),
-                FilterOperator.GreaterThan => query.Where(item => valueSelector(item) > filterValue),
-                FilterOperator.GreaterThanOrEquals => query.Where(item => valueSelector(item) >= filterValue),
-                FilterOperator.LessThan => query.Where(item => valueSelector(item) < filterValue),
-                FilterOperator.LessThanOrEquals => query.Where(item => valueSelector(item) <= filterValue),
-                _ => query
-            };
-        }
-
-        /// <summary>
-        /// Applies a string value filter to the given IQueryable collection based on the specified FilterDescriptor and value selector.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="query"></param>
-        /// <param name="filter"></param>
-        /// <param name="valueSelector"></param>
-        /// <returns></returns>
-        private static IQueryable<T> ApplyStringValueFilter<T>(
-            IQueryable<T> query,
-            FilterDescriptor filter,
-            Func<T, string> valueSelector)
-        {
-            // Do nothing if not filter value
-            var filterValue = (filter.FilterValue as string)?.Trim();
-            if (string.IsNullOrWhiteSpace(filterValue))
-            {
-                return query;
-            }
-
-            var filterValueLower = filterValue.ToLowerInvariant();
-
-            // Manually implement the string filter operators to avoid issues with Dynamic LINQ and null values
-            return filter.FilterOperator switch
-            {
-                FilterOperator.Contains => query.Where(item => (valueSelector(item) ?? string.Empty).Trim().ToLowerInvariant().Contains(filterValueLower)),
-                FilterOperator.DoesNotContain => query.Where(item => !(valueSelector(item) ?? string.Empty).Trim().ToLowerInvariant().Contains(filterValueLower)),
-                FilterOperator.StartsWith => query.Where(item => (valueSelector(item) ?? string.Empty).Trim().ToLowerInvariant().StartsWith(filterValueLower)),
-                FilterOperator.EndsWith => query.Where(item => (valueSelector(item) ?? string.Empty).Trim().ToLowerInvariant().EndsWith(filterValueLower)),
-                FilterOperator.Equals => query.Where(item => (valueSelector(item) ?? string.Empty).Trim().ToLowerInvariant() == filterValueLower),
-                FilterOperator.NotEquals => query.Where(item => (valueSelector(item) ?? string.Empty).Trim().ToLowerInvariant() != filterValueLower),
-                _ => query
-            };
-        }
-    }
-}
diff --git a/PPMTool/Pages/People.razor.cs b/PPMTool/Pages/People.razor.cs
index b723b89f..d26baa98 100644
--- a/PPMTool/Pages/People.razor.cs
+++ b/PPMTool/Pages/People.razor.cs
@@ -8,7 +8,6 @@
 using Microsoft.AspNetCore.Components;
 using PPMTool.Data.Entities;
 using PPMTool.Data.Enums;
-using PPMTool.Helpers;
 using PPMTool.Services;
 using Radzen;
 
@@ -114,14 +113,9 @@ private void LoadData(LoadDataArgs args)
             }
 
             // ---- GRID FILTERING ----
-            // Apply filters manually so custom columns such as SkillTags do not flow into
-            // Dynamic LINQ against Person, which does not expose a SkillTags property.
-            if (args.Filters is { } filters && filters.Any())
+            if (!string.IsNullOrWhiteSpace(args.Filter))
             {
-                foreach (var filter in filters)
-                {
-                    query = ApplyFilter(query, filter);
-                }
+                query = query.Where(args.Filter);
             }
 
             // ---- SORTING ----
@@ -158,18 +152,5 @@ private void LoadData(LoadDataArgs args)
             Debug.WriteLine($"** {count} people loaded. {people.Count()} displayed.");
         }
 
-        private IQueryable<Person> ApplyFilter(IQueryable<Person> query, FilterDescriptor filter)
-        {
-            return filter.Property switch
-            {
-                "Name" => FilterHelper.ApplyStringFilter(query, filter, person => person.Name),
-                "ShortName" => FilterHelper.ApplyStringFilter(query, filter, person => person.ShortName),
-                "LineManager.Name" => FilterHelper.ApplyStringFilter(query, filter, person => person.LineManager?.Name),
-                "SkillTags" => FilterHelper.ApplyStringFilter(query, filter,
-                    person => string.Join(", ", person.OwnedSkills.Select(skill => skill.SkillTag.Name).OrderBy(name => name))),
-                "CurrentGrade" => FilterHelper.ApplyNullableIntFilter(query, filter, person => person.CurrentGrade),
-                _ => query
-            };
-        }
     }
 }
\ No newline at end of file