mark grading scale id on test as optional, refs #428

bkd-mba-fbi · Jul 28, 2022 · bbc9cf2 · bbc9cf2
1 parent c9520f8
commit bbc9cf2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/app/my-grades/services/my-grades.service.ts b/src/app/my-grades/services/my-grades.service.ts
@@ -75,7 +75,9 @@ export class MyGradesService {
 
   private gradingScaleIdsFromTests$ = this.tests$.pipe(
     map((tests: Test[]) =>
-      [...tests.map((test: Test) => test.GradingScaleId)].filter(unique)
+      [...tests.map((test: Test) => test.GradingScaleId)]
+        .filter(notNull)
+        .filter(unique)
     )
   );
 

diff --git a/src/app/shared/models/test.model.ts b/src/app/shared/models/test.model.ts
@@ -29,7 +29,7 @@ const Test = t.type({
   IsOwner: t.boolean,
   Owner: Option(t.string),
   Creation: t.string,
-  GradingScaleId: t.number,
+  GradingScaleId: Option(t.number),
   GradingScale: t.string,
   Results: Option(t.array(Result)),
 });

diff --git a/src/app/shared/services/dossier-grades.service.ts b/src/app/shared/services/dossier-grades.service.ts
@@ -123,7 +123,9 @@ export class DossierGradesService {
 
   private gradingScaleIdsFromTests$ = this.tests$.pipe(
     map((tests: Test[]) =>
-      [...tests.map((test: Test) => test.GradingScaleId)].filter(unique)
+      [...tests.map((test: Test) => test.GradingScaleId)]
+        .filter(notNull)
+        .filter(unique)
     )
   );