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

fix(backend): Merge-conflicten opgelost.

Browse source
This commit is contained in:
Gerald Schmittinger 2025-04-09 19:51:15 +02:00
parent 8c387d6811
commit fb3c37ce5a
8 changed files with 79 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/src/interfaces/question.ts
View file

@ -1,9 +1,9 @@
import { Question } from '../entities/questions/question.entity.js';
import { mapToStudentDTO } from './student.js';
import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
import { LearningObjectIdentifier } from '@dwengo-1/common/interfaces/learning-content';
import { mapToGroupDTOId } from './group';
import { LearningObjectIdentifierDTO } from '@dwengo-1/common/interfaces/learning-content';
import {LearningObjectIdentifier} from "../entities/content/learning-object-identifier";
function getLearningObjectIdentifier(question: Question): LearningObjectIdentifierDTO {
return {