Reimplemented it to account for bug

Author: Joshua-Lester3

EssentialCSharp.Web/Services/ISiteMappingService.cs

@@ -3,4 +3,5 @@
 public interface ISiteMappingService
 {
     IList<SiteMapping> SiteMappings { get; }
+    string GetPercentComplete(string currentPageKey);
 }

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,4 +14,33 @@ 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 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);
+    }
 }

EssentialCSharp.Web/Views/Shared/_Layout.cshtml

@@ -123,8 +123,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">
@@ -295,35 +295,10 @@
                 Title = $"Chapter {x.Key}: {x.First().ChapterTitle}",
                 Items = GetItems(x, 1)
             });
-            var groupedTocData = _SiteMappings.SiteMappings.DistinctBy(x => (x.ChapterNumber, x.PageNumber)).GroupBy(x => x.ChapterNumber).OrderBy(x => x.Key);
-            int currentPageCount = 1;
-            int overallCount = 1;
-            bool currentPageFound = false;
-            List<string> keyList = new();
 
-            // Loop through each SiteMapping and increment the overallCount, 
-            // currentPageFound (until you reach it), and build keyList out
-            foreach (IGrouping<int, SiteMapping> group in groupedTocData)
-            {
-                var orderedGroup = group.OrderBy(x => x.PageNumber);
-                foreach (SiteMapping siteMapping in orderedGroup)
-                {
-                    if (siteMapping.Key == ViewBag.CurrentPageKey)
-                    {
-                        currentPageFound = true;
-                    }
-                    if (!currentPageFound)
-                    {
-                        currentPageCount++;
-                    }
-                    keyList.Add(siteMapping.Key);
-                    overallCount++;
-                }
-            }
+            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)

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:
@@ -195,9 +194,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);
 
@@ -260,6 +257,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) {
@@ -316,14 +318,13 @@ const app = createApp({
             tocData,
             expandedTocs,
             currentPage,
-            currentPageCount,
-            totalPageCount,
-            keyList,
+            percentComplete,
             chapterParentPage,
 
             searchQuery,
             filteredTocData,
-            enableTocFilter
+            enableTocFilter,
+            isContentPage
         };
     },
 });