From 3fdeebd24882b7aa2025d1e0121e8d677ffab467 Mon Sep 17 00:00:00 2001
From: Venla <venla.e.rantanen@helsinki.fi>
Date: Mon, 9 Dec 2024 14:55:22 +0200
Subject: [PATCH] fix report page for form 8

---
 client/components/ReportPage/index.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/client/components/ReportPage/index.js b/client/components/ReportPage/index.js
index bc9820ca..ee1bb71f 100644
--- a/client/components/ReportPage/index.js
+++ b/client/components/ReportPage/index.js
@@ -43,8 +43,16 @@ export default () => {
     year,
     tempAnswers: answers,
     oldAnswers,
-    draftYear: draftYear && draftYear.year,
-    deadline: nextDeadline,
+    ...(filters.form === formKeys.FACULTY_MONITORING
+      ? {
+          // faculty monitoring is designed to be always ongoing but the form may be closed at times, hence this current year fallback
+          draftYear: draftYear?.year ?? new Date().getFullYear(),
+          deadline: nextDeadline ?? new Date(),
+        }
+      : {
+          draftYear: draftYear?.year,
+          deadline: nextDeadline,
+        }),
     form: filters.form,
   })