diff --git a/frontend/src/views/discussions/SingleDiscussion.vue b/frontend/src/views/discussions/SingleDiscussion.vue index 674818f0..187fdb19 100644 --- a/frontend/src/views/discussions/SingleDiscussion.vue +++ b/frontend/src/views/discussions/SingleDiscussion.vue @@ -7,7 +7,7 @@ import LearningObjectView from "@/views/learning-paths/learning-object/LearningObjectView.vue"; import { useI18n } from "vue-i18n"; import LearningPathSearchField from "@/components/LearningPathSearchField.vue"; - import { useGetLearningPathQuery } from "@/queries/learning-paths.ts"; + import { useGetAllLearningPaths, useGetLearningPathQuery } from "@/queries/learning-paths.ts"; import { useLearningObjectListForPathQuery } from "@/queries/learning-objects.ts"; import UsingQueryResult from "@/components/UsingQueryResult.vue"; import authService from "@/services/auth/auth-service.ts"; @@ -21,7 +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"; + import DiscussionSideBarElement from "@/components/DiscussionSideBarElement.vue"; const router = useRouter(); const route = useRoute(); @@ -52,6 +52,33 @@ return undefined; }); + const allLearningPathsResult = useGetAllLearningPaths(props.language) + + // TODO: dit moet alle leerpaden met vragen teruggeven, maar werkt niet + const questionedLearningPaths = computed(() => { + function objectHasQuestion(learningObject: LearningObject) { + const loid = { + hruid: learningObject.key, + version: learningObject.version, + language: learningObject.language, + } as LearningObjectIdentifierDTO; + const { data } = useQuestionsQuery(loid); + const hasQuestions = computed(() => (data.value?.questions.length ?? 0) > 0); + return hasQuestions; + } + function pathHasQuestion(learningPath: LearningPath) { + const learningPathQueryResult = useGetLearningPathQuery(learningPath.hruid, learningPath.language as Language, forGroup); + const learningObjectListQueryResult = useLearningObjectListForPathQuery(learningPathQueryResult.data); + const learningObjects = learningObjectListQueryResult.data.value; + console.log("Path: " + learningPath.hruid) + console.log(learningObjects) + console.log("questions: " + learningObjects?.some(objectHasQuestion)) + return learningObjects?.some(objectHasQuestion); + + } + return allLearningPathsResult.data.value?.filter(pathHasQuestion); + }) + const learningPathQueryResult = useGetLearningPathQuery(props.hruid, props.language, forGroup); const learningObjectListQueryResult = useLearningObjectListForPathQuery(learningPathQueryResult.data); @@ -163,24 +190,25 @@
+ + -
@@ -215,6 +243,7 @@