From 67927742bb9adb60118791212159a00f6e73ad24 Mon Sep 17 00:00:00 2001 From: SJost Date: Thu, 21 Jun 2018 10:27:09 +0200 Subject: [PATCH 1/2] leading zero date format fixed --- src/Handler/Sheet.hs | 2 +- src/Handler/Utils/Form.hs | 2 +- src/Utils.hs | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs index 54617fa19..772fa3b20 100644 --- a/src/Handler/Sheet.hs +++ b/src/Handler/Sheet.hs @@ -221,7 +221,7 @@ getSShowR tid csh shn = do { dbtSQLQuery = fileData , dbtColonnade = colonnadeFiles , dbtAttrs = tableDefault - -- , dbtFilter = Map.empty -- TODO: Just for Testing. Gregor needs to explain what is needed here. + , dbtFilter = Map.empty , dbtIdent = "files" :: Text -- TODO: Add column for and visibility date , dbtSorting = [ ( "type" diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs index 231af6a5c..9182d4c34 100644 --- a/src/Handler/Utils/Form.hs +++ b/src/Handler/Utils/Form.hs @@ -366,7 +366,7 @@ utcTimeField = Field where fieldTimeFormat :: String --fieldTimeFormat = "%e.%m.%y %k:%M" - fieldTimeFormat = "%Y-%m-%eT%H:%M" + fieldTimeFormat = "%Y-%m-%dT%H:%M" readTime :: Text -> Either FormMessage UTCTime readTime t = diff --git a/src/Utils.hs b/src/Utils.hs index b06986864..56e714d81 100644 --- a/src/Utils.hs +++ b/src/Utils.hs @@ -99,8 +99,6 @@ instance DisplayAble Text where instance DisplayAble String where display = pack - - instance DisplayAble a => DisplayAble (Maybe a) where display Nothing = "" display (Just x) = display x From 91a64a8d6779b3df2c81ea18f9d4cc6add5155bc Mon Sep 17 00:00:00 2001 From: Felix Hamann Date: Thu, 21 Jun 2018 10:36:44 +0200 Subject: [PATCH 2/2] got rid of old and/or done TODOs in FE source --- templates/widgets/asidenav.hamlet | 1 - templates/widgets/asidenav.lucius | 3 --- templates/widgets/form.hamlet | 1 - 3 files changed, 5 deletions(-) diff --git a/templates/widgets/asidenav.hamlet b/templates/widgets/asidenav.hamlet index 8ab51439f..a3994f85e 100644 --- a/templates/widgets/asidenav.hamlet +++ b/templates/widgets/asidenav.hamlet @@ -17,7 +17,6 @@ $newline never WiSe 17/18