From 6d452c7f725d35a35c6d037120b49eca359642a0 Mon Sep 17 00:00:00 2001
From: Gerald Schmittinger <gerald.schmittinger@ugent.be>
Date: Wed, 16 Apr 2025 11:42:13 +0200
Subject: [PATCH] fix: diverse kleine bugs

Bij het zoeken van leerpaden en het renderen van leerobjecten.
---
 .../multiple-choice-question-renderer.ts        |  2 +-
 .../test_essay_question/content.txt             |  2 +-
 .../test_essay_question/rendering.txt           |  2 +-
 .../test_multiple_choice/content.txt            |  2 +-
 .../test_multiple_choice/rendering.txt          |  6 +++---
 .../content/learning-paths.testdata.ts          |  4 ++--
 backend/tool/seed.ts                            | 17 +++--------------
 frontend/src/controllers/learning-paths.ts      |  4 ++--
 frontend/src/queries/learning-paths.ts          |  6 ++++--
 .../learning-paths/LearningPathSearchPage.vue   |  4 ++--
 10 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/backend/src/services/learning-objects/processing/gift/question-renderers/multiple-choice-question-renderer.ts b/backend/src/services/learning-objects/processing/gift/question-renderers/multiple-choice-question-renderer.ts
index 9b09004f..40afdbd5 100644
--- a/backend/src/services/learning-objects/processing/gift/question-renderers/multiple-choice-question-renderer.ts
+++ b/backend/src/services/learning-objects/processing/gift/question-renderers/multiple-choice-question-renderer.ts
@@ -14,7 +14,7 @@ export class MultipleChoiceQuestionRenderer extends GIFTQuestionRenderer<Multipl
         for (const choice of question.choices) {
             renderedHtml += `<div class="gift-choice-div">\n`;
             renderedHtml += `    <input type='radio' id='gift-q${questionNumber}-choice-${i}' name='gift-q${questionNumber}-choices' value="${i}"/>\n`;
-            renderedHtml += `    <label for='gift-q${questionNumber}-choice-${i}'>${choice.text}</label>\n`;
+            renderedHtml += `    <label for='gift-q${questionNumber}-choice-${i}'>${choice.text.text}</label>\n`;
             renderedHtml += `</div>\n`;
             i++;
         }
diff --git a/backend/tests/test_assets/content/learning-object-resources/test_essay_question/content.txt b/backend/tests/test_assets/content/learning-object-resources/test_essay_question/content.txt
index aa634cbd..0e9fa7de 100644
--- a/backend/tests/test_assets/content/learning-object-resources/test_essay_question/content.txt
+++ b/backend/tests/test_assets/content/learning-object-resources/test_essay_question/content.txt
@@ -1,2 +1,2 @@
-::MC basic::
+::Reflection::
 Reflect on this learning path. What have you learned today? {}
diff --git a/backend/tests/test_assets/content/learning-object-resources/test_essay_question/rendering.txt b/backend/tests/test_assets/content/learning-object-resources/test_essay_question/rendering.txt
index 94a5ab79..46f605bd 100644
--- a/backend/tests/test_assets/content/learning-object-resources/test_essay_question/rendering.txt
+++ b/backend/tests/test_assets/content/learning-object-resources/test_essay_question/rendering.txt
@@ -1,6 +1,6 @@
 <div class="learning-object-gift">
     <div id="gift-q1" class="gift-question">
-        <h2 id="gift-q1-title" class="gift-title">MC basic</h2>
+        <h2 id="gift-q1-title" class="gift-title">Reflection</h2>
         <p id="gift-q1-stem" class="gift-stem">Reflect on this learning path. What have you learned today?</p>
         <textarea id="gift-q1-answer" class="gift-essay-answer"></textarea>
     </div>
