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

refactor(corrections-r): modernize

Browse Source
This commit is contained in:
Gregor Kleen 2021-08-17 12:46:27 +02:00
parent 153af8c6b4
commit 57ea5fe329
1 changed files with 119 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Handler/Submission/List.hs
View File

@ -337,8 +337,8 @@ filterUIComment mPrev = singletonMap "comment" . maybeToList <$> aopt (lift `hoi
makeCorrectionsTable :: ( IsDBTable m x, ToSortable h, Functor h ) makeCorrectionsTable :: ( IsDBTable m x, ToSortable h, Functor h )
=> CorrectionTableWhere -> Colonnade h CorrectionTableData (DBCell m x) -> _ -> PSValidator m x -> DBParams m x -> DB (DBResult m x) => CorrectionTableWhere -> Colonnade h CorrectionTableData (DBCell m x) -> _ -> PSValidator m x -> DBParams m x -> DB (DBResult m x)
makeCorrectionsTable whereClause dbtColonnade dbtFilterUI psValidator dbtParams = do makeCorrectionsTable whereClause dbtColonnade dbtFilterUI' psValidator dbtParams
let dbtSQLQuery = runReaderT $ do = let dbtSQLQuery = runReaderT $ do
course <- view queryCourse course <- view queryCourse
sheet <- view querySheet sheet <- view querySheet
submission <- view querySubmission submission <- view querySubmission
@ -394,12 +394,7 @@ makeCorrectionsTable whereClause dbtColonnade dbtFilterUI psValidator dbtParams
return (submission, sheet, (courseName, courseShorthand, courseTerm, courseSchool), mCorrector, mbLastEdit, submittorMap, cid, nonAnonymousAccess) return (submission, sheet, (courseName, courseShorthand, courseTerm, courseSchool), mCorrector, mbLastEdit, submittorMap, cid, nonAnonymousAccess)
dbtRowKey = views querySubmission (E.^. SubmissionId) dbtRowKey = views querySubmission (E.^. SubmissionId)
dbTable psValidator DBTable dbtSorting = mconcat
{ dbtSQLQuery
, dbtRowKey
, dbtColonnade
, dbtProj
, dbtSorting = mconcat
[ singletonMap "term" . SortColumn $ views queryCourse (E.^. CourseTerm) [ singletonMap "term" . SortColumn $ views queryCourse (E.^. CourseTerm)
, singletonMap "school" . SortColumn $ views queryCourse (E.^. CourseSchool) , singletonMap "school" . SortColumn $ views queryCourse (E.^. CourseSchool)
, singletonMap "course" . SortColumn $ views queryCourse (E.^. CourseShorthand) , singletonMap "course" . SortColumn $ views queryCourse (E.^. CourseShorthand)
@ -425,7 +420,7 @@ makeCorrectionsTable whereClause dbtColonnade dbtFilterUI psValidator dbtParams
, singletonMap "last-edit" . SortColumn $ view queryLastEdit , singletonMap "last-edit" . SortColumn $ view queryLastEdit
, singletonMap "submission" . SortProjected . comparing $ toPathPiece . view resultCryptoID , singletonMap "submission" . SortProjected . comparing $ toPathPiece . view resultCryptoID
] ]
, dbtFilter = mconcat dbtFilter = mconcat
[ singletonMap "term" . FilterColumn . E.mkExactFilter $ views queryCourse (E.^. CourseTerm) [ singletonMap "term" . FilterColumn . E.mkExactFilter $ views queryCourse (E.^. CourseTerm)
, singletonMap "school" . FilterColumn . E.mkExactFilter $ views queryCourse (E.^. CourseSchool) , singletonMap "school" . FilterColumn . E.mkExactFilter $ views queryCourse (E.^. CourseSchool)
, singletonMap "course" . FilterColumn . E.mkExactFilter $ views queryCourse (E.^. CourseShorthand) , singletonMap "course" . FilterColumn . E.mkExactFilter $ views queryCourse (E.^. CourseShorthand)
@ -467,14 +462,13 @@ makeCorrectionsTable whereClause dbtColonnade dbtFilterUI psValidator dbtParams
, singletonMap "submission" $ FilterProjected (_corrProjFilterSubmission ?~) , singletonMap "submission" $ FilterProjected (_corrProjFilterSubmission ?~)
, singletonMap "pseudonym" $ FilterProjected (_corrProjFilterPseudonym ?~) , singletonMap "pseudonym" $ FilterProjected (_corrProjFilterPseudonym ?~)
] ]
, dbtFilterUI = fromMaybe mempty dbtFilterUI dbtFilterUI = fromMaybe mempty dbtFilterUI'
, dbtStyle = def { dbsFilterLayout = maybe (\_ _ _ -> id) (const defaultDBSFilterLayout) dbtFilterUI } dbtStyle = def { dbsFilterLayout = maybe (\_ _ _ -> id) (const defaultDBSFilterLayout) dbtFilterUI' }
, dbtParams dbtIdent = "corrections" :: Text
, dbtIdent = "corrections" :: Text dbtCsvEncode = noCsvEncode
, dbtCsvEncode = noCsvEncode dbtCsvDecode = Nothing
, dbtCsvDecode = Nothing dbtExtraReps = []
, dbtExtraReps = [] in dbTable psValidator DBTable{..}
}
data ActionCorrections = CorrDownload data ActionCorrections = CorrDownload
| CorrSetCorrector | CorrSetCorrector