merge: fixed merge conflicts
This commit is contained in:
commit
90f43e74ba
101 changed files with 2156 additions and 1470 deletions
|
@ -2,13 +2,15 @@ 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[] {
|
||||
/*
|
||||
* Group #1 for Assignment #1 in class 'id01'
|
||||
* => Assigned to do learning path 'id02'
|
||||
*/
|
||||
const group01 = em.create(Group, {
|
||||
group01 = em.create(Group, {
|
||||
assignment: assignments[0],
|
||||
groupNumber: 21001,
|
||||
members: students.slice(0, 2),
|
||||
|
@ -18,7 +20,7 @@ export function makeTestGroups(em: EntityManager, students: Student[], assignmen
|
|||
* Group #2 for Assignment #1 in class 'id01'
|
||||
* => Assigned to do learning path 'id02'
|
||||
*/
|
||||
const group02 = em.create(Group, {
|
||||
group02 = em.create(Group, {
|
||||
assignment: assignments[0],
|
||||
groupNumber: 21002,
|
||||
members: students.slice(2, 4),
|
||||
|
@ -28,7 +30,7 @@ export function makeTestGroups(em: EntityManager, students: Student[], assignmen
|
|||
* Group #3 for Assignment #1 in class 'id01'
|
||||
* => Assigned to do learning path 'id02'
|
||||
*/
|
||||
const group03 = em.create(Group, {
|
||||
group03 = em.create(Group, {
|
||||
assignment: assignments[0],
|
||||
groupNumber: 21003,
|
||||
members: students.slice(4, 6),
|
||||
|
@ -38,7 +40,7 @@ export function makeTestGroups(em: EntityManager, students: Student[], assignmen
|
|||
* Group #4 for Assignment #2 in class 'id02'
|
||||
* => Assigned to do learning path 'id01'
|
||||
*/
|
||||
const group04 = em.create(Group, {
|
||||
group04 = em.create(Group, {
|
||||
assignment: assignments[1],
|
||||
groupNumber: 21004,
|
||||
members: students.slice(3, 4),
|
||||
|
@ -48,11 +50,51 @@ export function makeTestGroups(em: EntityManager, students: Student[], assignmen
|
|||
* Group #5 for Assignment #4 in class 'id01'
|
||||
* => Assigned to do learning path 'id01'
|
||||
*/
|
||||
const group05 = em.create(Group, {
|
||||
group05 = em.create(Group, {
|
||||
assignment: assignments[3],
|
||||
groupNumber: 21001,
|
||||
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;
|
||||
let group02: Group;
|
||||
let group03: Group;
|
||||
let group04: Group;
|
||||
let group05: Group;
|
||||
let group1ConditionalLearningPath: Group;
|
||||
|
||||
export function getTestGroup01(): Group {
|
||||
return group01;
|
||||
}
|
||||
|
||||
export function getTestGroup02(): Group {
|
||||
return group02;
|
||||
}
|
||||
|
||||
export function getTestGroup03(): Group {
|
||||
return group03;
|
||||
}
|
||||
|
||||
export function getTestGroup04(): Group {
|
||||
return group04;
|
||||
}
|
||||
|
||||
export function getTestGroup05(): Group {
|
||||
return group05;
|
||||
}
|
||||
|
||||
export function getGroup1ConditionalLearningPath(): Group {
|
||||
return group1ConditionalLearningPath;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue