From fcb50859fc0894a2e078119861b5c68cfcf2c801 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 18 Jul 2018 13:13:09 +0200 Subject: [PATCH] Fix sheet table --- src/Handler/Sheet.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs index da68bbce5..49d7ba18e 100644 --- a/src/Handler/Sheet.hs +++ b/src/Handler/Sheet.hs @@ -148,8 +148,9 @@ getSheetListR tid csh = do let sheetData :: E.SqlExpr (E.Entity Sheet) -> E.SqlQuery (E.SqlExpr (Entity Sheet), E.SqlExpr (E.Value (Maybe UTCTime))) sheetData sheet = do - let sheetEdit = E.sub_select . E.from $ \sheetEdit -> E.distinctOnOrderBy [E.desc $ sheetEdit E.?. SheetEditTime] $ do - return $ sheetEdit E.?. SheetEditTime + let sheetEdit = E.sub_select . E.from $ \sheetEdit -> do + E.where_ $ sheetEdit E.^. SheetEditSheet E.==. sheet E.^. SheetId + return . E.max_ $ sheetEdit E.^. SheetEditTime E.where_ $ sheet E.^. SheetCourse E.==. E.val cid return (sheet, sheetEdit) sheetCol = widgetColonnade . mconcat $