From 42600422ca0d283408c0616b76a40af0388f9e7a Mon Sep 17 00:00:00 2001
From: Joshua Lester <jlester3@ewu.edu>
Date: Tue, 22 Oct 2024 15:49:47 -0700
Subject: [PATCH 01/11] Counting mechanism works

---
 EssentialCSharp.Web/Controllers/HomeController.cs | 1 +
 EssentialCSharp.Web/Views/Shared/_Layout.cshtml   | 7 +++++--
 EssentialCSharp.Web/wwwroot/js/site.js            | 6 ++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/EssentialCSharp.Web/Controllers/HomeController.cs b/EssentialCSharp.Web/Controllers/HomeController.cs
index 21b9d903..a701b201 100644
--- a/EssentialCSharp.Web/Controllers/HomeController.cs
+++ b/EssentialCSharp.Web/Controllers/HomeController.cs
@@ -30,6 +30,7 @@ public IActionResult Index()
 
             ViewBag.PageTitle = siteMapping.IndentLevel is 0 ? siteMapping.ChapterTitle + " " + siteMapping.RawHeading : siteMapping.RawHeading;
             ViewBag.NextPage = FlipPage(siteMapping!.ChapterNumber, siteMapping.PageNumber, true);
+            ViewBag.CurrentPageKey = siteMapping.Key;
             ViewBag.PreviousPage = FlipPage(siteMapping.ChapterNumber, siteMapping.PageNumber, false);
             ViewBag.HeadContents = headHtml;
             ViewBag.Contents = html;
diff --git a/EssentialCSharp.Web/Views/Shared/_Layout.cshtml b/EssentialCSharp.Web/Views/Shared/_Layout.cshtml
index e7e63787..a0c9aa00 100644
--- a/EssentialCSharp.Web/Views/Shared/_Layout.cshtml
+++ b/EssentialCSharp.Web/Views/Shared/_Layout.cshtml
@@ -124,6 +124,9 @@
                     <a v-if="chapterParentPage" :href="chapterParentPage.href" class="menu-chapter-title text-light">
                         <span v-cloak>{{chapterParentPage.title}}</span>
                     </a>
+                    <div class="menu-chapter-title text-light">
+                        {{currentPageCount}} / {{totalPageCount}}
+                    </div>
 
                     <div class="d-flex align-items-center">
                         <div class="border-end pe-3 d-none d-md-block">
@@ -269,7 +272,8 @@
         @{
             var tocData = _SiteMappings.GetTocData();
         }
-
+            CURRENT_PAGE_COUNT = @Json.Serialize(currentPageCount)
+            TOTAL_PAGE_COUNT = @Json.Serialize(overallCount)
             PREVIOUS_PAGE = @Json.Serialize(ViewBag.PreviousPage)
             NEXT_PAGE = @Json.Serialize(ViewBag.NextPage)
             TOC_DATA = @Json.Serialize(tocData)
@@ -320,6 +324,5 @@
         </li>
     </template>
     <script src="~/js/site.js" type="module" asp-append-version="true"></script>
-
 </body>
 </html>
diff --git a/EssentialCSharp.Web/wwwroot/js/site.js b/EssentialCSharp.Web/wwwroot/js/site.js
index 917d0b3e..49c5bc82 100644
--- a/EssentialCSharp.Web/wwwroot/js/site.js
+++ b/EssentialCSharp.Web/wwwroot/js/site.js
@@ -18,6 +18,7 @@ import { useWindowSize } from "vue-window-size";
  * @prop {TocItem[]} [items]
  */
 /** @type {TocItem} */
+debugger;
 const tocData = markRaw(TOC_DATA);
 
 //Add new content or features here:
