From 930a478ee31c40d594bd986cb91e34d9b894c9c0 Mon Sep 17 00:00:00 2001
From: SJost <jost@tcs.ifi.lmu.de>
Date: Sun, 8 Oct 2017 19:57:08 +0200
Subject: [PATCH] TermTable properly realised with Colonnade now. Additional
 dependencies were required.

---
 package.yaml                  |  3 ++
 src/Handler/Term.hs           | 52 ++++++++++--------------
 src/Handler/Utils.hs          | 10 ++++-
 src/Handler/Utils/DateTime.hs | 10 ++---
 src/Handler/Utils/Table.hs    | 14 +++++++
 stack.yaml                    | 75 ++++-------------------------------
 6 files changed, 58 insertions(+), 106 deletions(-)
 create mode 100644 src/Handler/Utils/Table.hs

diff --git a/package.yaml b/package.yaml
index e2b9b88f3..2f3f2baf4 100644
--- a/package.yaml
+++ b/package.yaml
@@ -50,6 +50,9 @@ dependencies:
 - base64-bytestring
 - memory
 - http-api-data
+- colonnade >=1.1.1
+- yesod-colonnade >=1.1.0
+- blaze-markup
 
 # The library contains all of our application code. The executable
 # defined below is just a thin wrapper.
diff --git a/src/Handler/Term.hs b/src/Handler/Term.hs
index 1db1d6731..892cd258e 100644
--- a/src/Handler/Term.hs
+++ b/src/Handler/Term.hs
@@ -8,46 +8,34 @@
 
 module Handler.Term where
 
-import Import
+import Import 
 import Handler.Utils
+
 import qualified Data.Text as T
--- import Data.Maybe
 import Yesod.Form.Bootstrap3 
--- import Text.Julius (RawJS (..))
+
+import Colonnade
+import Yesod.Colonnade
 
 
 getShowTermsR :: Handler Html
 getShowTermsR = do
   terms <- runDB $ selectList [] [Desc TermStart]
