[
- obj,
- progressStats?.data?.programmeNames[obj].code,
- ]),
- faculty
- ).map(listObj => listObj[0])}
- titles={doctorStats.tableTitles}
- />
-
- )}
-
- )
-}
diff --git a/services/frontend/src/components/EvaluationOverview/FacultyView.jsx b/services/frontend/src/components/EvaluationOverview/FacultyView.jsx
deleted file mode 100644
index 762cab82fb..0000000000
--- a/services/frontend/src/components/EvaluationOverview/FacultyView.jsx
+++ /dev/null
@@ -1,155 +0,0 @@
-import { useState } from 'react'
-import { Divider, Header, Loader, Message } from 'semantic-ui-react'
-
-import { facultyToolTips } from '@/common/InfoToolTips'
-import { InfoBox } from '@/components/InfoBox'
-import { useLanguage } from '@/components/LanguagePicker/useLanguage'
-import { Toggle } from '@/components/StudyProgramme/Toggle'
-import {
- useGetFacultiesQuery,
- useGetFacultyGraduationTimesQuery,
- useGetFacultyProgressStatsQuery,
-} from '@/redux/facultyStats'
-import { FacultyGraduations } from './FacultyGraduations'
-import { FacultyProgress } from './FacultyProgress'
-import '@/components/FacultyStatistics/faculty.css'
-
-export const FacultyView = ({ faculty }) => {
- const [graduatedGroup, setGraduatedGroup] = useState(false)
- const [showMedian, setShowMedian] = useState(false)
- const studyProgrammeFilter = 'NEW_STUDY_PROGRAMMES'
- const specials = 'SPECIAL_EXCLUDED'
- const graduated = graduatedGroup ? 'GRADUATED_EXCLUDED' : 'GRADUATED_INCLUDED'
- const { getTextIn } = useLanguage()
-
- const allFaculties = useGetFacultiesQuery()
- const faculties = allFaculties?.data
- const facultyDetails = faculties && faculty && faculties.find(f => f.code === faculty)
- const facultyName = facultyDetails && getTextIn(facultyDetails.name)
- const progressStats = useGetFacultyProgressStatsQuery(
- {
- id: facultyDetails?.id,
- studyProgrammeFilter,
- specialGroups: specials,
- graduated,
- },
- { skip: !facultyDetails }
- )
-
- const graduationStats = useGetFacultyGraduationTimesQuery(
- { id: facultyDetails?.id, studyProgrammeFilter },
- { skip: !facultyDetails }
- )
-
- const getDivider = (title, toolTipText, content, cypress = undefined) => (
- <>
-
- {content === 'no-infobox' ? null :
- {getTextIn({
- en: `Faculty “${faculty}” was not found. Please check the address.`,
- fi: `Tiedekuntaa ”${faculty}” ei löytynyt. Ole hyvä ja tarkista osoite.`,
- })}
-
- )
- }
-
- const isFetchingOrLoading =
- progressStats.isLoading || progressStats.isFetching || graduationStats.isLoading || graduationStats.isFetching
-
- const isError =
- (progressStats.isError && graduationStats.isError) ||
- (progressStats.isSuccess && !progressStats.data && graduationStats.isSuccess && !graduationStats.data)
-
- if (isError) return Something went wrong, please try refreshing the page.
-
- return (
- <>
-
-
- {faculty}
-
-
- This view is an abridged version of Oodikone's Faculty Overview
-
- In these statistics, all special study rights have been excluded, eg. exchange students and non-degree
- students.
-
-
- You can find more statistics on this and all other faculties of the university in main Faculty view.
- The full view includes details such as: how many have graduated or started in each faculty and in its
- programmes; credits produced by the faculty; populations backgrounds and enrollment statuses. This view
- provides statistics both on the whole faculty level and a breakdown of how they are spread among the faculty's
- programmes.
-
- Access the full Faculty view by clicking 'Faculty' in the top navigation bar.
-
-
- {isFetchingOrLoading ? (
-
- ) : (
-
- {progressStats.isSuccess && progressStats.data && (
- <>
- {getDivider(
- 'Progress of students of the faculty ',
- 'bachelorStudentsOfTheFacultyByStartingYear',
- facultyToolTips.studentProgress,
- 'InfoFacultyProgress'
- )}
-
-
-
-
- )}
- {graduationStats.isSuccess && graduationStats.data && (
- <>
- {getDivider(
- 'Average graduation times',
- 'averageGraduationTimes',
- facultyToolTips.averageGraduationTimes
- )}
-
-
-
-
- )}
-
- )}
-
Something went wrong, please try refreshing the page.
-
- return (
- <>
-
-
- {studyprogramme}
-
-
- {isFetchingOrLoading ? (
-
- ) : (
-
-
- This view is an abridged version of Oodikone's Studyprogramme Overview
-
- In these statistics, the following students are excluded: Students whose studyrights{' '}
- have been transferred away from or into the program as well as exchange students and non-degree
- students.
-
-
-
- You can find more statistics on this and other studyprogrammes of the university in main
- Studyprogramme Overview.{' '}
-
- The full view includes details such as: how many have graduated or started in each programme and in its
- studytracks; credits produced by the programme; population backgrounds and enrollment statuses.
-
-
- Access the full Studyprogramme Overview by clicking 'Programmes' in the top navigation bar and then
- 'Overview'. Alternatively, you can select 'Class statistics' to explore studyprogrammes by starting
- class with interactive statistics and visualizations.
-
-
- Note that both views have access restrictions. If you can't access either view and feel you should have
- access, please contact oodikone@helsinki.fi .
-
-
-
- {getDivider(
- 'Progress of students of the study programme by starting year',
- 'studyTrackProgressEvaluationOverview'
- )}
-
-
- {getDivider('Graduation times', 'averageGraduationTimes')}
-
-
-
- {showMedian ? displayMedian() : displayBreakdown()}
-
- {graduationData?.programmesBeforeOrAfterGraphStats?.length !== 0 && (
- <>
- {getDivider(
- studyprogramme.includes('KH')
- ? 'Primary master programme studies after this programme'
- : 'Primary bachelor programme studies before this programme',
- 'programmesBeforeOrAfter'
- )}
-
- ({
- ...programme,
- name: getTextIn(programme.name),
- }))}
- labels={graduationData?.years}
- wideTable
- />
-
- programme.with(2, getTextIn(programme[2]))
- )}
- titles={graduationData?.programmesBeforeOrAfterTitles}
- wideTable
- />
-
-
- )}
-
- )}
-
- Programme MH90_001 (Veterinary medicine bachelor + licentiate) is currently excluded.
-
- )
- }
- return (
-
- This view is a combined version of Oodikone's Faculty Evaluation Overview
-
- In these statistics, all special study rights have been excluded , eg. exchange students and non-degree
- students.
-
- Access the full Faculty view of individual faculties by clicking 'Faculty' in the top navigation bar.
-
- Veterinary medicine bachelor + licentiate (MH90_001) is disabled and not visible in the progress stats.
- It is visible in graduation times, but notice that it is found in "Bachelor + Master" category although it has
- a target time of 6 years, whereas the other degrees in that category have a target of 5 years.
-
-
- )
- }
-
- const isError =
- progressStats.isError ||
- (progressStats.isSuccess && !progressStats.data) ||
- graduationStats.isError ||
- !graduationStats.data
- if (isError) return Something went wrong, please try refreshing the page.
- const allFaculties = Object.values(progressStats.data.programmeNames)
-
- return (
- <>
-
-
-
- {getMessage()}
-
- {userHasFacultyRights && isEvaluationOverview && (
-
-
- Click here to open the corresponding view for an individual faculty
-
-
- {orderBy(allFaculties, 'code').map(faculty => (
-
-
- ))}
-
-
- )}
-
-
- {getDivider(
- 'Progress of students of the university',
- 'BachelorStudentsOfTheFacultyByStartingYear',
- facultyToolTips.studentProgress,
- 'InfoFacultyProgress'
- )}
-
- setIncludeSpecials(!excludeSpecials)}
- toolTips={facultyToolTips.studentToggle}
- value={excludeSpecials}
- />
- )}
-
-
-
- {getDivider('Average graduation times', 'AverageGraduationTimes', facultyToolTips.averageGraduationTimes)}
-
- setMedianMode(!medianMode)}
- value={medianMode}
- />
-
-
-
- {levelToComponent[level]}
-
- )
-}
diff --git a/services/frontend/src/components/Routes/ProtectedRoute.tsx b/services/frontend/src/components/Routes/ProtectedRoute.tsx
index 2e4744fb26..76b38ef71a 100644
--- a/services/frontend/src/components/Routes/ProtectedRoute.tsx
+++ b/services/frontend/src/components/Routes/ProtectedRoute.tsx
@@ -36,9 +36,6 @@ export const ProtectedRoute = ({
if (path.includes('languagecenterview')) {
return iamGroups.includes('grp-kielikeskus-esihenkilot')
}
- if (path.includes('evaluationoverview')) {
- return location.pathname.includes('university') ? true : hasRequiredRoles
- }
if (path.includes('teachers')) {
return hasRequiredRoles || hasFullAccessToTeacherData(roles, iamGroups)
}
@@ -47,7 +44,7 @@ export const ProtectedRoute = ({
}
if (hasAccessToRoute()) {
- return (
{isDefaultServiceProvider() && (
(
)}
(
{isDefaultServiceProvider() && (