added compare link to form 7 and new button routing

UniversityOfHelsinkiCS · Oct 29, 2024 · f29f6f5 · f29f6f5
1 parent 8712804
commit f29f6f5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/client/components/MetaEvaluationView/ProgrammeLevelOverview/MetaOverview.js b/client/components/MetaEvaluationView/ProgrammeLevelOverview/MetaOverview.js
@@ -104,6 +104,11 @@ const MetaOverview = ({
             {t('overview:readAnswers')}
           </Button>
         </MenuItem>
+        <MenuItem>
+          <Button data-cy="nav-comparison" as={Link} to="/report?form=7" size="big">
+            {t('overview:compareAnswers')}
+          </Button>
+        </MenuItem>
         <DegreeDropdown />
         <FacultyDropdown
           t={t}

diff --git a/client/components/ReportPage/index.js b/client/components/ReportPage/index.js
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
-import { Link } from 'react-router-dom'
+import { useHistory } from 'react-router-dom'
 import { Accordion, Button, Icon, Grid, Tab, Menu } from 'semantic-ui-react'
 import { useTranslation } from 'react-i18next'
 
@@ -24,6 +24,7 @@ import './ReportPage.scss'
 export default () => {
   const { t } = useTranslation()
   const dispatch = useDispatch()
+  const history = useHistory()
   const [openQuestions, setOpenQuestions] = useState(false)
   const [filter, setFilter] = useState('')
   const [picked, setPicked] = useState([])
@@ -155,7 +156,7 @@ export default () => {
       <div className="no-print">
         <Menu secondary>
           <Menu.Item>
-            <Button as={Link} to="/yearly" icon="arrow left" size="small" />
+            <Button onClick={() => history.goBack()} icon="arrow left" size="small" />
           </Menu.Item>
           <Menu.Item>
             <h1>{t('report:reportPage')}</h1>