@@ -210,6 +211,9 @@ const app = createApp({
 
         const currentPage = findCurrentPage([], tocData) ?? [];
 
+        const currentPageCount = CURRENT_PAGE_COUNT;
+        const totalPageCount = TOTAL_PAGE_COUNT;
+
         const chapterParentPage = currentPage.find((parent) => parent.level === 0);
 
         const sectionTitle = ref(currentPage?.[0]?.title || "Essential C#");
@@ -334,6 +338,8 @@ const app = createApp({
             tocData,
             expandedTocs,
             currentPage,
+            currentPageCount,
+            totalPageCount,
             chapterParentPage,
 
             searchQuery,

From 3db3d2e78bcd8d9bcb5e9151d87b06e21749042c Mon Sep 17 00:00:00 2001
From: Joshua Lester <jlester3@ewu.edu>
Date: Wed, 23 Oct 2024 08:59:28 -0700
Subject: [PATCH 02/11] save changes

---
 EssentialCSharp.Web/Controllers/HomeController.cs | 2 ++
 EssentialCSharp.Web/Views/Shared/_Layout.cshtml   | 4 +++-
 EssentialCSharp.Web/wwwroot/js/site.js            | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/EssentialCSharp.Web/Controllers/HomeController.cs b/EssentialCSharp.Web/Controllers/HomeController.cs
index a701b201..c31f3515 100644
--- a/EssentialCSharp.Web/Controllers/HomeController.cs
+++ b/EssentialCSharp.Web/Controllers/HomeController.cs
@@ -44,6 +44,8 @@ public IActionResult Index()
         }
     }
 
+
+
     [Route("/TermsOfService",
        Name = "TermsOfService")]
     public IActionResult TermsOfService()
diff --git a/EssentialCSharp.Web/Views/Shared/_Layout.cshtml b/EssentialCSharp.Web/Views/Shared/_Layout.cshtml
index a0c9aa00..00701274 100644
--- a/EssentialCSharp.Web/Views/Shared/_Layout.cshtml
+++ b/EssentialCSharp.Web/Views/Shared/_Layout.cshtml
@@ -125,7 +125,8 @@
                         <span v-cloak>{{chapterParentPage.title}}</span>
                     </a>
                     <div class="menu-chapter-title text-light">
-                        {{currentPageCount}} / {{totalPageCount}}
+                        <form 
+                        <span v-cloak>{{currentPageCount}} / {{totalPageCount}}</span>
                     </div>
 
                     <div class="d-flex align-items-center">
@@ -274,6 +275,7 @@
         }
             CURRENT_PAGE_COUNT = @Json.Serialize(currentPageCount)
             TOTAL_PAGE_COUNT = @Json.Serialize(overallCount)
+            KEY_LIST = @Json.Serialize(keyList)
             PREVIOUS_PAGE = @Json.Serialize(ViewBag.PreviousPage)
             NEXT_PAGE = @Json.Serialize(ViewBag.NextPage)
             TOC_DATA = @Json.Serialize(tocData)
diff --git a/EssentialCSharp.Web/wwwroot/js/site.js b/EssentialCSharp.Web/wwwroot/js/site.js
index 49c5bc82..34a05d5f 100644
--- a/EssentialCSharp.Web/wwwroot/js/site.js
+++ b/EssentialCSharp.Web/wwwroot/js/site.js
@@ -213,6 +213,7 @@ const app = createApp({
 
         const currentPageCount = CURRENT_PAGE_COUNT;
         const totalPageCount = TOTAL_PAGE_COUNT;
+        const keyList = KEY_LIST
 
         const chapterParentPage = currentPage.find((parent) => parent.level === 0);
 
@@ -340,6 +341,7 @@ const app = createApp({
             currentPage,
             currentPageCount,
             totalPageCount,
+            keyList,
             chapterParentPage,
 
             searchQuery,

From 103a88e1af1fcb665f68610d69ccfe6e9c0fc536 Mon Sep 17 00:00:00 2001
From: Joshua Lester <jlester3@ewu.edu>
Date: Tue, 12 Nov 2024 12:15:09 -0800
Subject: [PATCH 03/11] save

---
 EssentialCSharp.Web/Views/Shared/_Layout.cshtml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/EssentialCSharp.Web/Views/Shared/_Layout.cshtml b/EssentialCSharp.Web/Views/Shared/_Layout.cshtml
index 00701274..d4543884 100644
--- a/EssentialCSharp.Web/Views/Shared/_Layout.cshtml
+++ b/EssentialCSharp.Web/Views/Shared/_Layout.cshtml
@@ -125,7 +125,6 @@
                         <span v-cloak>{{chapterParentPage.title}}</span>
                     </a>
                     <div class="menu-chapter-title text-light">
-                        <form 
                         <span v-cloak>{{currentPageCount}} / {{totalPageCount}}</span>
                     </div>
 

From 5d32de2c9679011fcd6a5dd6a416ad0bfc4962c5 Mon Sep 17 00:00:00 2001
From: Joshua Lester <jlester3@ewu.edu>
Date: Fri, 22 Nov 2024 10:17:55 -0800
Subject: [PATCH 04/11] Reimplemented it to account for bug

---
 .../Services/ISiteMappingService.cs           |  3 +-
 .../Services/SiteMappingService.cs            | 34 +++++++++++++++++--
 .../Views/Shared/_Layout.cshtml               |  9 +++--
 EssentialCSharp.Web/wwwroot/js/site.js        | 17 +++++-----
 4 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/EssentialCSharp.Web/Services/ISiteMappingService.cs b/EssentialCSharp.Web/Services/ISiteMappingService.cs
index ac2a719e..2c99b1af 100644
--- a/EssentialCSharp.Web/Services/ISiteMappingService.cs
+++ b/EssentialCSharp.Web/Services/ISiteMappingService.cs
@@ -1,7 +1,8 @@
-namespace EssentialCSharp.Web.Services;
+namespace EssentialCSharp.Web.Services;
 
 public interface ISiteMappingService
 {
     IList<SiteMapping> SiteMappings { get; }
     IEnumerable<SiteMappingDto> GetTocData();
+    string GetPercentComplete(string currentPageKey);
 }
diff --git a/EssentialCSharp.Web/Services/SiteMappingService.cs b/EssentialCSharp.Web/Services/SiteMappingService.cs
index 9eafb3a9..64524be0 100644
--- a/EssentialCSharp.Web/Services/SiteMappingService.cs
+++ b/EssentialCSharp.Web/Services/SiteMappingService.cs
@@ -1,4 +1,6 @@
-using EssentialCSharp.Web.Models;
+using System.Globalization;
+using EssentialCSharp.Common;
+using EssentialCSharp.Web.Models;
 
 namespace EssentialCSharp.Web.Services;
 
@@ -12,7 +14,6 @@ public SiteMappingService(IWebHostEnvironment webHostEnvironment)
         List<SiteMapping>? siteMappings = System.Text.Json.JsonSerializer.Deserialize<List<SiteMapping>>(File.OpenRead(path)) ?? throw new InvalidOperationException("No table of contents found");
         SiteMappings = siteMappings;
     }
-
     public IEnumerable<SiteMappingDto> GetTocData()
     {
         return SiteMappings.GroupBy(x => x.ChapterNumber).OrderBy(x => x.Key).Select(x =>
@@ -50,4 +51,33 @@ private static IEnumerable<SiteMappingDto> GetItems(IEnumerable<SiteMapping> cha
                 Items = GetItems(chapterItems.SkipWhile(q => i.Keys.First() != q.Keys.First()).Skip(1), indentLevel + 1)
             });
     }
+
+    public string GetPercentComplete(string currentPageKey)
+    {
+        int currentMappingCount = 1;
+        int overallMappingCount = 1;
+        bool currentPageFound = false;
+        IEnumerable<IGrouping<int, SiteMapping>> chapterGroupings = SiteMappings.GroupBy(x => x.ChapterNumber).OrderBy(g => g.Key);
+        foreach (IGrouping<int, SiteMapping> chapterGrouping in chapterGroupings)
+        {
+            IEnumerable<IGrouping<int, SiteMapping>> pageGroupings = chapterGrouping.GroupBy(x => x.PageNumber).OrderBy(g => g.Key);
+            foreach (IGrouping<int, SiteMapping> pageGrouping in pageGroupings)
+            {
+                foreach (SiteMapping siteMapping in pageGrouping)
+                {
+                    if (siteMapping.Key == currentPageKey)
+                    {
+                        currentPageFound = true;
+                    }
+                    if (!currentPageFound)
+                    {
+                        currentMappingCount++;
+                    }
+                    overallMappingCount++;
+                }
+            }
+        }
+        double result = (double)currentMappingCount / overallMappingCount * 100;
+        return string.Format(CultureInfo.InvariantCulture, "{0:0.00}", result);
+    }
 }
diff --git a/EssentialCSharp.Web/Views/Shared/_Layout.cshtml b/EssentialCSharp.Web/Views/Shared/_Layout.cshtml
index d4543884..ea59cf52 100644
--- a/EssentialCSharp.Web/Views/Shared/_Layout.cshtml
+++ b/EssentialCSharp.Web/Views/Shared/_Layout.cshtml
@@ -124,8 +124,8 @@
                     <a v-if="chapterParentPage" :href="chapterParentPage.href" class="menu-chapter-title text-light">
                         <span v-cloak>{{chapterParentPage.title}}</span>
                     </a>
-                    <div class="menu-chapter-title text-light">
-                        <span v-cloak>{{currentPageCount}} / {{totalPageCount}}</span>
+                    <div class="menu-chapter-title text-light" v-if="isContentPage">
+                        <span v-cloak>Progress: {{percentComplete}}%</span>
                     </div>
 
                     <div class="d-flex align-items-center">
@@ -271,10 +271,9 @@
     <script>
         @{
             var tocData = _SiteMappings.GetTocData();
+            var percentComplete = _SiteMappings.GetPercentComplete(ViewBag.CurrentPageKey);
         }
-            CURRENT_PAGE_COUNT = @Json.Serialize(currentPageCount)
-            TOTAL_PAGE_COUNT = @Json.Serialize(overallCount)
-            KEY_LIST = @Json.Serialize(keyList)
+            PERCENT_COMPLETE = @Json.Serialize(percentComplete);
             PREVIOUS_PAGE = @Json.Serialize(ViewBag.PreviousPage)
             NEXT_PAGE = @Json.Serialize(ViewBag.NextPage)
             TOC_DATA = @Json.Serialize(tocData)
diff --git a/EssentialCSharp.Web/wwwroot/js/site.js b/EssentialCSharp.Web/wwwroot/js/site.js
index 34a05d5f..5d57eb98 100644
--- a/EssentialCSharp.Web/wwwroot/js/site.js
+++ b/EssentialCSharp.Web/wwwroot/js/site.js
@@ -18,7 +18,6 @@ import { useWindowSize } from "vue-window-size";
  * @prop {TocItem[]} [items]
  */
 /** @type {TocItem} */
-debugger;
 const tocData = markRaw(TOC_DATA);
 
 //Add new content or features here:
@@ -211,9 +210,7 @@ const app = createApp({
 
         const currentPage = findCurrentPage([], tocData) ?? [];
 
-        const currentPageCount = CURRENT_PAGE_COUNT;
-        const totalPageCount = TOTAL_PAGE_COUNT;
-        const keyList = KEY_LIST
+        const percentComplete = ref(PERCENT_COMPLETE);
 
         const chapterParentPage = currentPage.find((parent) => parent.level === 0);
 
@@ -282,6 +279,11 @@ const app = createApp({
             return tocData.filter(item => filterItem(item, query));
         });
 
+        const isContentPage = computed(() => {
+            let path = window.location.pathname;
+            return path !== '/home' && path !== '/guidelines' && path !== '/about' && path !== '/announcements';
+        });
+
         function filterItem(item, query) {
             let matches = normalizeString(item.title).includes(query);
             if (item.items && item.items.length) {
@@ -339,14 +341,13 @@ const app = createApp({
             tocData,
             expandedTocs,
             currentPage,
-            currentPageCount,
-            totalPageCount,
-            keyList,
+            percentComplete,
             chapterParentPage,
 
             searchQuery,
             filteredTocData,
-            enableTocFilter
+            enableTocFilter,
+            isContentPage
         };
     },
 });

From d3e30ae10cc10cf1a35756fba8dfbccf30f1a3df Mon Sep 17 00:00:00 2001
From: Joshua Lester <jlester3@ewu.edu>
Date: Tue, 26 Nov 2024 11:09:29 -0800
Subject: [PATCH 05/11] Change style

---
 .../Views/Shared/_Layout.cshtml                |  6 +++---
 EssentialCSharp.Web/wwwroot/css/styles.css     | 18 ++++++++++++------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/EssentialCSharp.Web/Views/Shared/_Layout.cshtml b/EssentialCSharp.Web/Views/Shared/_Layout.cshtml
index ea59cf52..53a9cca3 100644
--- a/EssentialCSharp.Web/Views/Shared/_Layout.cshtml
+++ b/EssentialCSharp.Web/Views/Shared/_Layout.cshtml
@@ -121,11 +121,11 @@
                         </div>
                     </div>
 
-                    <a v-if="chapterParentPage" :href="chapterParentPage.href" class="menu-chapter-title text-light">
+                    <a v-if="chapterParentPage" :href="chapterParentPage.href" class="menu menu-chapter-title text-light">
                         <span v-cloak>{{chapterParentPage.title}}</span>
                     </a>
-                    <div class="menu-chapter-title text-light" v-if="isContentPage">
-                        <span v-cloak>Progress: {{percentComplete}}%</span>
+                    <div class="menu menu-progress text-light" v-if="isContentPage">
+                        <span v-cloak>{{percentComplete}}%</span>
                     </div>
 
                     <div class="d-flex align-items-center">
diff --git a/EssentialCSharp.Web/wwwroot/css/styles.css b/EssentialCSharp.Web/wwwroot/css/styles.css
index 49fb64b7..7def90df 100644
--- a/EssentialCSharp.Web/wwwroot/css/styles.css
+++ b/EssentialCSharp.Web/wwwroot/css/styles.css
@@ -224,13 +224,16 @@ a:hover {
   }
 }
 
+.menu {
+  white-space: nowrap;
+  overflow: hidden;
+  text-decoration: none;
+}
+
 .menu-brand {
   font-style: normal;
   font-weight: 400;
   font-size: 1.5rem;
-  text-decoration: none;
-  white-space: nowrap;
-  overflow: hidden;
   margin-left: 5px;
 }
 
@@ -238,11 +241,14 @@ a:hover {
   font-style: normal;
   font-weight: 300;
   font-size: 1.2rem;
-  text-decoration: none;
   text-overflow: ellipsis;
-  overflow: hidden;
   cursor: pointer;
-  white-space: nowrap;
+}
+
+.menu-progress {
+  font-style: normal;
+  font-weight: 200;
+  font-size: 1rem;
 }
 
 .has-tooltip {

From 364614456e042743b2ba7f0b30d2d066667ffbf9 Mon Sep 17 00:00:00 2001
From: Joshua Lester <jlester3@ewu.edu>
Date: Tue, 26 Nov 2024 11:19:28 -0800
Subject: [PATCH 06/11] Cleaning up for PR

---
 EssentialCSharp.Web/Controllers/HomeController.cs  | 2 --
 EssentialCSharp.Web/Services/SiteMappingService.cs | 2 --
 2 files changed, 4 deletions(-)

diff --git a/EssentialCSharp.Web/Controllers/HomeController.cs b/EssentialCSharp.Web/Controllers/HomeController.cs
index c31f3515..a701b201 100644
--- a/EssentialCSharp.Web/Controllers/HomeController.cs
+++ b/EssentialCSharp.Web/Controllers/HomeController.cs
@@ -44,8 +44,6 @@ public IActionResult Index()
         }
     }
 
-
-
     [Route("/TermsOfService",
        Name = "TermsOfService")]
     public IActionResult TermsOfService()
diff --git a/EssentialCSharp.Web/Services/SiteMappingService.cs b/EssentialCSharp.Web/Services/SiteMappingService.cs
index 64524be0..5c0f7137 100644
--- a/EssentialCSharp.Web/Services/SiteMappingService.cs
+++ b/EssentialCSharp.Web/Services/SiteMappingService.cs
@@ -1,6 +1,4 @@
 using System.Globalization;
-using EssentialCSharp.Common;
-using EssentialCSharp.Web.Models;
 
 namespace EssentialCSharp.Web.Services;
 

From e0b02ae92f85228dbba34f111508313cb297c577 Mon Sep 17 00:00:00 2001
From: Joshua Lester <jlester3@ewu.edu>
Date: Tue, 26 Nov 2024 12:08:23 -0800
Subject: [PATCH 07/11] Refactored and added testing

---
 EssentialCSharp.Web.Tests/SiteMappingTests.cs | 57 +++++++++++++++++++
 .../Extensions/SiteMappingListExtensions.cs   | 44 +++++++++++++-
 .../Services/ISiteMappingService.cs           |  1 -
 .../Services/SiteMappingService.cs            | 29 ----------
 .../Views/Shared/_Layout.cshtml               |  2 +-
 5 files changed, 101 insertions(+), 32 deletions(-)

diff --git a/EssentialCSharp.Web.Tests/SiteMappingTests.cs b/EssentialCSharp.Web.Tests/SiteMappingTests.cs
index cb2c8f52..bebdce99 100644
--- a/EssentialCSharp.Web.Tests/SiteMappingTests.cs
+++ b/EssentialCSharp.Web.Tests/SiteMappingTests.cs
@@ -82,4 +82,61 @@ public void FindCSyntaxFundamentalsSanitizedWithAnchorReturnsCorrectSiteMap()
         Assert.NotNull(foundSiteMap);
         Assert.Equivalent(CSyntaxFundamentalsSiteMapping, foundSiteMap);
     }
+
+    [Fact]
+    public void FindPercentComplete_KeyIsNull_ThrowsArgumentNullException()
+    {
+        // Arrange
+
+        // Act
+
+        // Assert
+        Assert.Throws<ArgumentNullException>(() =>
+        {
+            GetSiteMap().FindPercentComplete(null!);
+        });
+    }
+
+    [Theory]
+    [InlineData("   ")]
+    [InlineData("")]
+    public void FindPercentComplete_KeyIsWhiteSpace_ThrowsArgumentException(string key)
+    {
+        // Arrange
+
+        // Act
+
+        // Assert
+        Assert.Throws<ArgumentException>(() =>
+        {
+            GetSiteMap().FindPercentComplete(key);
+        });
+    }
+
+    [Theory]
+    [InlineData("hello-world", "50.00")]
+    [InlineData("c-syntax-fundamentals", "100.00")]
+    public void FindPercentComplete_ValidKey_Success(string key, string result)
+    {
+        // Arrange
+
+        // Act
+        string percent = GetSiteMap().FindPercentComplete(key);
+
+        // Assert
+        Assert.Equal(result, percent);
+    }
+
+    [Fact]
+    public void FindPercentComplete_EmptySiteMappings_ReturnsZeroPercent()
+    {
+        // Arrange
+        IList<SiteMapping> siteMappings = new List<SiteMapping>();
+
+        // Act
+        string percent = siteMappings.FindPercentComplete("test");
+
+        // Assert
+        Assert.Equal("0.00", percent);
+    }
 }
diff --git a/EssentialCSharp.Web/Extensions/SiteMappingListExtensions.cs b/EssentialCSharp.Web/Extensions/SiteMappingListExtensions.cs
index 28ae5643..fc59a483 100644
--- a/EssentialCSharp.Web/Extensions/SiteMappingListExtensions.cs
+++ b/EssentialCSharp.Web/Extensions/SiteMappingListExtensions.cs
@@ -1,4 +1,7 @@
-namespace EssentialCSharp.Web.Extensions;
+using EssentialCSharp.Common;
+using System.Globalization;
+
+namespace EssentialCSharp.Web.Extensions;
 
 public static class SiteMappingListExtensions
 {
@@ -23,4 +26,43 @@ public static class SiteMappingListExtensions
         }
         return null;
     }
