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

Merge remote-tracking branch 'origin/feat/assignment-page' into feat/assignment-page

Browse source 
# Conflicts:
#	frontend/src/views/assignments/UserAssignments.vue
This commit is contained in:
Joyelle Ndagijimana 2025-04-22 09:04:44 +02:00
commit e3ca01a730
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
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,
@ -34,7 +34,7 @@ export class Assignment {
@OneToMany({ @OneToMany({
entity: () => Group, entity: () => Group,
mappedBy: 'assignment', mappedBy: 'assignment',
cascade: [Cascade.ALL] cascade: [Cascade.ALL],
}) })
groups: Collection<Group> = new Collection<Group>(this); groups: Collection<Group> = new Collection<Group>(this);
} }