From a6aea8081e60cd3a8d69f2771557a1452ee0cf6e Mon Sep 17 00:00:00 2001 From: JoeProgrammer88 Date: Tue, 21 Apr 2026 14:08:37 -0700 Subject: [PATCH 1/4] Refactor agency details to use strongly-typed partial Replaces reflection-based agency details rendering in ResourceGuide.cshtml with a new _AgencyDetails.cshtml partial. The partial explicitly renders each Agency field, improving maintainability and clarity, and provides custom formatting for emails, phone numbers, and websites. --- PC2/Views/Resources/ResourceGuide.cshtml | 80 +------------- PC2/Views/Shared/_AgencyDetails.cshtml | 126 +++++++++++++++++++++++ 2 files changed, 127 insertions(+), 79 deletions(-) create mode 100644 PC2/Views/Shared/_AgencyDetails.cshtml diff --git a/PC2/Views/Resources/ResourceGuide.cshtml b/PC2/Views/Resources/ResourceGuide.cshtml index 701b7f7..5ff63fd 100644 --- a/PC2/Views/Resources/ResourceGuide.cshtml +++ b/PC2/Views/Resources/ResourceGuide.cshtml @@ -263,85 +263,7 @@ else
-
- @*For each property in class agency*@ - @foreach(var prop in typeof(Agency).GetProperties()) - { - - if (prop.GetValue(Model.Agencies[i]) != null) - { - // handles email links - if (prop.Name == "Email") - { -
@prop.Name
- string emailData = prop.GetValue(Model.Agencies[i]).ToString(); - @*separate multiple emails*@ -
- @{ - if (emailData != null) - { - string[] emails = emailData.Split(' '); - foreach(string email in emails) - { - - @email - -
- } - } - } -
- } - // handles phone links - else if (prop.Name == "Phone") - { -
@prop.Name
-
- @Html.Raw(PC2.Models.RendererHelper.RenderPhone(prop.GetValue(Model.Agencies[i])?.ToString())) -
- } - - // handles website links - else if (prop.Name == "Website") - { -
@prop.Name
- string websiteString = prop.GetValue(Model.Agencies[i]).ToString(); - - if (websiteString != null) - { - string[] websites = websiteString.Split(' '); - foreach(string website in websites) - { - string url = website.Trim(); - // if the url is empty, skip it. This is to handle extra spaces in the data - if (url == string.Empty) - { - continue; - } - if (!url.StartsWith("https://") && !url.StartsWith("http://")) - { - url = "https://" + url; - } -
@url
- } - } - } - // excludes certain columns and displays the rest - else if (prop.Name != "AgencyCategories" && prop.Name != "AgencyId" && prop.Name != "AgencyName") - { - if (prop.Name == "Address1" && Model.Agencies[i].Address2 == null) - { -
Address
- } - else - { -
@prop.Name
- } -
@prop.GetValue(Model.Agencies[i])
- } - } - } -
+ @await Html.PartialAsync("_AgencyDetails", Model.Agencies[i])
diff --git a/PC2/Views/Shared/_AgencyDetails.cshtml b/PC2/Views/Shared/_AgencyDetails.cshtml new file mode 100644 index 0000000..4c2d6b6 --- /dev/null +++ b/PC2/Views/Shared/_AgencyDetails.cshtml @@ -0,0 +1,126 @@ +@model PC2.Models.Agency + +@* + Partial view that renders the detail fields for a single Agency inside the modal body. + Each field is rendered explicitly (no reflection) so the output is easy to follow and maintain. +*@ + +
+ + @if (Model.AgencyName2 != null) + { +
AgencyName2
+
@Model.AgencyName2
+ } + + @if (Model.Contact != null) + { +
Contact
+
@Model.Contact
+ } + + @if (Model.Address1 != null) + { +
@(Model.Address2 == null ? "Address" : "Address1")
+
@Model.Address1
+ } + + @if (Model.Address2 != null) + { +
Address2
+
@Model.Address2
+ } + + @if (Model.City != null) + { +
City
+
@Model.City
+ } + + @if (Model.State != null) + { +
State
+
@Model.State
+ } + + @if (Model.Zip != null) + { +
Zip
+
@Model.Zip
+ } + + @if (Model.MailingAddress != null) + { +
MailingAddress
+
@Model.MailingAddress
+ } + + @if (Model.Phone != null) + { +
Phone
+
@Html.Raw(PC2.Models.RendererHelper.RenderPhone(Model.Phone))
+ } + + @if (Model.TollFree != null) + { +
TollFree
+
@Model.TollFree
+ } + + @if (Model.TTY != null) + { +
TTY
+
@Model.TTY
+ } + + @if (Model.TDD != null) + { +
TDD
+
@Model.TDD
+ } + + @if (Model.CrisisHelpHotline != null) + { +
CrisisHelpHotline
+
@Model.CrisisHelpHotline
+ } + + @if (Model.Fax != null) + { +
Fax
+
@Model.Fax
+ } + + @if (Model.Email != null) + { +
Email
+
+ @foreach (string email in Model.Email.Split(' ', StringSplitOptions.RemoveEmptyEntries)) + { + @email +
+ } +
+ } + + @if (Model.Website != null) + { + @foreach (string website in Model.Website.Split(' ', StringSplitOptions.RemoveEmptyEntries)) + { + string url = website.Trim(); + if (!url.StartsWith("https://") && !url.StartsWith("http://")) + { + url = "https://" + url; + } +
Website
+
@url
+ } + } + + @if (Model.Description != null) + { +
Description
+
@Model.Description
+ } + +
From 2f9b85fcadb61da4ed367634f6f6931506f3c777 Mon Sep 17 00:00:00 2001 From: JoeProgrammer88 Date: Tue, 21 Apr 2026 14:23:01 -0700 Subject: [PATCH 2/4] Refactor GetSpecificAgenciesAsync to use EF Core LINQ Replaced manual iteration with an EF Core LINQ query to fetch agencies by category. Now includes AgencyCategories, orders by AgencyName, and returns results asynchronously for improved performance and readability. --- PC2/Data/AgencyDB.cs | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/PC2/Data/AgencyDB.cs b/PC2/Data/AgencyDB.cs index a0ccda0..21b207b 100644 --- a/PC2/Data/AgencyDB.cs +++ b/PC2/Data/AgencyDB.cs @@ -95,21 +95,11 @@ public static async Task> GetAllAgenciesAsync(ApplicationDbContext /// public static async Task> GetSpecificAgenciesAsync(ApplicationDbContext context, int categoryID) { - List agencies = await GetAllAgenciesAsync(context); - - List result = new List(); - for (int i = 0; i < agencies.Count; i++) - { - for (int j = 0; j < agencies[i].AgencyCategories.Count; j++) - { - if (agencies[i].AgencyCategories[j].AgencyCategoryId == categoryID) - { - result.Add(agencies[i]); - } - } - } - - return result; + return await context.Agency + .Include(nameof(Agency.AgencyCategories)) + .Where(agency => agency.AgencyCategories.Any(cat => cat.AgencyCategoryId == categoryID)) + .OrderBy(agency => agency.AgencyName) + .ToListAsync(); } /// From 5efc873ab2998dca3dab9b02b6896f936a7e56a3 Mon Sep 17 00:00:00 2001 From: JoeProgrammer88 Date: Tue, 21 Apr 2026 14:23:53 -0700 Subject: [PATCH 3/4] Refactor email rendering to use foreach and Split Simplified multiple email handling by splitting the email string and iterating with a foreach loop. Each email is now trimmed and rendered as a mailto link, replacing the previous manual substring logic. --- PC2/Views/Resources/ResourceGuide.cshtml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/PC2/Views/Resources/ResourceGuide.cshtml b/PC2/Views/Resources/ResourceGuide.cshtml index 5ff63fd..b1331bc 100644 --- a/PC2/Views/Resources/ResourceGuide.cshtml +++ b/PC2/Views/Resources/ResourceGuide.cshtml @@ -227,18 +227,13 @@ else @if (Model.Agencies[i].Email != null) { - string email = Model.Agencies[i].Email; + @foreach (string singleEmail in Model.Agencies[i].Email.Split(' ', StringSplitOptions.RemoveEmptyEntries)) int emailStart = 0; @*separate multiple emails*@ @for (int j = 0; j < email.Length; j++) { - // if the email contains a space - if (email[j] == ' ') - { - // display all characters from emailStart to current index as link - string singleEmail = email.Substring(emailStart, j - emailStart); - @singleEmail + @singleEmail.Trim()
emailStart = j; } From 6b55d818c503035a468a0d62cbda69d456886291 Mon Sep 17 00:00:00 2001 From: JoeProgrammer88 Date: Tue, 21 Apr 2026 14:24:37 -0700 Subject: [PATCH 4/4] Simplify email rendering logic in ResourceGuide.cshtml Removed unnecessary variables and loops from the email rendering section. Each email is now rendered directly as a mailto link, improving code clarity and maintainability. --- PC2/Views/Resources/ResourceGuide.cshtml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/PC2/Views/Resources/ResourceGuide.cshtml b/PC2/Views/Resources/ResourceGuide.cshtml index b1331bc..887492f 100644 --- a/PC2/Views/Resources/ResourceGuide.cshtml +++ b/PC2/Views/Resources/ResourceGuide.cshtml @@ -228,21 +228,11 @@ else @if (Model.Agencies[i].Email != null) { @foreach (string singleEmail in Model.Agencies[i].Email.Split(' ', StringSplitOptions.RemoveEmptyEntries)) - int emailStart = 0; - - @*separate multiple emails*@ - @for (int j = 0; j < email.Length; j++) { @singleEmail.Trim()
- emailStart = j; } } - // display link as final email - string finalEmail = email.Substring(emailStart, email.Length - emailStart); - - @finalEmail - }