+    /// <summary>
+    /// Finds percent complete based on a key.
+    /// </summary>
+    /// <param name="siteMappings">IList of SiteMappings</param>
+    /// <param name="key">If null, uses the first key in the list</param>
+    /// <returns>Returns a formatted double for use as the percent complete.</returns>
+    public static string FindPercentComplete(this IList<SiteMapping> siteMappings, string key)
+    {
+        ArgumentNullException.ThrowIfNullOrWhiteSpace(key);
+        int currentMappingCount = 0;
+        int overallMappingCount = 0;
+        bool currentPageFound = false;
+        IEnumerable<IGrouping<int, SiteMapping>> chapterGroupings = siteMappings.GroupBy(x => x.ChapterNumber).OrderBy(g => g.Key);
+        foreach (IGrouping<int, SiteMapping> chapterGrouping in chapterGroupings)
+        {
+            IEnumerable<IGrouping<int, SiteMapping>> pageGroupings = chapterGrouping.GroupBy(x => x.PageNumber).OrderBy(g => g.Key);
+            foreach (IGrouping<int, SiteMapping> pageGrouping in pageGroupings)
+            {
+                foreach (SiteMapping siteMapping in pageGrouping)
+                {
+                    if (!currentPageFound)
+                    {
+                        currentMappingCount++;
+                    }
+                    overallMappingCount++;
+                    if (siteMapping.Key == key)
+                    {
+                        currentPageFound = true;
+                    }
+                }
+            }
+        }
+        if (overallMappingCount is 0)
+        {
+            return "0.00";
+        }
+        double result = (double)currentMappingCount / overallMappingCount * 100;
+        return string.Format(CultureInfo.InvariantCulture, "{0:0.00}", result);
+    }
 }
