From c205fe1b74896890f05a2634e1291d20cc1f15fa Mon Sep 17 00:00:00 2001 From: SJost Date: Sun, 10 Mar 2019 18:13:39 +0100 Subject: [PATCH] mend --- src/Handler/Course.hs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs index a02c66843..3305be5a4 100644 --- a/src/Handler/Course.hs +++ b/src/Handler/Course.hs @@ -749,7 +749,7 @@ colUserField = sortable (Just "course-user-field") (i18nCell MsgCourseStudyFeatu foldMap htmlCell . view (_userTableFeatures . _3) colUserFieldShort :: IsDBTable m c => Colonnade Sortable UserTableData (DBCell m c) -colUserFieldShort = sortable (Just "course-user-field") (i18nCell MsgCourseStudyFeature) $ +colUserFieldShort = sortable (Just "course-user-field-short") (i18nCell MsgCourseStudyFeature) $ foldMap (htmlCell . shortStudyTerms) . view (_userTableFeatures . _3) colUserDegree :: IsDBTable m c => Colonnade Sortable UserTableData (DBCell m c) @@ -757,7 +757,7 @@ colUserDegree = sortable (Just "course-user-degree") (i18nCell MsgStudyFeatureDe foldMap htmlCell . preview (_userTableFeatures . _2 . _Just) colUserDegreeShort :: IsDBTable m c => Colonnade Sortable UserTableData (DBCell m c) -colUserDegreeShort = sortable (Just "course-user-degree") (i18nCell MsgStudyFeatureDegree) $ +colUserDegreeShort = sortable (Just "course-user-degree-short") (i18nCell MsgStudyFeatureDegree) $ foldMap (htmlCell . shortStudyDegree) . preview (_userTableFeatures . _2 . _Just) makeCourseUserTable :: CourseId -> _ -> _ -> DB Widget @@ -775,10 +775,12 @@ makeCourseUserTable cid colChoices psValidator = , sortUserDisplayName queryUser -- needed for initial sorting , sortUserEmail queryUser , sortUserMatriclenr queryUser - , ("course-user-degree", SortColumn $ queryUserFeatures >>> queryFeaturesDegree >>> \degree -> degree E.?. StudyDegreeShorthand) - , ("course-user-field" , SortColumn $ queryUserFeatures >>> queryFeaturesField >>> (E.?. StudyTermsShorthand)) - , ("course-user-semesternr", SortColumn queryUserSemester) -- $ -- preview (_userTableFeatures . _1 . _Just . _studyFeaturesSemester)) - , ("course-user-note" , SortColumn $ queryUserNote >>> \note -> -- sort by last edit date + , ("course-user-degree" , SortColumn $ queryUserFeatures >>> queryFeaturesDegree >>> (E.?. StudyDegreeName)) + , ("course-user-degree-short", SortColumn $ queryUserFeatures >>> queryFeaturesDegree >>> (E.?. StudyDegreeShorthand)) + , ("course-user-field" , SortColumn $ queryUserFeatures >>> queryFeaturesField >>> (E.?. StudyTermsName)) + , ("course-user-field-short" , SortColumn $ queryUserFeatures >>> queryFeaturesField >>> (E.?. StudyTermsShorthand)) + , ("course-user-semesternr" , SortColumn queryUserSemester) -- $ -- preview (_userTableFeatures . _1 . _Just . _studyFeaturesSemester)) + , ("course-user-note" , SortColumn $ queryUserNote >>> \note -> -- sort by last edit date E.sub_select . E.from $ \edit -> do E.where_ $ note E.?. CourseUserNoteId E.==. E.just (edit E.^. CourseUserNoteEditNote) return . E.max_ $ edit E.^. CourseUserNoteEditTime