Skip to content

Commit ae59f58

Browse files
committed
Fix scheinstatus not passed for students with a schein from previous semesters #1050
1 parent 1ee364f commit ae59f58

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

server/src/module/scheincriteria/scheincriteria.service.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { EntityRepository } from '@mikro-orm/core';
2+
import { InjectRepository } from '@mikro-orm/nestjs';
23
import { Injectable, NotFoundException } from '@nestjs/common';
34
import { FormDataResponse } from 'shared/model/FormTypes';
45
import {
@@ -8,6 +9,7 @@ import {
89
ScheincriteriaSummaryByStudents,
910
SingleScheincriteriaSummaryByStudents,
1011
} from 'shared/model/ScheinCriteria';
12+
import { StudentStatus } from 'shared/model/Student';
1113
import { ScheincriteriaEntity } from '../../database/entities/scheincriteria.entity';
1214
import { Scheinexam } from '../../database/entities/scheinexam.entity';
1315
import { Sheet } from '../../database/entities/sheet.entity';
@@ -17,13 +19,12 @@ import { CRUDService } from '../../helpers/CRUDService';
1719
import { ScheinexamService } from '../scheinexam/scheinexam.service';
1820
import { SheetService } from '../sheet/sheet.service';
1921
import { ShortTestService } from '../short-test/short-test.service';
22+
import { GradingService, StudentAndGradings } from '../student/grading.service';
2023
import { StudentService } from '../student/student.service';
2124
import { TutorialService } from '../tutorial/tutorial.service';
2225
import { Scheincriteria } from './container/Scheincriteria';
2326
import { ScheincriteriaContainer } from './container/scheincriteria.container';
2427
import { ScheinCriteriaDTO } from './scheincriteria.dto';
25-
import { GradingService, StudentAndGradings } from '../student/grading.service';
26-
import { InjectRepository } from '@mikro-orm/nestjs';
2728

2829
interface CalculationParams {
2930
criterias: ScheincriteriaEntity[];
@@ -260,7 +261,8 @@ export class ScheincriteriaService
260261

261262
return {
262263
student: params.studentInfo.student.toDTO(),
263-
passed,
264+
passed:
265+
passed || params.studentInfo.student.status === StudentStatus.NO_SCHEIN_REQUIRED,
264266
scheinCriteriaSummary: summaries,
265267
};
266268
}

0 commit comments

Comments
 (0)