diff --git a/EssentialCSharp.Web/Services/ISiteMappingService.cs b/EssentialCSharp.Web/Services/ISiteMappingService.cs
index 2c99b1af..f754eaa3 100644
--- a/EssentialCSharp.Web/Services/ISiteMappingService.cs
+++ b/EssentialCSharp.Web/Services/ISiteMappingService.cs
@@ -4,5 +4,4 @@ public interface ISiteMappingService
 {
     IList<SiteMapping> SiteMappings { get; }
     IEnumerable<SiteMappingDto> GetTocData();
-    string GetPercentComplete(string currentPageKey);
 }
diff --git a/EssentialCSharp.Web/Services/SiteMappingService.cs b/EssentialCSharp.Web/Services/SiteMappingService.cs
index 5c0f7137..c435d14f 100644
--- a/EssentialCSharp.Web/Services/SiteMappingService.cs
+++ b/EssentialCSharp.Web/Services/SiteMappingService.cs
@@ -49,33 +49,4 @@ private static IEnumerable<SiteMappingDto> GetItems(IEnumerable<SiteMapping> cha
                 Items = GetItems(chapterItems.SkipWhile(q => i.Keys.First() != q.Keys.First()).Skip(1), indentLevel + 1)
             });
     }
-
-    public string GetPercentComplete(string currentPageKey)
-    {
-        int currentMappingCount = 1;
-        int overallMappingCount = 1;
-        bool currentPageFound = false;
-        IEnumerable<IGrouping<int, SiteMapping>> chapterGroupings = SiteMappings.GroupBy(x => x.ChapterNumber).OrderBy(g => g.Key);
-        foreach (IGrouping<int, SiteMapping> chapterGrouping in chapterGroupings)
-        {
-            IEnumerable<IGrouping<int, SiteMapping>> pageGroupings = chapterGrouping.GroupBy(x => x.PageNumber).OrderBy(g => g.Key);
-            foreach (IGrouping<int, SiteMapping> pageGrouping in pageGroupings)
-            {
-                foreach (SiteMapping siteMapping in pageGrouping)
-                {
-                    if (siteMapping.Key == currentPageKey)
-                    {
-                        currentPageFound = true;
-                    }
-                    if (!currentPageFound)
-                    {
-                        currentMappingCount++;
-                    }
-                    overallMappingCount++;
-                }
-            }
-        }
-        double result = (double)currentMappingCount / overallMappingCount * 100;
-        return string.Format(CultureInfo.InvariantCulture, "{0:0.00}", result);
-    }
 }
