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

feat: melding bij leerobjecten met vragen

Browse source
This commit is contained in:
laurejablonski 2025-04-24 20:43:12 +02:00
parent 103742db31
commit 3f26353d79
2 changed files with 26 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

24
frontend/src/components/QuestionNotification.vue Normal file
View file

@ -0,0 +1,24 @@
<script setup lang="ts">
import type { LearningObject } from '@/data-objects/learning-objects/learning-object';
import { useQuestionsQuery } from '@/queries/questions';
import type { LearningObjectIdentifierDTO } from '@dwengo-1/common/interfaces/learning-content';
import { languageMap } from '@dwengo-1/common/util/language';
import { computed, ref } from 'vue';
const props = defineProps<{
node: LearningObject
}>();
const loid = { hruid: props.node.key, version: props.node.version, language: props.node.language} as LearningObjectIdentifierDTO;
const { data, isLoading, error} = useQuestionsQuery(loid);
const hasQuestions = computed(() => {
return (data.value?.questions.length ?? 0) > 0;
});
</script>
<template v-if="!isLoading & !error">
<v-icon v-if="hasQuestions" icon="mdi-help-circle-outline" color="red" size="small" />
<div>{{ node.estimatedTime }}'</div>
</template>
<style scoped></style>

30
frontend/src/views/learning-paths/LearningPathPage.vue
View file

@ -21,6 +21,7 @@
import {useStudentAssignmentsQuery, useStudentGroupsQuery} from "@/queries/students"
import type { AssignmentDTO } from "@dwengo-1/common/interfaces/assignment";
import type { GroupDTO } from "@dwengo-1/common/interfaces/group";
import QuestionNotification from "@/components/QuestionNotification.vue";
const router = useRouter();
const route = useRoute();
@ -193,30 +194,6 @@ import type { GroupDTO } from "@dwengo-1/common/interfaces/group";
alert("Please type a question before submitting.") // TODO: i18n
}
}
const learningObjectHasQuestions = computed(() => {
const result = new Map<string, boolean>();
const learningObjects = learningObjectListQueryResult.data?.value ?? [];
learningObjects.forEach((learningObject) => {
const nodeLoId: LearningObjectIdentifierDTO = {
hruid: learningObject.key,
language: learningObject.language,
version: learningObject.version
};
// Check if the learning object has questions
const questions = useQuestionsQuery(nodeLoId).data.value?.questions as QuestionDTO[] || [];
result.set(learningObject.key, questions.length > 0);
});
return result;
});
// Helper function to check if a learning object has questions
function hasQuestions(learningObjectKey: string): boolean {
return learningObjectHasQuestions.value.get(learningObjectKey) ?? false;
}
</script>
@ -295,10 +272,7 @@ function hasQuestions(learningObjectKey: string): boolean {
:icon="ICONS[getNavItemState(node)]"
></v-icon>
</template>
<template v-slot:append>
<v-icon v-if="hasQuestions(node.key)" icon="mdi-help-circle-outline" color="red" />
<div>{{ node.estimatedTime }}'</div>
</template>
<QuestionNotification :node="node" v-slot:append></QuestionNotification>
</v-list-item>
</template>
</using-query-result>