trying if this fixes things

UniversityOfHelsinkiCS · Jan 8, 2025 · c6d1a0a · c6d1a0a
1 parent e0f44f2
commit c6d1a0a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/client/util/common.js b/client/util/common.js
@@ -489,6 +489,11 @@ export const answersByYear = ({ year, tempAnswers, oldAnswers, draftYear, deadli
     return tempAnswers?.data.filter(a => a.year === year).filter(a => !form || a.form === form)
   }
 
+  if (form === formKeys.FACULTY_MONITORING) {
+    console.log(tempAnswers.data.filter(a => a.year === year).filter(a => !form || a.form === form))
+    return tempAnswers.data.filter(a => a.year === year).filter(a => !form || a.form === form)
+  }
+
   // if viewing past years' answers
   if (draftYear !== year && oldAnswers && oldAnswers.data) {
     return oldAnswers.data.filter(a => a.year === year).filter(a => !form || a.form === form)

diff --git a/server/controllers/answersController.js b/server/controllers/answersController.js
@@ -23,14 +23,15 @@ const getAll = async (_, res) => {
   }
 }
 
+// getting all temp answers user has access to from every year
 const getAllTempUserHasAccessTo = async (req, res) => {
   try {
     // admin route
     if (isAdmin(req.user) || isSuperAdmin(req.user)) {
       const data = await db.tempAnswer.findAll({
-        where: {
-          year: await whereDraftYear(),
-        },
+        // where: {
+        //   year: await whereDraftYear(),
+        // },
       })
       return res.send(data)
     }
@@ -42,7 +43,7 @@ const getAllTempUserHasAccessTo = async (req, res) => {
     const anyAccess = hasAnyAccess(req.user)
     const data = await db.tempAnswer.findAll({
       where: {
-        year: awaitYear,
+        // year: awaitYear,
         [Op.or]: [
           { programme: Object.keys(req.user.access).concat(finalCommitee) },
           anyAccess