CSCEXAM-459 Fix filtering by department

CSCfi · Feb 4, 2025 · 7f709a2 · 7f709a2
1 parent fdb72f6
commit 7f709a2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 17 deletions.
diff --git a/app/controllers/admin/ReportController.java b/app/controllers/admin/ReportController.java
@@ -255,7 +255,7 @@ public Result getIopReservations(Optional<String> dept, Optional<String> start,
             .endOr();
         query = applyFilters(
             query,
-            "examEnrolment.exam.course",
+            "enrolment.exam.course",
             "startAt",
             dept.orElse(null),
             start.orElse(null),

diff --git a/ui/src/app/administrative/statistics/categories/iop-reservation-statistics.component.ts b/ui/src/app/administrative/statistics/categories/iop-reservation-statistics.component.ts
@@ -82,7 +82,7 @@ export class IopReservationStatisticsComponent implements OnInit {
     @Input() queryParams: QueryParams = {};
 
     reservations: Reservation[] = [];
-    grouped!: Record<string, Reservation[]>;
+    grouped: Record<string, Reservation[]> = {};
 
     constructor(private Statistics: StatisticsService) {}
 
@@ -104,20 +104,13 @@ export class IopReservationStatisticsComponent implements OnInit {
         this.grouped[org].filter((r) => r.externalReservation?.orgName && !r.enrolment?.noShow).length;
     outgoingNoShowsTo = (org: keyof typeof this.grouped): number =>
         this.grouped[org].filter((r) => r.externalReservation?.orgName && r.enrolment?.noShow === true).length;
-    totalIncoming = () =>
-        Object.keys(this.grouped)
-            .map((k) => this.incomingFrom(k))
-            .reduce((a, b) => a + b);
-    totalOutgoing = () =>
-        Object.keys(this.grouped)
-            .map((k) => this.outgoingTo(k))
-            .reduce((a, b) => a + b);
-    totalIncomingNoShows = () =>
-        Object.keys(this.grouped)
-            .map((k) => this.incomingNoShowsFrom(k))
-            .reduce((a, b) => a + b);
-    totalOutgoingNoShows = () =>
+    totalIncoming = () => this.reduce(this.incomingFrom);
+    totalOutgoing = () => this.reduce(this.outgoingTo);
+    totalIncomingNoShows = () => this.reduce(this.incomingNoShowsFrom);
+    totalOutgoingNoShows = () => this.reduce(this.outgoingNoShowsTo);
+
+    private reduce = (fn: (org: keyof typeof this.grouped) => number) =>
         Object.keys(this.grouped)
-            .map((k) => this.outgoingNoShowsTo(k))
-            .reduce((a, b) => a + b);
+            .map(fn)
+            .reduce((a, b) => a + b, 0);
 }