diff --git a/EssentialCSharp.Web/Views/Shared/_Layout.cshtml b/EssentialCSharp.Web/Views/Shared/_Layout.cshtml
index 53a9cca3..35c28188 100644
--- a/EssentialCSharp.Web/Views/Shared/_Layout.cshtml
+++ b/EssentialCSharp.Web/Views/Shared/_Layout.cshtml
@@ -271,7 +271,7 @@
     <script>
         @{
             var tocData = _SiteMappings.GetTocData();
-            var percentComplete = _SiteMappings.GetPercentComplete(ViewBag.CurrentPageKey);
+            var percentComplete = _SiteMappings.SiteMappings.FindPercentComplete((string) ViewBag.CurrentPageKey);
         }
             PERCENT_COMPLETE = @Json.Serialize(percentComplete);
             PREVIOUS_PAGE = @Json.Serialize(ViewBag.PreviousPage)

From 0eb0f5f6b9194dff4a71d9c84b0bff409e24a1dc Mon Sep 17 00:00:00 2001
From: Joshua Lester <jlester3@ewu.edu>
Date: Tue, 26 Nov 2024 12:20:30 -0800
Subject: [PATCH 08/11] Adjust for when key is possibly null due to ViewBag

---
 EssentialCSharp.Web.Tests/SiteMappingTests.cs      | 14 ++++++--------
 .../Extensions/SiteMappingListExtensions.cs        | 11 +++++++++--
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/EssentialCSharp.Web.Tests/SiteMappingTests.cs b/EssentialCSharp.Web.Tests/SiteMappingTests.cs
index bebdce99..49aa74bd 100644
--- a/EssentialCSharp.Web.Tests/SiteMappingTests.cs
+++ b/EssentialCSharp.Web.Tests/SiteMappingTests.cs
@@ -89,18 +89,16 @@ public void FindPercentComplete_KeyIsNull_ThrowsArgumentNullException()
         // Arrange
 
         // Act
