On quiz lock screen, dependent quiz name displays instead of ID

sillsdev · Aug 9, 2024 · 2b71e91 · 2b71e91
1 parent f4b32d2
commit 2b71e91
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/routes/quiz/[collection]/[id]/+page.js b/src/routes/quiz/[collection]/[id]/+page.js
@@ -7,7 +7,8 @@ export async function load({ params, fetch }) {
     const id = params.id;
     const collection = params.collection;
 
-    const book = config.bookCollections.find((x) => x.id === collection).books.find((x) => x.id === id);
+    const bookCollection = config.bookCollections.find((x) => x.id === collection);
+    const book = bookCollection.books.find((x) => x.id === id);
 
     let locked = false;
     let dependentQuizId = null;
@@ -17,6 +18,10 @@ export async function load({ params, fetch }) {
         const accessGranted = await checkQuizAccess(dependentQuizId);
         locked = !accessGranted;
     }
+    if (locked) {
+        const dependentBook = bookCollection.books.find((x) => x.id === dependentQuizId);
+        dependentQuizName = dependentBook ? dependentBook.name : dependentQuizId;
+    }
 
     if (!locked) {
         try {

diff --git a/src/routes/quiz/[collection]/[id]/+page.svelte b/src/routes/quiz/[collection]/[id]/+page.svelte
@@ -334,9 +334,9 @@
         <div class="quiz-locked">
             <div class="quiz-locked-title">{data.quizId}</div>
             <div class="quiz-locked-message">
-                Before accessing this quiz, you need to pass the following quizzes:
+                Before accessing this quiz, you need to pass the following quiz:
             </div>
-            <div class="quiz-locked-name">{dependentQuizId}</div>
+            <div class="quiz-locked-name">{data.dependentQuizName || data.dependentQuizId}</div>
         </div>
     {:else if questionNum == quizQuestions.length}
         <div class="score">