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

Merge remote-tracking branch 'origin/feat/deadline' into feat/deadline

Browse source
This commit is contained in:
Joyelle Ndagijimana 2025-05-13 08:37:43 +02:00
commit 6014b32fe4
2 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
backend/src/entities/assignments/assignment.entity.ts
View file

@ -1,8 +1,8 @@
import {Cascade, Collection, Entity, Enum, ManyToOne, OneToMany, PrimaryKey, Property} from '@mikro-orm/core'; import { Cascade, Collection, Entity, Enum, ManyToOne, OneToMany, PrimaryKey, Property } from '@mikro-orm/core';
import {Class} from '../classes/class.entity.js'; import { Class } from '../classes/class.entity.js';
import {Group} from './group.entity.js'; import { Group } from './group.entity.js';
import {Language} from '@dwengo-1/common/util/language'; import { Language } from '@dwengo-1/common/util/language';
import {AssignmentRepository} from '../../data/assignments/assignment-repository.js'; import { AssignmentRepository } from '../../data/assignments/assignment-repository.js';
@Entity({ @Entity({
repository: () => AssignmentRepository, repository: () => AssignmentRepository,
@ -14,19 +14,19 @@ export class Assignment {
}) })
within!: Class; within!: Class;
@PrimaryKey({type: 'integer', autoincrement: true}) @PrimaryKey({ type: 'integer', autoincrement: true })
id?: number; id?: number;
@Property({type: 'string'}) @Property({ type: 'string' })
title!: string; title!: string;
@Property({type: 'text'}) @Property({ type: 'text' })
description!: string; description!: string;
@Property({type: 'string'}) @Property({ type: 'string' })
learningPathHruid!: string; learningPathHruid!: string;
@Property({type: 'datetime'}) @Property({ type: 'datetime' })
deadline?: Date; deadline?: Date;
@Enum({ @Enum({

2
backend/tests/test_assets/assignments/assignments.testdata.ts
View file

@ -5,8 +5,6 @@ import { Language } from '@dwengo-1/common/util/language';
import { testLearningPathWithConditions } from '../content/learning-paths.testdata'; import { testLearningPathWithConditions } from '../content/learning-paths.testdata';
import { getClassWithTestleerlingAndTestleerkracht } from '../classes/classes.testdata'; import { getClassWithTestleerlingAndTestleerkracht } from '../classes/classes.testdata';
export function makeTestAssignemnts(em: EntityManager, classes: Class[]): Assignment[] { export function makeTestAssignemnts(em: EntityManager, classes: Class[]): Assignment[] {
const futureDate = new Date(); const futureDate = new Date();
futureDate.setDate(futureDate.getDate() + 7); futureDate.setDate(futureDate.getDate() + 7);