merge: fixed merge conflicts
This commit is contained in:
		
						commit
						90f43e74ba
					
				
					 101 changed files with 2156 additions and 1470 deletions
				
			
		|  | @ -2,9 +2,11 @@ import { EntityManager } from '@mikro-orm/core'; | |||
| import { Assignment } from '../../../src/entities/assignments/assignment.entity'; | ||||
| import { Class } from '../../../src/entities/classes/class.entity'; | ||||
| import { Language } from '@dwengo-1/common/util/language'; | ||||
| import { testLearningPathWithConditions } from '../content/learning-paths.testdata'; | ||||
| import { getClassWithTestleerlingAndTestleerkracht } from '../classes/classes.testdata'; | ||||
| 
 | ||||
| export function makeTestAssignemnts(em: EntityManager, classes: Class[]): Assignment[] { | ||||
|     const assignment01 = em.create(Assignment, { | ||||
|     assignment01 = em.create(Assignment, { | ||||
|         id: 21000, | ||||
|         within: classes[0], | ||||
|         title: 'dire straits', | ||||
|  | @ -14,7 +16,7 @@ export function makeTestAssignemnts(em: EntityManager, classes: Class[]): Assign | |||
|         groups: [], | ||||
|     }); | ||||
| 
 | ||||
|     const assignment02 = em.create(Assignment, { | ||||
|     assignment02 = em.create(Assignment, { | ||||
|         id: 21001, | ||||
|         within: classes[1], | ||||
|         title: 'tool', | ||||
|  | @ -24,7 +26,7 @@ export function makeTestAssignemnts(em: EntityManager, classes: Class[]): Assign | |||
|         groups: [], | ||||
|     }); | ||||
| 
 | ||||
|     const assignment03 = em.create(Assignment, { | ||||
|     assignment03 = em.create(Assignment, { | ||||
|         id: 21002, | ||||
|         within: classes[0], | ||||
|         title: 'delete', | ||||
|  | @ -34,7 +36,7 @@ export function makeTestAssignemnts(em: EntityManager, classes: Class[]): Assign | |||
|         groups: [], | ||||
|     }); | ||||
| 
 | ||||
|     const assignment04 = em.create(Assignment, { | ||||
|     assignment04 = em.create(Assignment, { | ||||
|         id: 21003, | ||||
|         within: classes[0], | ||||
|         title: 'another assignment', | ||||
|  | @ -44,5 +46,41 @@ export function makeTestAssignemnts(em: EntityManager, classes: Class[]): Assign | |||
|         groups: [], | ||||
|     }); | ||||
| 
 | ||||
|     return [assignment01, assignment02, assignment03, assignment04]; | ||||
|     conditionalPathAssignment = em.create(Assignment, { | ||||
|         within: getClassWithTestleerlingAndTestleerkracht(), | ||||
|         id: 1, | ||||
|         title: 'Assignment: Conditional Learning Path', | ||||
|         description: 'You have to do the testing learning path with a condition.', | ||||
|         learningPathHruid: testLearningPathWithConditions.hruid, | ||||
|         learningPathLanguage: testLearningPathWithConditions.language as Language, | ||||
|         groups: [], | ||||
|     }); | ||||
| 
 | ||||
|     return [assignment01, assignment02, assignment03, assignment04, conditionalPathAssignment]; | ||||
| } | ||||
| 
 | ||||
| let assignment01: Assignment; | ||||
| let assignment02: Assignment; | ||||
| let assignment03: Assignment; | ||||
| let assignment04: Assignment; | ||||
| let conditionalPathAssignment: Assignment; | ||||
| 
 | ||||
| export function getAssignment01(): Assignment { | ||||
|     return assignment01; | ||||
| } | ||||
| 
 | ||||
| export function getAssignment02(): Assignment { | ||||
|     return assignment02; | ||||
| } | ||||
| 
 | ||||
| export function getAssignment03(): Assignment { | ||||
|     return assignment03; | ||||
| } | ||||
| 
 | ||||
| export function getAssignment04(): Assignment { | ||||
|     return assignment04; | ||||
| } | ||||
| 
 | ||||
| export function getConditionalPathAssignment(): Assignment { | ||||
|     return conditionalPathAssignment; | ||||
| } | ||||
|  |  | |||
		Reference in a new issue
	
	 Adriaan Jacquet
						Adriaan Jacquet