From 382a34f970f483f85c68565a5b8624ffb60e4746 Mon Sep 17 00:00:00 2001 From: SJost Date: Fri, 1 Mar 2019 12:46:28 +0100 Subject: [PATCH] commented to compile --- src/Handler/Course.hs | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs index deb566519..dc6ae10aa 100644 --- a/src/Handler/Course.hs +++ b/src/Handler/Course.hs @@ -660,7 +660,7 @@ userTableQuery :: UserTableWhere -> UserTableExpr -> E.SqlQuery ( E.SqlExpr (Entity User) , E.SqlExpr (E.Value UTCTime) , E.SqlExpr (E.Value (Maybe CourseUserNoteId)) - , E.SqlExpr (E.ValueList (Entity StudyFeatures), E.SqlExpr (Entity StudyDegree), E.SqlExpr (Entity StudyTerms)) + -- , E.SqlExpr (E.ValueList (Entity StudyFeatures), E.SqlExpr (Entity StudyDegree), E.SqlExpr (Entity StudyTerms)) ) userTableQuery whereClause t@((user `E.InnerJoin` participant) `E.LeftOuterJoin` note) = do E.on $ E.just (participant E.^. CourseParticipantUser) E.==. note E.?. CourseUserNoteUser @@ -668,15 +668,14 @@ userTableQuery whereClause t@((user `E.InnerJoin` participant) `E.LeftOuterJoin` E.where_ $ whereClause t -- let feature = E.case_ [E.when_ (E.isNothing $ participant E.^. CourseParticipantField) E.then_ E.nothing] -- (E.else_ features ) - let dfeat :: _hole -- E.SqlQuery (E.ValueList (E.SqlExpr (Entity StudyFeatures), E.SqlExpr (Entity StudyDegree), E.SqlExpr (Entity StudyTerms))) - dfeat = E.subList_select $ E.from $ \(feature `E.InnerJoin` degree `E.InnerJoin` terms) -> do - E.on $ feature E.^. StudyFeaturesField E.==. terms E.^. StudyTermsId - E.on $ feature E.^. StudyFeaturesDegree E.==. degree E.^. StudyDegreeId - E.where_ $ (E.just (feature E.^. StudyFeaturesId)) E.==. (participant E.^. CourseParticipantField) - E.limit 1 - return (feature,degree,terms) - -- tr <- dfeat - return (user, participant E.^. CourseParticipantRegistration, note E.?. CourseUserNoteId, dfeat) + -- let dfeat :: _hole -- E.SqlQuery (E.ValueList (E.SqlExpr (Entity StudyFeatures), E.SqlExpr (Entity StudyDegree), E.SqlExpr (Entity StudyTerms))) + -- dfeat = E.subList_select $ E.from $ \(feature `E.InnerJoin` degree `E.InnerJoin` terms) -> do + -- E.on $ feature E.^. StudyFeaturesField E.==. terms E.^. StudyTermsId + -- E.on $ feature E.^. StudyFeaturesDegree E.==. degree E.^. StudyDegreeId + -- E.where_ $ (E.just (feature E.^. StudyFeaturesId)) E.==. (participant E.^. CourseParticipantField) + -- E.limit 1 + -- return (feature,degree,terms) + return (user, participant E.^. CourseParticipantRegistration, note E.?. CourseUserNoteId) instance HasEntity UserTableData User where hasEntity = _dbrOutput . _1 @@ -724,7 +723,7 @@ makeCourseUserTable whereClause colChoices psValidator = dbtStyle = def dbtSQLQuery = userTableQuery whereClause dbtRowKey ((user `E.InnerJoin` _participant) `E.LeftOuterJoin` _note) = user E.^. UserId - dbtProj = traverse $ \(user, E.Value registrationTime , E.Value userNoteId,_) -> return (user, registrationTime, userNoteId) -- TODO continue here + dbtProj = traverse $ \(user, E.Value registrationTime , E.Value userNoteId) -> return (user, registrationTime, userNoteId) dbtColonnade = colChoices dbtSorting = Map.fromList [] -- TODO dbtFilter = Map.fromList [] -- TODO