@@ -28,8 +28,8 @@ export const useColumns = ({ group }: { group: GroupsWithTags }): [string[], str
2828 const { isAdmin } = useGetAuthorizedUserQuery ( )
2929 const { visible : namesVisible } = useStudentNameVisibility ( )
3030
31- const [ programme , combinedProgramme ] = group . tags . studyProgramme ?. split ( '+' ) ?? [ ]
32- const { year } = group . tags
31+ const { year , studyProgramme } = group ?. tags
32+ const [ programme , combinedProgramme ] = studyProgramme ?. split ( '+' ) ?? [ ]
3333
3434 const nameColumns = namesVisible ? [ 'lastName' , 'firstNames' ] : [ ]
3535
@@ -85,14 +85,14 @@ export const useFormat = ({
8585 filteredStudents : FormattedStudent [ ]
8686 includePrimaryProgramme : boolean
8787} ) => {
88- const [ programme , combinedProgramme ] = group . tags . studyProgramme ?. split ( '+' ) ?? [ ]
88+ const [ programme , combinedProgramme ] = group . tags ? .studyProgramme ?. split ( '+' ) ?? [ ]
8989 const { getTextIn } = useLanguage ( )
9090
9191 const { isAdmin } = useGetAuthorizedUserQuery ( )
9292 const creditDateFilterOptions = useGetCreditDateFilterOptions ( )
9393
9494 const { data : programmes , isSuccess : programmesSuccess } = useGetProgrammesQuery ( )
95- const { data : semesters , isSuccess : semestersSuccess } = useGetRelevantSemesterData ( Number ( group . tags . year ) )
95+ const { data : semesters , isSuccess : semestersSuccess } = useGetRelevantSemesterData ( Number ( group . tags ? .year ) )
9696
9797 const { currentSemester, allSemesters, firstSemester, lastSemester } = semestersSuccess
9898 ? semesters
0 commit comments