Attempted to fix reading plan issues but it still

needs more work

Author: jd-code76

README.md

@@ -12,7 +12,7 @@ Access the site here: [https://provinent.org](https://provinent.org)
 - **Multi-Translation Support**: ASV, KJV, GNV, BSB, NET
 - **Verse Highlighting**: Right-click verses to highlight in 6 different colors for study emphasis
 - **Study Notes**: Full Markdown support with live preview and export capabilities
-- **Original Language Tools**: Click any verse for Strong's Concordance data (provided by [STEP Bible](https://www.stepbible.org))and Greek/Hebrew interlinear analysis (provided by [Bible Hub](https://biblehub.com/interlinear/))
+- **Original Language Tools**: Click any verse for Strong's Concordance data (provided by [STEP Bible](https://www.stepbible.org)) and Greek/Hebrew interlinear analysis (provided by [Bible Hub](https://biblehub.com/interlinear/))
 - **Reference Panel**: Side-by-side Bible comparison with multiple translation options (NASB 1995, NASB 2020, ASV, KJV, ESV, GNV, BSB, NET, CSB, NIV, NKJV, and NLT)
 
 ### Advanced Features

main.js

@@ -507,7 +507,7 @@ function renderHighlights(filterColor = 'all') {
             `;
         });
     });
-    highlightsList.innerHTML = html || '<div class="no-highlights">No highlights match the selected filter.</div>';
+    highlightsList.innerHTML = html || '<div class="no-highlights">No highlights match the selected filter</div>';
     document.querySelectorAll('.highlight-item').forEach(item => {
         item.addEventListener('click', () => {
             const reference = item.dataset.reference;

modules/navigation.js

@@ -121,120 +121,120 @@ export function initBookChapterControls() {
     });
     populateChapterDropdown(BOOK_ORDER[0]);
 }
-export function manualPrevChapter() {
-    let bookIdx = BOOK_ORDER.indexOf(state.settings.manualBook);
-    let chap = state.settings.manualChapter;
-    let nextBook = state.settings.manualBook;
-    let nextChapter = chap;
-    if (chap > 1) {
-        nextChapter = chap - 1;
-    } else {
-        if (bookIdx > 0) {
-            const prevBook = BOOK_ORDER[bookIdx - 1];
-            const maxCh = CHAPTER_COUNTS[prevBook];
-            nextBook = prevBook;
-            nextChapter = maxCh;
-        } else {
-            return;
+export async function randomPassage() {
+    try {
+        state.settings.readingMode = 'manual';
+        const randomLoc = await getRandomBibleLocation();
+        state.settings.manualBook = randomLoc.book;
+        state.settings.manualChapter = randomLoc.chapter;
+        const translation = getCurrentTranslation();
+        updateURL(translation, randomLoc.book, randomLoc.chapter);
+        saveToStorage();
+        await loadPassageFromAPI(randomLoc);
+        document.getElementById('passageReference').textContent = randomLoc.displayRef;
+        state.currentPassageReference = randomLoc.displayRef;
+        syncBookChapterSelectors();
+        if (state.settings.referencePanelOpen) {
+            updateReferencePanel();
         }
-    }
-    state.settings.manualBook = nextBook;
-    state.settings.manualChapter = nextChapter;
-    state.settings.readingMode = 'manual';
-    const translation = getCurrentTranslation();
-    updateURL(translation, nextBook, nextChapter);
-    const displayRef = `${nextBook} ${nextChapter}`;
-    document.getElementById('passageReference').textContent = displayRef;
-    state.currentPassageReference = displayRef;
-    loadSelectedChapter(nextBook, nextChapter);
-    syncBookChapterSelectors();
-    saveToStorage();
-    if (state.settings.referencePanelOpen) {
-        updateReferencePanel();
+    } catch (err) {
+        handleError(err, 'randomPassage');
+        showError('Could not load a random passage – see console for details.');
     }
 }
-export function manualNextChapter() {
-    let bookIdx = BOOK_ORDER.indexOf(state.settings.manualBook);
-    let chap = state.settings.manualChapter;
-    const maxCh = CHAPTER_COUNTS[state.settings.manualBook];
-    let nextBook = state.settings.manualBook;
-    let nextChapter = chap;
-    if (chap < maxCh) {
-        nextChapter = chap + 1;
+export function nextPassage() {
+    if (state.settings.readingMode === 'readingPlan') {
+        const plan = getActivePlan();
+        const len = plan.length;
+        let newIndex = (state.settings.currentPassageIndex + 1) % len;
+        if (newIndex < 0) newIndex = len - 1;
+        state.settings.currentPassageIndex = newIndex;
+        const passage = plan[newIndex];
+        const translation = getCurrentTranslation();
+        updateURL(translation, passage.book, passage.chapter);
+        updateUIMode('readingPlan', translation, passage.displayRef);
+        loadPassage(passage.book, passage.chapter, translation);
+        syncSelectorsToReadingPlan();
     } else {
-        if (bookIdx < BOOK_ORDER.length - 1) {
-            const newBook = BOOK_ORDER[bookIdx + 1];
-            nextBook = newBook;
+        let bookIdx = BOOK_ORDER.indexOf(state.settings.manualBook);
+        let chap = state.settings.manualChapter;
+        const maxCh = CHAPTER_COUNTS[state.settings.manualBook];
+        let nextBook = state.settings.manualBook;
+        let nextChapter = chap;
+        if (chap < maxCh) {
+            nextChapter = chap + 1;
+        } else if (bookIdx < BOOK_ORDER.length - 1) {
+            nextBook = BOOK_ORDER[bookIdx + 1];
             nextChapter = 1;
         } else {
             return;
         }
+        updateManualNavigation(nextBook, nextChapter);
     }
-    state.settings.manualBook = nextBook;
-    state.settings.manualChapter = nextChapter;
-    state.settings.readingMode = 'manual';
-    const translation = getCurrentTranslation();
-    updateURL(translation, nextBook, nextChapter);
-    const displayRef = `${nextBook} ${nextChapter}`;
-    document.getElementById('passageReference').textContent = displayRef;
-    state.currentPassageReference = displayRef;
-    loadSelectedChapter(nextBook, nextChapter);
-    syncBookChapterSelectors();
-    saveToStorage();
-    if (state.settings.referencePanelOpen) {
-        updateReferencePanel();
-    }
+    document.getElementById('scriptureSection').scrollTop = 0;
 }
 export function prevPassage() {
     if (state.settings.readingMode === 'readingPlan') {
-        const len = getActivePlan().length;
+        const plan = getActivePlan();
+        const len = plan.length;
         let newIndex = (state.settings.currentPassageIndex - 1 + len) % len;
         state.settings.currentPassageIndex = newIndex;
-        const plan = getActivePlan();
         const passage = plan[newIndex];
         const translation = getCurrentTranslation();
         updateURL(translation, passage.book, passage.chapter);
+        updateUIMode('readingPlan', translation, passage.displayRef);
         loadPassage(passage.book, passage.chapter, translation);
+        syncSelectorsToReadingPlan();
     } else {
-        manualPrevChapter();
+        let bookIdx = BOOK_ORDER.indexOf(state.settings.manualBook);
+        let chap = state.settings.manualChapter;
+        let nextBook = state.settings.manualBook;
+        let nextChapter = chap;
+        if (chap > 1) {
+            nextChapter = chap - 1;
+        } else if (bookIdx > 0) {
+            const prevBook = BOOK_ORDER[bookIdx - 1];
+            nextBook = prevBook;
+            nextChapter = CHAPTER_COUNTS[prevBook];
+        } else {
+            return;
+        }
+        updateManualNavigation(nextBook, nextChapter);
     }
     document.getElementById('scriptureSection').scrollTop = 0;
 }
-export function nextPassage() {
-    if (state.settings.readingMode === 'readingPlan') {
-        const len = getActivePlan().length;
-        let newIndex = (state.settings.currentPassageIndex + 1) % len;
-        if (newIndex < 0) newIndex = len - 1;
-        state.settings.currentPassageIndex = newIndex;
-        const plan = getActivePlan();
-        const passage = plan[newIndex];
-        const translation = getCurrentTranslation();
-        updateURL(translation, passage.book, passage.chapter);
-        loadPassage(passage.book, passage.chapter, translation);
-    } else {
-        manualNextChapter();
+function updateManualNavigation(book, chapter) {
+    state.settings.readingMode = 'manual';
+    state.settings.manualBook = book;
+    state.settings.manualChapter = chapter;
+    const translation = getCurrentTranslation();
+    updateURL(translation, book, chapter);
+    const displayRef = `${book} ${chapter}`;
+    updateUIMode('manual', translation, displayRef);
+    loadSelectedChapter(book, chapter);
+    syncBookChapterSelectors();
+    saveToStorage();
+    if (state.settings.referencePanelOpen) {
+        updateReferencePanel();
     }
-    document.getElementById('scriptureSection').scrollTop = 0;
 }
-export async function randomPassage() {
-    try {
-        state.settings.readingMode = 'manual';
-        const randomLoc = await getRandomBibleLocation();
-        state.settings.manualBook = randomLoc.book;
-        state.settings.manualChapter = randomLoc.chapter;
-        const translation = getCurrentTranslation();
-        updateURL(translation, randomLoc.book, randomLoc.chapter);
-        saveToStorage();
-        await loadPassageFromAPI(randomLoc);
-        document.getElementById('passageReference').textContent = randomLoc.displayRef;
-        state.currentPassageReference = randomLoc.displayRef;
-        syncBookChapterSelectors();
-        if (state.settings.referencePanelOpen) {
-            updateReferencePanel();
+function updateUIMode(mode, translation, displayRef) {
+    const headerTitleEl = document.getElementById('passageHeaderTitle');
+    const planLabelEl = document.getElementById('planLabel');
+    const passageRefElement = document.getElementById('passageReference');
+    if (headerTitleEl) {
+        headerTitleEl.textContent = `Holy Bible: ${translation}`;
+    }
+    if (passageRefElement) {
+        passageRefElement.textContent = displayRef;
+        state.currentPassageReference = displayRef;
+    }
+    if (planLabelEl) {
+        if (mode === 'readingPlan') {
+            planLabelEl.textContent = `Reading plan: ${getCurrentPlanLabel()}`;
+        } else {
+            planLabelEl.textContent = '';
         }
-    } catch (err) {
-        handleError(err, 'randomPassage');
-        showError('Could not load a random passage – see console for details.');
     }
 }
 export function syncBookChapterSelectors() {
@@ -339,7 +339,7 @@ export function navigateFromURL() {
     return false;
 }
 function loadDefaultPassage(params) {
-    state.settings.readingMode = 'manual';
+    state.settings.readingMode = 'readingPlan';
     state.settings.manualBook = params.book;
     state.settings.manualChapter = params.chapter;
     state.settings.bibleTranslation = params.translation;
@@ -362,32 +362,22 @@ function loadDefaultPassage(params) {
     loadSelectedChapter(params.book, params.chapter);
     return true;
 }
-function updateNavigation(book, chapter, translation) {
-    updateURL(translation, book, chapter);
-}
 export function setupPopStateListener() {
-    window.addEventListener('popstate', (event) => {
-        if (event.state) {
-            const { translation, book, chapter } = event.state;
-            loadPassage(book, chapter, translation);
-        } else {
-            navigateFromURL();
-        }
-    });
+    window.addEventListener('popstate', navigateFromURL);
 }
 export function setupNavigationWithURL() {
     document.getElementById('bookSelect').addEventListener('change', (e) => {
         const book = e.target.value;
-        const chapter = 1; 
+        const chapter = 1;
         const translation = getCurrentTranslation();
-        updateNavigation(book, chapter, translation);
-        loadPassage(book, chapter, translation);
+        updateURL(translation, book, chapter);
+        loadSelectedChapter(book, chapter);
     });
     document.getElementById('chapterSelect').addEventListener('change', (e) => {
         const book = document.getElementById('bookSelect').value;
         const chapter = parseInt(e.target.value);
         const translation = getCurrentTranslation();
-        updateNavigation(book, chapter, translation);
-        loadPassage(book, chapter, translation);
+        updateURL(translation, book, chapter);
+        loadSelectedChapter(book, chapter);
     });
 }

modules/passage.js

@@ -248,6 +248,9 @@ export async function loadPassage(book = null, chapter = null, translation = nul
     if (window._isLoadingPassage) {
         return;
     }
+    if (!book && !chapter && state.settings.readingMode === 'manual') {
+        return;
+    }
     window._isLoadingPassage = true;
     try {
         if (book && chapter) {

modules/settings.js

@@ -102,7 +102,7 @@ export function resumeReadingPlan() {
         state.settings.currentPassageIndex = idx;
     }
     state.settings.readingMode = 'readingPlan';
-    loadPassage();   
+    loadPassage();
 }
 function findReadingPlanIndex(book, chapter) {
    for (let i = 0; i < readingPlan.length; i++) {
@@ -180,6 +180,10 @@ export function restartReadingPlan() {
         saveToStorage();
         loadPassage();
         alert('Reading plan restarted – you are now at the beginning.');
+        const curBook    = state.settings.manualBook;
+        const curChapter = state.settings.manualChapter;
+        const translation = getCurrentTranslation();
+        updateURL(translation, curBook, curChapter);
     }
 }
 export async function clearCache() {

modules/state.js

@@ -1,6 +1,6 @@
 import { handleError } from '../main.js'
 import { loadPDFFromIndexedDB } from './pdf.js'
-export const APP_VERSION = '1.1.03.2025.11.06';
+export const APP_VERSION = '1.1.04.2025.11.06';
 let saveTimeout = null;
 const SAVE_DEBOUNCE_MS = 500;
 export const BOOK_ORDER = [

src/main.js

@@ -214,14 +214,12 @@ function setupEventListeners() {
 
     // Bible Gateway search button (dynamic translation searching)
     document.getElementById('referenceTranslation').addEventListener('change', function() {
-        // Update the state temporarily for Bible Gateway
         const tempTranslation = this.value;
         const oldTranslation = state.settings.referenceVersion;
         state.settings.referenceVersion = tempTranslation;
 
         updateBibleGatewayVersion();
 
-        // Restore the original translation (since settings aren't saved yet)
         state.settings.referenceVersion = oldTranslation;
     });
 
@@ -248,7 +246,6 @@ function setupEventListeners() {
         if (!state.pdf.doc || state.pdf.currentPage <= 1) return;
 
         try {
-            // Cancel any current rendering
             if (state.pdf.renderTask) {
                 await state.pdf.renderTask.cancel();
                 state.pdf.renderTask = null;
@@ -258,7 +255,6 @@ function setupEventListeners() {
             await renderPage(state.pdf.currentPage);
         } catch (err) {
             console.warn('Error navigating to previous page:', err);
-            // If there's an error, reload the PDF
             await loadPDF();
         }
     });
@@ -711,7 +707,7 @@ function renderHighlights(filterColor = 'all') {
         });
     });
 
-    highlightsList.innerHTML = html || '<div class="no-highlights">No highlights match the selected filter.</div>';
+    highlightsList.innerHTML = html || '<div class="no-highlights">No highlights match the selected filter</div>';
 
     // Add click handlers to navigate to verses
     document.querySelectorAll('.highlight-item').forEach(item => {
@@ -874,11 +870,8 @@ async function init() {
     // Start periodic updates
     setInterval(updateDateTime, 1_000);
 
-    // Only load default passage if we didn't navigate from URL
     const navigatedFromURL = navigateFromURL();
     if (!navigatedFromURL) {
-        // Only load default passage if URL navigation didn't happen
-        // AND we're not at the root path (which should have been redirected)
         if (window.location.pathname !== '/') {
             loadPassage();
         }