Merge remote-tracking branch 'origin/dev' into feat/indieningen-kunnen-posten-en-bekijken-#194

# Conflicts:
#	backend/tests/setup-tests.ts
This commit is contained in:
Gerald Schmittinger 2025-04-16 16:31:18 +02:00
commit dd2cdf3fe9
46 changed files with 1670 additions and 123 deletions

View file

@ -2,6 +2,8 @@ import {EntityManager} from '@mikro-orm/core';
import { Group } from '../../../src/entities/assignments/group.entity';
import { Assignment } from '../../../src/entities/assignments/assignment.entity';
import { Student } from '../../../src/entities/users/student.entity';
import {getConditionalPathAssignment} from "./assignments.testdata";
import {getTestleerling1} from "../users/students.testdata";
export function makeTestGroups(em: EntityManager, students: Student[], assignments: Assignment[]): Group[] {
/*
@ -54,7 +56,16 @@ export function makeTestGroups(em: EntityManager, students: Student[], assignmen
members: students.slice(0, 2),
});
return [group01, group02, group03, group04, group05];
/**
* Group 1 for the assignment of the testing learning path with conditions.
*/
group1ConditionalLearningPath = em.create(Group, {
assignment: getConditionalPathAssignment(),
groupNumber: 1,
members: [getTestleerling1()]
})
return [group01, group02, group03, group04, group05, group1ConditionalLearningPath];
}
let group01: Group;
@ -62,6 +73,7 @@ let group02: Group;
let group03: Group;
let group04: Group;
let group05: Group;
let group1ConditionalLearningPath: Group;
export function getTestGroup01() {
return group01;
@ -83,3 +95,6 @@ export function getTestGroup05() {
return group05;
}
export function getGroup1ConditionalLearningPath() {
return group1ConditionalLearningPath;
}