fraport/fradrive-old
fraport/fradrive-old
Archived
3
1
Fork 0
Code Issues 65 Pull Requests 5 Actions Packages Projects Releases 197 Wiki Activity

fix(eo-exams): display exams without label

Browse Source
This commit is contained in:
Sarah Vaupel 2021-12-28 01:22:49 +01:00
parent 808c2fc770
commit 5fe01ce8dc
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Handler/ExamOffice/Exams.hs
View File

@ -154,11 +154,15 @@ getEOExamsR = do
mLabelExternalExam <- view queryLabelExternalExam
lift $ do
E.on $ externalExam E.?. ExternalExamId E.==. mExternalExamLabel E.?. ExamOfficeExternalExamLabelExternalExam
E.on $ mExternalExamLabel E.?. ExamOfficeExternalExamLabelLabel E.==. mLabelExternalExam E.?. ExamOfficeLabelId
E.on $ E.maybe E.true (\externalExamLabelExternalExamId ->
externalExam E.?. ExternalExamId E.==. E.just externalExamLabelExternalExamId
) (mExternalExamLabel E.?. ExamOfficeExternalExamLabelExternalExam)
E.on E.false
E.on $ exam E.?. ExamId E.==. mExamLabel E.?. ExamOfficeExamLabelExam
E.on $ mExamLabel E.?. ExamOfficeExamLabelLabel E.==. mLabelExam E.?. ExamOfficeLabelId
E.on $ E.maybe E.true (\examLabelExamId ->
exam E.?. ExamId E.==. E.just examLabelExamId
) (mExamLabel E.?. ExamOfficeExamLabelExam)
E.on $ course E.?. CourseSchool E.==. school E.?. SchoolId
E.on $ exam E.?. ExamCourse E.==. course E.?. CourseId
@ -166,8 +170,15 @@ getEOExamsR = do
E.||. ( E.isNothing (exam E.?. ExamId) E.&&. E.isNothing (course E.?. CourseId) E.&&. E.not_ (E.isNothing $ externalExam E.?. ExternalExamId))
E.where_ $ E.val (not getLabels) E.||. (
E.val getLabels
E.&&. mLabelExam E.?. ExamOfficeLabelUser E.==. E.just (E.val uid)
E.&&. mLabelExternalExam E.?. ExamOfficeLabelUser E.==. E.just (E.val uid))
E.&&. ( E.maybe E.true (\labelExamUser ->
labelExamUser E.==. E.val uid
) (mLabelExam E.?. ExamOfficeLabelUser)
)
E.&&. ( E.maybe E.true (\labelExternalExamUser ->
labelExternalExamUser E.==. E.val uid
) (mLabelExternalExam E.?. ExamOfficeLabelUser)
)
)
return (exam, course, school, mLabelExam, externalExam, mLabelExternalExam)
dbtRowKey = views ($(multifocusG 2) queryExam queryExternalExam) (bimap (E.?. ExamId) (E.?. ExternalExamId))