Merge branch 'main' into feature/student_csv_import

Author: nk-coding

client/src/model/Grading.ts

@@ -72,7 +72,7 @@ export class Grading implements Modify<IGrading, Modified> {
         let sum = this.additionalPoints ?? 0;
 
         for (const [, doc] of this.exerciseGradings) {
-            sum += doc.points;
+            sum += doc.totalPoints;
         }
 
         return sum;

server/src/database/entities/grading.entity.ts

@@ -42,6 +42,21 @@ export class ExerciseGrading {
         this.points = points;
     }
 
+    /**
+     * @returns Sum of all points of all subExercises, points of this exercise grading
+     * and the `additionalPoints` of this exercise grading.
+     */
+    get totalPoints(): number {
+        if (this.subExercisePoints.size > 0) {
+            return (
+                (this.additionalPoints ?? 0) +
+                [...this.subExercisePoints.values()].reduce((sum, points) => sum + points, 0)
+            );
+        } else {
+            return this.points + (this.additionalPoints ?? 0);
+        }
+    }
+
     getGradingForSubExercise(subEx: SubExercise): number | undefined {
         return this.subExercisePoints.get(subEx.id);
     }
@@ -112,7 +127,10 @@ export class Grading {
     get points(): number {
         const additional = this.additionalPoints ?? 0;
 
-        return additional + this.exerciseGradings.reduce((sum, grading) => sum + grading.points, 0);
+        return (
+            additional +
+            this.exerciseGradings.reduce((sum, grading) => sum + grading.totalPoints, 0)
+        );
     }
 
     get handIn(): HandIn {

server/src/module/markdown/markdown.service.ts

@@ -259,7 +259,7 @@ export class MarkdownService {
             pointInfo.total.must += total.must;
             pointInfo.total.bonus += total.bonus;
 
-            const achieved = gradingForExercise?.points ?? 0;
+            const achieved = gradingForExercise?.totalPoints ?? 0;
             const exMaxPoints = convertExercisePointInfoToString(total);
             const subExTable = gradingForExercise
                 ? this.generateSubExerciseTable({

server/src/module/student/grading.service.ts

@@ -1,18 +1,18 @@
 import { EntityRepository } from '@mikro-orm/core';
 import { EntityManager } from '@mikro-orm/mysql';
+import { InjectRepository } from '@mikro-orm/nestjs';
 import { BadRequestException, forwardRef, Inject, Injectable } from '@nestjs/common';
+import { GradingResponseData } from 'shared/model/Gradings';
 import { Grading } from '../../database/entities/grading.entity';
 import { HandIn } from '../../database/entities/ratedEntity.entity';
 import { Student } from '../../database/entities/student.entity';
+import { Team } from '../../database/entities/team.entity';
+import { GradingList, GradingListsForStudents } from '../../helpers/GradingList';
 import { ScheinexamService } from '../scheinexam/scheinexam.service';
 import { SheetService } from '../sheet/sheet.service';
 import { ShortTestService } from '../short-test/short-test.service';
 import { GradingDTO } from './student.dto';
 import { StudentService } from './student.service';
-import { GradingList, GradingListsForStudents } from '../../helpers/GradingList';
-import { Team } from '../../database/entities/team.entity';
-import { GradingResponseData } from 'shared/model/Gradings';
-import { InjectRepository } from '@mikro-orm/nestjs';
 
 @Injectable()
 export class GradingService {
@@ -194,11 +194,18 @@ export class GradingService {
     }
 
     async findAllHandInGradingsOfTeam(team: Team, handIn: HandIn): Promise<Grading[]> {
-        const studentIds = team.getStudents().map((s) => s.id);
-        return this.repository.find({
-            handInId: handIn.id,
-            students: { $contains: studentIds },
-        });
+        const gradings = await Promise.all(
+            team.getStudents().map((s) =>
+                this.repository.find(
+                    {
+                        handInId: handIn.id,
+                        students: s,
+                    },
+                    { populate: true }
+                )
+            )
+        );
+        return [...new Set(gradings.flat())];
     }
 
     private async updateGradingOfStudent({