+  let colonnadeTerms = mconcat 
+        -- TODO Edit-Links only $if isAdmin, otherwise breadcrumb navigation
+        [ headed "Kürzel" $ (\t -> let tn = termName t in
+            [whamlet| <a href=@{EditTermExistR tn}>#{termToText tn}|] )        
+        , headed "Beginn Vorlesungen" $ fromString.formatTimeGerWD.termLectureStart
+        , headed "Ende Vorlesungen"   $ fromString.formatTimeGerWD.termLectureEnd
+        , headed "Aktiv"  (\t -> if termActive t then tickmark else "")
+        , headed "Semesteranfang" $ fromString.formatTimeGerWD.termStart
+        , headed "Semesterende"   $ fromString.formatTimeGerWD.termEnd
+        , headed "Feiertage im Semester" $ 
+        fromString.(intercalate ", ").(map formatTimeGerWD).termHolidays
+        ]  
   defaultLayout $ do
-    setTitle "Freigeschaltete Semester"
-    -- TODO: provide common utility function for formatting Times
-    -- TODO: turn into proper table
-    -- TODO Edit-Links only $if isAdmin, otherwise breadcrumb navigation
-    [whamlet|
-      <h2>
-        Liste der freigeschalteten Semester:
-      $if null terms 
-        <p> Es wurden noch kein Semester freigeschaltetet.
-      $else 
-        <ul>
-          $forall Entity _ term <- terms
-            <li>              
-              <a href=@{EditTermExistR $ termName term}>
-                #{termToText $ termName term}               
-              #{formatTimeGerWD $ termStart term}
-              bis #{formatTimeGerWD $ termEnd   term}.
-              
-              <h4>
-                Vorlesungszeit:
-              #{formatTimeGerWD $ termLectureStart term}
-              bis #{formatTimeGerWD $ termLectureEnd   term}.
-              $if termActive term 
-                (Semester ist aktiv)
-              $with holidays <- termHolidays term
-                $if not (null holidays)
-                  Feiertage im Semester: #{show holidays}
-    |]
+    setTitle "Freigeschaltete Semester"            
+    encodeHeadedWidgetTable tableDefault colonnadeTerms (map entityVal terms)
 
     
 getNewTermR :: Handler Html
@@ -71,12 +59,14 @@ getEditTermExistR tid = do
 getEditTermMaybeR :: Maybe Term -> Handler Html
 getEditTermMaybeR mbTerm= do 
     aid <- requireAuthId
+    -- TODO: verify Admin 
     (formWidget, formEnctype) <- generateFormPost $ newTermForm mbTerm
     wdgtTermForm formWidget formEnctype
         
 postEditTermR :: Handler Html
 postEditTermR = do
     aid <- requireAuthId
+    -- TODO: verify Admin 
     ((result, formWidget), formEnctype) <- runFormPost $ newTermForm Nothing
     action <- lookupPostParam "formaction"
     case (result,action) of
diff --git a/src/Handler/Utils.hs b/src/Handler/Utils.hs
index 9d39c556f..0dfaa8721 100644
--- a/src/Handler/Utils.hs
+++ b/src/Handler/Utils.hs
@@ -1,11 +1,17 @@
-{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE OverloadedStrings #-}
 
 module Handler.Utils
-  ( module Handler.Utils 
+  ( module Handler.Utils
   ) where
 
+import Import.NoFoundation
+  
 import Handler.Utils.DateTime as Handler.Utils
 import Handler.Utils.Term as Handler.Utils
 import Handler.Utils.Bootstrap3 as Handler.Utils
 import Handler.Utils.Form as Handler.Utils
+import Handler.Utils.Table as Handler.Utils
 
+
+tickmark :: IsString a => a
+tickmark = fromString "✔"
diff --git a/src/Handler/Utils/DateTime.hs b/src/Handler/Utils/DateTime.hs
index 1cd8dde67..cd2627ea5 100644
--- a/src/Handler/Utils/DateTime.hs
+++ b/src/Handler/Utils/DateTime.hs
@@ -1,10 +1,8 @@
 module Handler.Utils.DateTime where
 
-
 import Data.Time
 
-
-germanTimeLocale :: TimeLocale	 
+germanTimeLocale :: TimeLocale 
 germanTimeLocale = TimeLocale 
   { wDays   = [("Montag"     ,"Mo")
               ,("Dienstag"   ,"Di")
@@ -36,8 +34,8 @@ germanTimeLocale = TimeLocale
   }
 
 formatTimeGer ::  FormatTime t => String -> t -> String
-formatTimeGer = formatTime germanTimeLocale 
-  
+formatTimeGer = formatTime germanTimeLocale
+
 formatTimeGerDTlong :: FormatTime t => t -> String
 formatTimeGerDTlong = formatTimeGer "%A, %e. %B %Y, %k:%M:%S"
 
@@ -52,6 +50,6 @@ formatTimeGerWD = formatTimeGer "%a %e.%m.%y"
 
 formatTimeGerD :: FormatTime t => t -> String
 formatTimeGerD = formatTimeGer $ dateFmt germanTimeLocale
-  
+
 formatTimeGerT :: FormatTime t => t -> String
 formatTimeGerT = formatTimeGer $ timeFmt germanTimeLocale
diff --git a/src/Handler/Utils/Table.hs b/src/Handler/Utils/Table.hs
new file mode 100644
index 000000000..5f532a1de
--- /dev/null
+++ b/src/Handler/Utils/Table.hs
@@ -0,0 +1,14 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+module Handler.Utils.Table where
+-- General Utilities for Tables
+
+-- import Import hiding  ((<>))
+import Data.Monoid ((<>))
+
+import Text.Blaze as B
+
+-- Table design
+tableDefault :: Attribute
+tableDefault = customAttribute "class" "table table-striped"                 
diff --git a/stack.yaml b/stack.yaml
index 8a276d119..1e1790f3f 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,71 +1,12 @@
-# This file was automatically generated by 'stack init'
-#
-# Some commonly used options have been documented as comments in this file.
-# For advanced use and comprehensive documentation of the format, please see:
-# https://docs.haskellstack.org/en/stable/yaml_configuration/
-
-# Resolver to choose a 'specific' stackage snapshot or a compiler version.
-# A snapshot resolver dictates the compiler version and the set of packages
-# to be used for project dependencies. For example:
-#
-# resolver: lts-3.5
-# resolver: nightly-2015-09-21
-# resolver: ghc-7.10.2
-# resolver: ghcjs-0.1.0_ghc-7.10.2
-# resolver:
-#  name: custom-snapshot
-#  location: "./custom-snapshot.yaml"
-resolver: lts-9.3
-
-# User packages to be built.
-# Various formats can be used as shown in the example below.
-#
-# packages:
-# - some-directory
-# - https://example.com/foo/bar/baz-0.0.2.tar.gz
-# - location:
-#    git: https://github.com/commercialhaskell/stack.git
-#    commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
-# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a
-#   extra-dep: true
-#  subdirs:
-#  - auto-update
-#  - wai
-#
-# A package marked 'extra-dep: true' will only be built if demanded by a
-# non-dependency (i.e. a user package), and its test suites and benchmarks
-# will not be run. This is useful for tweaking upstream packages.
-packages:
-- .
-# Dependency packages to be pulled from upstream that are not in the resolver
-# (e.g., acme-missiles-0.3)
-extra-deps: []
-
-# Override default flag values for local packages and extra-deps
 flags: {}
-
-# Extra package databases containing global packages
-extra-package-dbs: []
-
-# Control whether we use the GHC we find on the path
-# system-ghc: true
-#
-# Require a specific version of stack, using version ranges
-# require-stack-version: -any # Default
-# require-stack-version: ">=1.5"
-#
-# Override the architecture used by stack, especially useful on Windows
-# arch: i386
-# arch: x86_64
-#
-# Extra directories used by stack for building
-# extra-include-dirs: [/path/to/dir]
-# extra-lib-dirs: [/path/to/dir]
-#
-# Allow a newer minor version of GHC than the snapshot specifies
-# compiler-check: newer-minor
-
 nix:
   packages: []
-  shell-file: ./stack.nix
   pure: false
+  shell-file: ./stack.nix
+extra-package-dbs: []
+packages:
+- .
+extra-deps:
+- colonnade-1.1.1
+- yesod-colonnade-1.1.0
+resolver: lts-9.3