tdpeuter/2025SELab2-project-Dwengo
tdpeuter/2025SELab2-project-Dwengo
1
Fork 0
Code Issues Releases 4 Packages 2 Wiki Activity

fix: diverse kleine bugs

Browse source 
Bij het zoeken van leerpaden en het renderen van leerobjecten.
This commit is contained in:
Gerald Schmittinger 2025-04-16 11:42:13 +02:00
parent a803b45046
commit 6d452c7f72
10 changed files with 20 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/src/services/learning-objects/processing/gift/question-renderers/multiple-choice-question-renderer.ts
View file

@ -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++;
}

2
backend/tests/test_assets/content/learning-object-resources/test_essay_question/content.txt
View file

@ -1,2 +1,2 @@
::MC basic::
::Reflection::
Reflect on this learning path. What have you learned today? {}

2
backend/tests/test_assets/content/learning-object-resources/test_essay_question/rendering.txt
View file

@ -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>

2
backend/tests/test_assets/content/learning-object-resources/test_multiple_choice/content.txt
View file

@ -1,4 +1,4 @@
::MC basic::
::Self-evaluation::
Are you following along well? {
~No, it's very difficult to follow along.
=Yes, no problem!

6
backend/tests/test_assets/content/learning-object-resources/test_multiple_choice/rendering.txt
View file

@ -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>

4
backend/tests/test_assets/content/learning-paths.testdata.ts
View file

@ -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",

17
backend/tool/seed.ts
View file

@ -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!');

4
frontend/src/controllers/learning-paths.ts
View file

@ -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(

6
frontend/src/queries/learning-paths.ts
View file

@ -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)),
});

4
frontend/src/views/learning-paths/LearningPathSearchPage.vue
View file

@ -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>