lintfix

UniversityOfHelsinkiCS · Jun 11, 2024 · 281a90f · 281a90f
1 parent 6fe16e5
commit 281a90f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/client/components/MetaEvaluationView/ProgrammeLevelAnswers/index.js b/client/components/MetaEvaluationView/ProgrammeLevelAnswers/index.js
@@ -14,6 +14,7 @@ const ProgrammeLevelAnswers = () => {
   const answers = useSelector(state => state.tempAnswers)
   const year = 2024
   const form = 7
+  const programmes = useSelector(({ studyProgrammes }) => studyProgrammes.data)
 
   useEffect(() => {
     document.title = `${t('overview')}`
@@ -23,6 +24,8 @@ const ProgrammeLevelAnswers = () => {
     dispatch(getTempAnswersByFormAndYear(form, year))
   }, [dispatch])
 
+  const programmeByKey = key => programmes.find(prog => prog.key === key)
+
   return (
     <div>
       <div style={{ marginBottom: '2em' }}>
@@ -48,8 +51,11 @@ const ProgrammeLevelAnswers = () => {
             <h3>{t('answers')}:</h3>
             {questionAnswers.length > 0 ? (
               questionAnswers.map(answer => (
-                <div key={answer.programme}>
-                  {answer.programme}: {answer.data[`${question.id}_text`]}
+                <div key={answer.programme} style={{ marginBottom: 25 }}>
+                  <div style={{ margin: 10, fontSize: 14, fontWeight: 'bold' }}>
+                    {answer.programme} {programmeByKey(answer.programme).name[lang]}
+                  </div>
+                  <div style={{ margin: 10, paddingLeft: 10 }}>{answer.data[`${question.id}_text`]}</div>
                 </div>
               ))
             ) : (

diff --git a/server/controllers/answersController.js b/server/controllers/answersController.js
@@ -60,7 +60,12 @@ const getFacultyTempAnswersAfterDeadline = async (req, res) => {
   const { form, year } = req.params
   try {
     const deadline = await db.deadline.findOne({ where: { form } })
-    if (deadline) return res.status(403).json({ error: 'Deadline is active, this should not be used' })
+
+    // TODO no idea what is the logic here so will exclude form 7 for now
+    if (deadline && Number(form) !== 7) {
+      return res.status(403).json({ error: 'Deadline is active, this should not be used' })
+    }
+
     const data = await db.tempAnswer.findAll({
       where: {
         form,