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

fix: fixed merge errors

Browse source
This commit is contained in:
Adriaan Jacquet 2025-04-06 17:55:01 +02:00
parent effaeb0277
commit 7e250e2649
4 changed files with 3 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backend/src/data/assignments/submission-repository.ts
View file

@ -17,7 +17,6 @@ export class SubmissionRepository extends DwengoEntityRepository<Submission> {
});
}
<<<<<<< HEAD
public findByLearningObject(loId: LearningObjectIdentifier): Promise<Submission[]> {
return this.find({
learningObjectHruid: loId.hruid,
@ -27,9 +26,6 @@ export class SubmissionRepository extends DwengoEntityRepository<Submission> {
}
public findMostRecentSubmissionForStudent(loId: LearningObjectIdentifier, submitter: Student): Promise<Submission | null> {
=======
public async findMostRecentSubmissionForStudent(loId: LearningObjectIdentifier, submitter: Student): Promise<Submission | null> {
>>>>>>> 6c3dbc99bb1afb79fa867505e52656c49bada1b6
return this.findOne(
{
learningObjectHruid: loId.hruid,