+        string? percent = GetSiteMap().FindPercentComplete(null!);
 
         // Assert
-        Assert.Throws<ArgumentNullException>(() =>
-        {
-            GetSiteMap().FindPercentComplete(null!);
-        });
+        Assert.Null(percent);
     }
 
     [Theory]
     [InlineData("   ")]
     [InlineData("")]
-    public void FindPercentComplete_KeyIsWhiteSpace_ThrowsArgumentException(string key)
+    public void FindPercentComplete_KeyIsWhiteSpace_ThrowsArgumentException(string? key)
     {
         // Arrange
 
@@ -116,12 +114,12 @@ public void FindPercentComplete_KeyIsWhiteSpace_ThrowsArgumentException(string k
     [Theory]
     [InlineData("hello-world", "50.00")]
     [InlineData("c-syntax-fundamentals", "100.00")]
-    public void FindPercentComplete_ValidKey_Success(string key, string result)
+    public void FindPercentComplete_ValidKey_Success(string? key, string result)
     {
         // Arrange
 
         // Act
-        string percent = GetSiteMap().FindPercentComplete(key);
+        string? percent = GetSiteMap().FindPercentComplete(key);
 
         // Assert
         Assert.Equal(result, percent);
@@ -134,7 +132,7 @@ public void FindPercentComplete_EmptySiteMappings_ReturnsZeroPercent()
         IList<SiteMapping> siteMappings = new List<SiteMapping>();
 
         // Act
-        string percent = siteMappings.FindPercentComplete("test");
+        string? percent = siteMappings.FindPercentComplete("test");
 
         // Assert
         Assert.Equal("0.00", percent);
diff --git a/EssentialCSharp.Web/Extensions/SiteMappingListExtensions.cs b/EssentialCSharp.Web/Extensions/SiteMappingListExtensions.cs
index fc59a483..2d9580b6 100644
--- a/EssentialCSharp.Web/Extensions/SiteMappingListExtensions.cs
+++ b/EssentialCSharp.Web/Extensions/SiteMappingListExtensions.cs
@@ -32,9 +32,16 @@ public static class SiteMappingListExtensions
     /// <param name="siteMappings">IList of SiteMappings</param>
     /// <param name="key">If null, uses the first key in the list</param>
     /// <returns>Returns a formatted double for use as the percent complete.</returns>
-    public static string FindPercentComplete(this IList<SiteMapping> siteMappings, string key)
+    public static string? FindPercentComplete(this IList<SiteMapping> siteMappings, string? key)
     {
-        ArgumentNullException.ThrowIfNullOrWhiteSpace(key);
+        if (key is null)
+        {
+            return null;
+        }
+        if (key.Trim().Length is 0)
+        {
+            throw new ArgumentException("Parameter key is whitespace or empty: ", nameof(key));
+        }
         int currentMappingCount = 0;
         int overallMappingCount = 0;
         bool currentPageFound = false;

From 47fe4d1c5c7142db6d41fb7ccc3ca30c7335a862 Mon Sep 17 00:00:00 2001
From: Benjamin Michaelis <git@relay.benjamin.michaelis.net>
Date: Thu, 10 Jul 2025 09:17:14 -0700
Subject: [PATCH 09/11] Renames `Key` property to `PrimaryKey`

Updates code to use `PrimaryKey` instead of `Key`
property in `SiteMapping` for identifying pages.

This change improves clarity and consistency by
using a more descriptive name for the primary key field.
---
 EssentialCSharp.Web/Controllers/HomeController.cs           | 2 +-
 EssentialCSharp.Web/Extensions/SiteMappingListExtensions.cs | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/EssentialCSharp.Web/Controllers/HomeController.cs b/EssentialCSharp.Web/Controllers/HomeController.cs
index a701b201..3495a7d6 100644
--- a/EssentialCSharp.Web/Controllers/HomeController.cs
+++ b/EssentialCSharp.Web/Controllers/HomeController.cs
@@ -30,7 +30,7 @@ public IActionResult Index()
 
             ViewBag.PageTitle = siteMapping.IndentLevel is 0 ? siteMapping.ChapterTitle + " " + siteMapping.RawHeading : siteMapping.RawHeading;
             ViewBag.NextPage = FlipPage(siteMapping!.ChapterNumber, siteMapping.PageNumber, true);
-            ViewBag.CurrentPageKey = siteMapping.Key;
+            ViewBag.CurrentPageKey = siteMapping.PrimaryKey;
             ViewBag.PreviousPage = FlipPage(siteMapping.ChapterNumber, siteMapping.PageNumber, false);
             ViewBag.HeadContents = headHtml;
             ViewBag.Contents = html;
diff --git a/EssentialCSharp.Web/Extensions/SiteMappingListExtensions.cs b/EssentialCSharp.Web/Extensions/SiteMappingListExtensions.cs
index 2d9580b6..659ebe93 100644
--- a/EssentialCSharp.Web/Extensions/SiteMappingListExtensions.cs
+++ b/EssentialCSharp.Web/Extensions/SiteMappingListExtensions.cs
@@ -1,5 +1,4 @@
-using EssentialCSharp.Common;
-using System.Globalization;
+using System.Globalization;
 
 namespace EssentialCSharp.Web.Extensions;
 
@@ -58,7 +57,7 @@ public static class SiteMappingListExtensions
                         currentMappingCount++;
                     }
                     overallMappingCount++;
-                    if (siteMapping.Key == key)
+                    if (siteMapping.PrimaryKey == key)
                     {
                         currentPageFound = true;
                     }

From 24d602a6e57d9fde6f5d69ac76f52f16abc837aa Mon Sep 17 00:00:00 2001
From: Benjamin Michaelis <git@relay.benjamin.michaelis.net>
Date: Thu, 10 Jul 2025 12:40:25 -0700
Subject: [PATCH 10/11] Handles null key in FindPercentComplete method

Modifies the FindPercentComplete method to return null
when the key is null.

Updates the unit test to reflect the change in behavior.

Updates styling for elements related to current page display.
---
 EssentialCSharp.Web.Tests/SiteMappingTests.cs               | 2 +-
 EssentialCSharp.Web/Extensions/SiteMappingListExtensions.cs | 4 ++--
 EssentialCSharp.Web/Views/Shared/_Layout.cshtml             | 4 ++--
 EssentialCSharp.Web/wwwroot/css/styles.css                  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/EssentialCSharp.Web.Tests/SiteMappingTests.cs b/EssentialCSharp.Web.Tests/SiteMappingTests.cs
index 49aa74bd..7a8d3688 100644
--- a/EssentialCSharp.Web.Tests/SiteMappingTests.cs
+++ b/EssentialCSharp.Web.Tests/SiteMappingTests.cs
@@ -84,7 +84,7 @@ public void FindCSyntaxFundamentalsSanitizedWithAnchorReturnsCorrectSiteMap()
     }
 
     [Fact]
-    public void FindPercentComplete_KeyIsNull_ThrowsArgumentNullException()
+    public void FindPercentComplete_KeyIsNull_ReturnsNull()
     {
         // Arrange
 
diff --git a/EssentialCSharp.Web/Extensions/SiteMappingListExtensions.cs b/EssentialCSharp.Web/Extensions/SiteMappingListExtensions.cs
index 659ebe93..87819228 100644
--- a/EssentialCSharp.Web/Extensions/SiteMappingListExtensions.cs
+++ b/EssentialCSharp.Web/Extensions/SiteMappingListExtensions.cs
@@ -29,7 +29,7 @@ public static class SiteMappingListExtensions
     /// Finds percent complete based on a key.
     /// </summary>
     /// <param name="siteMappings">IList of SiteMappings</param>
-    /// <param name="key">If null, uses the first key in the list</param>
+    /// <param name="key">The key to search for. If null, returns null.</param>
     /// <returns>Returns a formatted double for use as the percent complete.</returns>
     public static string? FindPercentComplete(this IList<SiteMapping> siteMappings, string? key)
     {
@@ -39,7 +39,7 @@ public static class SiteMappingListExtensions
         }
         if (key.Trim().Length is 0)
         {
-            throw new ArgumentException("Parameter key is whitespace or empty: ", nameof(key));
+            throw new ArgumentException("Parameter 'key' cannot be null or whitespace.", nameof(key));
         }
         int currentMappingCount = 0;
         int overallMappingCount = 0;
diff --git a/EssentialCSharp.Web/Views/Shared/_Layout.cshtml b/EssentialCSharp.Web/Views/Shared/_Layout.cshtml
index 35c28188..4f7d1198 100644
--- a/EssentialCSharp.Web/Views/Shared/_Layout.cshtml
+++ b/EssentialCSharp.Web/Views/Shared/_Layout.cshtml
@@ -121,10 +121,10 @@
                         </div>
                     </div>
 
-                    <a v-if="chapterParentPage" :href="chapterParentPage.href" class="menu menu-chapter-title text-light">
+                    <a v-if="chapterParentPage" :href="chapterParentPage.href" class="page-menu menu-chapter-title text-light">
                         <span v-cloak>{{chapterParentPage.title}}</span>
                     </a>
-                    <div class="menu menu-progress text-light" v-if="isContentPage">
+                    <div class="page-menu menu-progress text-light" v-if="isContentPage">
                         <span v-cloak>{{percentComplete}}%</span>
                     </div>
 
diff --git a/EssentialCSharp.Web/wwwroot/css/styles.css b/EssentialCSharp.Web/wwwroot/css/styles.css
index 7def90df..f0b46c6c 100644
--- a/EssentialCSharp.Web/wwwroot/css/styles.css
+++ b/EssentialCSharp.Web/wwwroot/css/styles.css
@@ -224,7 +224,7 @@ a:hover {
   }
 }
 
-.menu {
+.page-menu {
   white-space: nowrap;
   overflow: hidden;
   text-decoration: none;

From 402ee6a0f4b11349453b45ce29d884117cdfd9ce Mon Sep 17 00:00:00 2001
From: Benjamin Michaelis <git@relay.benjamin.michaelis.net>
Date: Thu, 10 Jul 2025 12:59:07 -0700
Subject: [PATCH 11/11] Guarantees zero percent on missing sitemap key

Ensures that the FindPercentComplete method returns "0.00"
when a key is not found in the sitemap, preventing potential
incorrect calculations or errors.
---
 EssentialCSharp.Web.Tests/SiteMappingTests.cs        | 12 ++++++++++++
 .../Extensions/SiteMappingListExtensions.cs          |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/EssentialCSharp.Web.Tests/SiteMappingTests.cs b/EssentialCSharp.Web.Tests/SiteMappingTests.cs
index 7a8d3688..cf4c2c34 100644
--- a/EssentialCSharp.Web.Tests/SiteMappingTests.cs
+++ b/EssentialCSharp.Web.Tests/SiteMappingTests.cs
@@ -137,4 +137,16 @@ public void FindPercentComplete_EmptySiteMappings_ReturnsZeroPercent()
         // Assert
         Assert.Equal("0.00", percent);
     }
+
+    [Fact]
+    public void FindPercentComplete_KeyNotFound_ReturnsZeroPercent()
+    {
+        // Arrange
+
+        // Act
+        string? percent = GetSiteMap().FindPercentComplete("non-existent-key");
+
+        // Assert
+        Assert.Equal("0.00", percent);
+    }
 }
diff --git a/EssentialCSharp.Web/Extensions/SiteMappingListExtensions.cs b/EssentialCSharp.Web/Extensions/SiteMappingListExtensions.cs
index 87819228..617f5517 100644
--- a/EssentialCSharp.Web/Extensions/SiteMappingListExtensions.cs
+++ b/EssentialCSharp.Web/Extensions/SiteMappingListExtensions.cs
@@ -64,10 +64,11 @@ public static class SiteMappingListExtensions
                 }
             }
         }
-        if (overallMappingCount is 0)
+        if (overallMappingCount is 0 || !currentPageFound)
         {
             return "0.00";
         }
+
         double result = (double)currentMappingCount / overallMappingCount * 100;
         return string.Format(CultureInfo.InvariantCulture, "{0:0.00}", result);
     }