diff --git a/backend/tests/test_assets/content/learning-object-resources/test_multiple_choice/content.txt b/backend/tests/test_assets/content/learning-object-resources/test_multiple_choice/content.txt
index 98b7c9c3..4c2ba46e 100644
--- a/backend/tests/test_assets/content/learning-object-resources/test_multiple_choice/content.txt
+++ b/backend/tests/test_assets/content/learning-object-resources/test_multiple_choice/content.txt
@@ -1,4 +1,4 @@
-::MC basic::
+::Self-evaluation::
 Are you following along well?  {
 	~No, it's very difficult to follow along.
     =Yes, no problem!
diff --git a/backend/tests/test_assets/content/learning-object-resources/test_multiple_choice/rendering.txt b/backend/tests/test_assets/content/learning-object-resources/test_multiple_choice/rendering.txt
index 9c56f40b..8c94b4f2 100644
--- a/backend/tests/test_assets/content/learning-object-resources/test_multiple_choice/rendering.txt
+++ b/backend/tests/test_assets/content/learning-object-resources/test_multiple_choice/rendering.txt
@@ -1,14 +1,14 @@
 <div class="learning-object-gift">
     <div id="gift-q1" class="gift-question">
-        <h2 id="gift-q1-title" class="gift-title">MC basic</h2>
+        <h2 id="gift-q1-title" class="gift-title">Self-evaluation</h2>
         <p id="gift-q1-stem" class="gift-stem">Are you following along well?</p>
         <div class="gift-choice-div">
             <input value="0" name="gift-q1-choices" id="gift-q1-choice-0" type="radio">
-            <label for="gift-q1-choice-0">[object Object]</label>
+            <label for="gift-q1-choice-0">No, it's very difficult to follow along.</label>
         </div>
         <div class="gift-choice-div">
             <input value="1" name="gift-q1-choices" id="gift-q1-choice-1" type="radio">
-            <label for="gift-q1-choice-1">[object Object]</label>
+            <label for="gift-q1-choice-1">Yes, no problem!</label>
         </div>
     </div>
 </div>
diff --git a/backend/tests/test_assets/content/learning-paths.testdata.ts b/backend/tests/test_assets/content/learning-paths.testdata.ts
index 117f0341..17dc2c30 100644
--- a/backend/tests/test_assets/content/learning-paths.testdata.ts
+++ b/backend/tests/test_assets/content/learning-paths.testdata.ts
@@ -31,7 +31,7 @@ const nowString = new Date().toString();
 export const testLearningPath01: LearningPathDTO = {
     keywords: "test",
     target_ages: [16, 17, 18],
-    hruid: "id01",
+    hruid: `${getEnvVar(envVars.UserContentPrefix)}id01`,
     language: Language.English,
     title: "repertoire Tool",
     description: "all about Tool",
@@ -67,7 +67,7 @@ export const testLearningPath01: LearningPathDTO = {
 export const testLearningPath02: LearningPathDTO = {
     keywords: "test",
     target_ages: [16, 17, 18],
-    hruid: "id02",
+    hruid: `${getEnvVar(envVars.UserContentPrefix)}id02`,
     language: Language.English,
     title: "repertoire Dire Straits",
     description: "all about Dire Straits",
diff --git a/backend/tool/seed.ts b/backend/tool/seed.ts
index 393f9721..259bccb7 100644
--- a/backend/tool/seed.ts
+++ b/backend/tool/seed.ts
@@ -51,22 +51,11 @@ export async function seedDatabase(): Promise<void> {
 
 
     // Persist all entities
-    /*await em.persistAndFlush([
+    await em.persistAndFlush([
         ...students,
         ...teachers,
         ...learningObjects,
-    ]);*/
-
-    try {
-        await em.persistAndFlush(learningPaths[0]);
-    } catch (e) {
-        "hey";
-    }
-    /*await em.persistAndFlush(learningPaths[1]);
-    await em.persistAndFlush(learningPaths[2]);
-    await em.persistAndFlush(learningPaths[3]);
-
-    await em.persistAndFlush([
+        ...learningPaths,
         ...classes,
         ...assignments,
         ...groups,
@@ -76,7 +65,7 @@ export async function seedDatabase(): Promise<void> {
         ...questions,
         ...answers,
         ...submissions,
-    ])*/
+    ]);
 
     logger.info('Development database seeded successfully!');
 
diff --git a/frontend/src/controllers/learning-paths.ts b/frontend/src/controllers/learning-paths.ts
index 15967d28..e1aeda3e 100644
--- a/frontend/src/controllers/learning-paths.ts
+++ b/frontend/src/controllers/learning-paths.ts
@@ -8,8 +8,8 @@ export class LearningPathController extends BaseController {
     constructor() {
         super("learningPath");
     }
-    async search(query: string): Promise<LearningPath[]> {
-        const dtos = await this.get<LearningPathDTO[]>("/", { search: query });
+    async search(query: string, language: string): Promise<LearningPath[]> {
+        const dtos = await this.get<LearningPathDTO[]>("/", { search: query, language });
         return dtos.map((dto) => LearningPath.fromDTO(dto));
     }
     async getBy(
diff --git a/frontend/src/queries/learning-paths.ts b/frontend/src/queries/learning-paths.ts
index 3d8e6fcf..e7fefc34 100644
--- a/frontend/src/queries/learning-paths.ts
+++ b/frontend/src/queries/learning-paths.ts
@@ -34,12 +34,14 @@ export function useGetAllLearningPathsByThemeQuery(
 
 export function useSearchLearningPathQuery(
     query: MaybeRefOrGetter<string | undefined>,
+    language: MaybeRefOrGetter<string | undefined>
 ): UseQueryReturnType<LearningPath[], Error> {
     return useQuery({
-        queryKey: [LEARNING_PATH_KEY, "search", query],
+        queryKey: [LEARNING_PATH_KEY, "search", query, language],
         queryFn: async () => {
             const queryVal = toValue(query)!;
-            return learningPathController.search(queryVal);
+            const languageVal = toValue(language)!;
+            return learningPathController.search(queryVal, languageVal);
         },
         enabled: () => Boolean(toValue(query)),
     });
diff --git a/frontend/src/views/learning-paths/LearningPathSearchPage.vue b/frontend/src/views/learning-paths/LearningPathSearchPage.vue
index 44bc0306..4e2c6475 100644
--- a/frontend/src/views/learning-paths/LearningPathSearchPage.vue
+++ b/frontend/src/views/learning-paths/LearningPathSearchPage.vue
@@ -9,11 +9,11 @@
     import LearningPathsGrid from "@/components/LearningPathsGrid.vue";
 
     const route = useRoute();
-    const { t } = useI18n();
+    const { t, locale } = useI18n();
 
     const query = computed(() => route.query.query as string | undefined);
 
-    const searchQueryResults = useSearchLearningPathQuery(query);
+    const searchQueryResults = useSearchLearningPathQuery(query, locale);
 </script>
 
 <template>