diff --git a/backend/src/entities/assignments/assignment.entity.ts b/backend/src/entities/assignments/assignment.entity.ts index 1bddd39d..6089e06c 100644 --- a/backend/src/entities/assignments/assignment.entity.ts +++ b/backend/src/entities/assignments/assignment.entity.ts @@ -1,8 +1,8 @@ -import { Cascade, Collection, Entity, Enum, ManyToOne, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'; -import { Class } from '../classes/class.entity.js'; -import { Group } from './group.entity.js'; -import { Language } from '@dwengo-1/common/util/language'; -import { AssignmentRepository } from '../../data/assignments/assignment-repository.js'; +import {Cascade, Collection, Entity, Enum, ManyToOne, OneToMany, PrimaryKey, Property} from '@mikro-orm/core'; +import {Class} from '../classes/class.entity.js'; +import {Group} from './group.entity.js'; +import {Language} from '@dwengo-1/common/util/language'; +import {AssignmentRepository} from '../../data/assignments/assignment-repository.js'; @Entity({ repository: () => AssignmentRepository, @@ -14,19 +14,19 @@ export class Assignment { }) within!: Class; - @PrimaryKey({ type: 'integer', autoincrement: true }) + @PrimaryKey({type: 'integer', autoincrement: true}) id?: number; - @Property({ type: 'string' }) + @Property({type: 'string'}) title!: string; - @Property({ type: 'text' }) + @Property({type: 'text'}) description!: string; - @Property({ type: 'string' }) + @Property({type: 'string'}) learningPathHruid!: string; - @Property({ type: 'datetime' }) + @Property({type: 'datetime'}) deadline?: Date; @Enum({ diff --git a/backend/tests/test_assets/assignments/assignments.testdata.ts b/backend/tests/test_assets/assignments/assignments.testdata.ts index 14e08422..5e08da30 100644 --- a/backend/tests/test_assets/assignments/assignments.testdata.ts +++ b/backend/tests/test_assets/assignments/assignments.testdata.ts @@ -5,12 +5,15 @@ import { Language } from '@dwengo-1/common/util/language'; import { testLearningPathWithConditions } from '../content/learning-paths.testdata'; import { getClassWithTestleerlingAndTestleerkracht } from '../classes/classes.testdata'; -const futureDate = new Date(); -futureDate.setDate(futureDate.getDate() + 7); -const pastDate = new Date(); -pastDate.setDate(pastDate.getDate() - 7); + export function makeTestAssignemnts(em: EntityManager, classes: Class[]): Assignment[] { + const futureDate = new Date(); + futureDate.setDate(futureDate.getDate() + 7); + const pastDate = new Date(); + pastDate.setDate(pastDate.getDate() - 7); + const today = new Date(); + today.setHours(23, 59); assignment01 = em.create(Assignment, { id: 21000, within: classes[0], @@ -18,7 +21,7 @@ export function makeTestAssignemnts(em: EntityManager, classes: Class[]): Assign description: 'reading', learningPathHruid: 'un_ai', learningPathLanguage: Language.English, - deadline: new Date(), + deadline: today, groups: [], }); diff --git a/frontend/src/views/assignments/UserAssignments.vue b/frontend/src/views/assignments/UserAssignments.vue index 84131d52..eee70f8d 100644 --- a/frontend/src/views/assignments/UserAssignments.vue +++ b/frontend/src/views/assignments/UserAssignments.vue @@ -101,6 +101,8 @@ day: "2-digit", month: "long", year: "numeric", + hour: "numeric", + minute: "2-digit", }); }