remove AverageGrade property after hotfix and filter null values, ref…

…s 333

src/app/shared/models/course.model.ts

@@ -1,8 +1,8 @@
 import * as t from 'io-ts';
-import { LocalDateTimeFromString, Maybe, Option } from './common-types';
+import { LocalDateTimeFromString, Option } from './common-types';
+import { Student } from './student.model';
 import { StudyClass } from './study-class.model';
 import { Result, Test } from './test.model';
-import { Student } from './student.model';
 
 const id = t.type({
   Id: t.number,
@@ -37,10 +37,7 @@ const ExpandedAttendanceRef = t.partial({
 const AttendanceRef = t.intersection([id, HRef, ExpandedAttendanceRef]);
 
 const Grading = t.type({
-  // the property AverageGrade was renamed to AverageTestResult with a recent backend hotfix -
-  // change the property name when the hotfix reaches the development backend
-  AverageTestResult: Maybe(t.number),
-  AverageGrade: Maybe(t.number),
+  AverageTestResult: t.number,
   CanGrade: t.boolean,
   EventDesignation: t.string,
   EventId: t.number,

src/app/shared/models/student-grades.ts

@@ -75,11 +75,17 @@ function getFinalGrade(student: Student, gradings: Grading[]): FinalGrade {
   );
 
   return {
-    average: grading?.AverageGrade || grading?.AverageTestResult,
+    average: toAverage(grading),
     finalGradeId: grading?.GradeId,
   };
 }
 
+function toAverage(grading: Grading | undefined) {
+  if (grading === undefined) return null;
+  if (grading.AverageTestResult === 0) return null;
+  return grading!.AverageTestResult;
+}
+
 export const compareFn = ({ key, ascending }: Sorting<SortKeys>) => (
   sg1: StudentGrade,
   sg2: StudentGrade

src/spec-builders.ts

@@ -512,7 +512,6 @@ export function buildGrading(
 ): Grading {
   return {
     AverageTestResult: averageGrade,
-    AverageGrade: averageGrade,
     CanGrade: false,
     EventDesignation: 'Französisch-S2',
     EventId: 9248,