if this solves some user rights

UniversityOfHelsinkiCS · Nov 19, 2024 · 35d96d0 · 35d96d0
1 parent c7c580b
commit 35d96d0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/client/components/FacultyMonitoringView/FacultyMonitoringOverview/MonitoringOverview.js b/client/components/FacultyMonitoringView/FacultyMonitoringOverview/MonitoringOverview.js
@@ -20,7 +20,6 @@ import './FacultyMonitoringOverview.scss'
 import { useDispatch, useSelector } from 'react-redux'
 import CustomModal from 'Components/Generic/CustomModal'
 import { getAllTempAnswersAction } from 'Utilities/redux/tempAnswersReducer'
-import { getAnswersActionAll } from 'Utilities/redux/oldAnswersReducer'
 import { facultyMonitoringQuestions as questions } from '@root/client/questionData/index'
 import Square from 'Components/Generic/Square'
 import ModalAnswer from './ModalAnswer'
@@ -53,7 +52,6 @@ const MonitoringOverview = ({ t, lang, faculties }) => {
   useEffect(() => {
     setRadioFilter('all')
     dispatch(getAllTempAnswersAction())
-    dispatch(getAnswersActionAll())
   }, [selectedLevel])
 
   if (!answers) return <Loader active />
@@ -118,6 +116,8 @@ const MonitoringOverview = ({ t, lang, faculties }) => {
   const getFacultySummarySectionData = (section, faculty) => {
     const answer = answers.find(a => a.programme === faculty)
 
+    console.log(answer)
+
     if (answer && answer.data.selectedQuestionIds) {
       const questionIds = section.parts.map(part => part.id)
 

diff --git a/server/controllers/answersController.js b/server/controllers/answersController.js
@@ -38,17 +38,19 @@ const getAllTempUserHasAccessTo = async (req, res) => {
     const finalCommitee = ['UNI', 'UNI_EN', 'UNI_SE']
 
     // normal user route
+    const awaitYear = await whereDraftYear()
     const anyAccess = hasAnyAccess(req.user)
     const data = await db.tempAnswer.findAll({
       where: {
-        year: await whereDraftYear(),
+        year: awaitYear,
         [Op.or]: [
           { programme: Object.keys(req.user.access).concat(finalCommitee) },
-          anyAccess ? { form: [formKeys.YEARLY_ASSESSMENT, formKeys.EVALUATION_PROGRAMMES] } : {},
+          anyAccess
+            ? { form: [formKeys.YEARLY_ASSESSMENT, formKeys.EVALUATION_PROGRAMMES, formKeys.FACULTY_MONITORING] }
+            : {},
         ],
       },
     })
-
     return res.send(data)
   } catch (error) {
     logger.error(`Database error: ${error}`)