Allow customizing behaviour of dbTable when empty

Resolves #104

messages/de.msg

@@ -187,4 +187,7 @@ RatingFilesUpdated: Korrigierte Dateien überschrieben
 
 CourseMembers: Teilnehmer
 CourseMembersCount num@Int64: #{display num}
-CourseMembersCountLimited num@Int64 max@Int64: #{display num}/#{display max}
+CourseMembersCountLimited num@Int64 max@Int64: #{display num}/#{display max}
+
+NoTableContent: Kein Tabelleninhalt
+NoUpcomingSheetDeadlines: Keine anstehenden Übungsblätter

src/Handler/Corrections.hs

@@ -170,7 +170,7 @@ makeCorrectionsTable whereClause colChoices psValidator = do
                                           E.||. (if Nothing `Set.member` emails then E.isNothing (corrector E.?. UserEmail) else E.val False)
                        )
                      ]
-    , dbtAttrs     = tableDefault
+    , dbtStyle     = def
     , dbtIdent     = "corrections" :: Text
     }
 

src/Handler/Course.hs

@@ -85,7 +85,7 @@ getTermCourseListR tid = do
           )
         ]
     , dbtFilter = mempty
-    , dbtAttrs = tableDefault
+    , dbtStyle = def
     , dbtIdent = "courses" :: Text
     }
   

src/Handler/Home.hs

@@ -99,7 +99,7 @@ homeAnonymous = do
                             | otherwise     -> course E.^. CourseTerm `E.in_` E.valList (Set.toList tids)
                         )
                         ] -}
-    , dbtAttrs     = tableDefault
+    , dbtStyle     = def
     , dbtIdent     = "upcomingdeadlines" :: Text
     }
   let features = $(widgetFile "featureList")
@@ -188,7 +188,7 @@ homeUser uid = do
                             | otherwise     -> course E.^. CourseTerm `E.in_` E.valList (Set.toList tids)
                         )
                         ] -}
-    , dbtAttrs     = tableDefault
+    , dbtStyle     = def { dbsEmptyStyle = DBESNoHeading, dbsEmptyMessage = MsgNoUpcomingSheetDeadlines }
     , dbtIdent     = "upcomingdeadlines" :: Text
     }
   defaultLayout $ do

src/Handler/Sheet.hs

@@ -227,7 +227,7 @@ getSShowR tid csh shn = do
   fileTable <- dbTable def $ DBTable
     { dbtSQLQuery = fileData
     , dbtColonnade = colonnadeFiles
-    , dbtAttrs = tableDefault
+    , dbtStyle = def
     , dbtFilter = Map.empty
     , dbtIdent = "files" :: Text
     -- TODO: Add column for and visibility date

src/Handler/Submission.hs

@@ -288,7 +288,7 @@ submissionHelper tid csh shn (SubmissionMode mcid) = do
       smid2ArchiveTable (smid,cid) = DBTable
         { dbtSQLQuery = submissionFiles smid
         , dbtColonnade = colonnadeFiles cid
-        , dbtAttrs = tableDefault
+        , dbtStyle = def
         , dbtIdent = "files" :: Text
         , dbtSorting =  [ ( "path"
                           , SortColumn $ \((sf1 `E.InnerJoin` f1) `E.FullOuterJoin` (sf2 `E.InnerJoin` f2)) -> E.coalesce [f1 E.?. FileTitle, f2 E.?. FileTitle]

src/Handler/Term.hs

@@ -99,7 +99,7 @@ getTermShowR = do
                                    E.&&. course E.^. CourseShorthand `E.in_` E.valList cshs
                         )
                       ]
-        , dbtAttrs = tableDefault
+        , dbtStyle = def
         , dbtIdent = "terms" :: Text
         }
       defaultLayout $ do

src/Handler/Utils/Table/Pagination.hs

@@ -21,6 +21,7 @@ module Handler.Utils.Table.Pagination
   ( SortColumn(..), SortDirection(..)
   , FilterColumn(..), IsFilterColumn
   , DBRow(..), DBOutput
+  , DBStyle(..), DBEmptyStyle(..)
   , DBTable(..), IsDBTable(..)
   , PaginationSettings(..), PaginationInput(..), piIsUnset
   , PSValidator(..)
@@ -128,6 +129,25 @@ instance DBOutput (DBRow r) r where
 instance DBOutput (DBRow r) (Int64, r) where
   dbProj = (,) <$> dbrIndex <*> dbrOutput
 
+data DBEmptyStyle = DBESNoHeading | DBESHeading
+  deriving (Enum, Bounded, Ord, Eq, Show, Read)
+
+instance Default DBEmptyStyle where
+  def = DBESHeading
+
+data DBStyle = DBStyle
+  { dbsEmptyStyle :: DBEmptyStyle
+  , dbsEmptyMessage :: UniWorXMessage
+  , dbsAttrs :: [(Text, Text)]
+  }
+
+instance Default DBStyle where
+  def = DBStyle
+    { dbsEmptyStyle = def
+    , dbsEmptyMessage = MsgNoTableContent
+    , dbsAttrs = [ ("class", "table table-striped table-hover table-sortable") ]
+    }
+
 data DBTable m x = forall a r r' h i t.
   ( ToSortable h, Functor h
   , E.SqlSelect a r, DBOutput (DBRow r) r'
@@ -138,7 +158,7 @@ data DBTable m x = forall a r r' h i t.
   , dbtColonnade :: Colonnade h r' (DBCell m x)
   , dbtSorting :: Map (CI Text) (SortColumn t)
   , dbtFilter :: Map (CI Text) (FilterColumn t)
-  , dbtAttrs :: Attribute -- FIXME: currently unused
+  , dbtStyle :: DBStyle
   , dbtIdent :: i
   }
 
@@ -285,7 +305,7 @@ instance IsDBTable m a => IsString (DBCell m a) where
       
 
 dbTable :: forall m x. IsDBTable m x => PSValidator m x -> DBTable m x -> Handler (DBResult m x)
-dbTable PSValidator{..} dbtable@(DBTable{ dbtIdent = (toPathPiece -> dbtIdent), dbtColonnade = (lmap dbProj -> dbtColonnade), .. }) = do
+dbTable PSValidator{..} dbtable@(DBTable{ dbtIdent = (toPathPiece -> dbtIdent), dbtColonnade = (lmap dbProj -> dbtColonnade), dbtStyle = DBStyle{..}, .. }) = do
   let
     sortingOptions = mkOptionList
       [ Option t' (t, d) t'
@@ -297,9 +317,9 @@ dbTable PSValidator{..} dbtable@(DBTable{ dbtIdent = (toPathPiece -> dbtIdent),
     wIdent n
       | not $ null dbtIdent = dbtIdent <> "-" <> n
       | otherwise           = n
-    dbtAttrs'
+    dbsAttrs'
-      | not $ null dbtIdent = Html5.id (fromString $ unpack dbtIdent) <> dbtAttrs
+      | not $ null dbtIdent = ("id", dbtIdent) : dbsAttrs
-      | otherwise           = dbtAttrs
+      | otherwise           = dbsAttrs
     multiTextField = Field
       { fieldParse = \ts _ -> return . Right $ Just ts
       , fieldView = undefined

templates/table/colonnade.hamlet

@@ -1,5 +1,5 @@
 $newline never
-<table id="#{dbtIdent}" .table.table--striped.table--hover>
+<table *{dbsAttrs'}>
   $maybe wHeaders' <- wHeaders
     <thead>
       <tr .table__row.table__row--head>
@@ -8,10 +8,10 @@ $newline never
           ^{widget}
   $nothing
   <tbody>
-    $if null wRows
+    $if null wRows && (dbsEmptyStyle == DBESHeading)
       <tr>
         <td colspan=#{show columnCount}>
-          Kein Inhalt.
+          _{dbsEmptyMessage}
     $else
       $forall row <- wRows
         <tr .table__row>

templates/table/layout.hamlet

@@ -1,10 +1,13 @@
 $newline never
-<div ##{dbtIdent}-table-wrapper>
+$if null wRows && (dbsEmptyStyle == DBESNoHeading)
-  <div .scrolltable>
+  _{dbsEmptyMessage}
-    ^{table}
+$else
-  $if pageCount > 1
+  <div ##{wIdent "table-wrapper"}>
-    <ul ##{dbtIdent}-pagination .pagination>
+    <div .scrolltable>
-      $forall p <- pageNumbers
+      ^{table}
-        <li .pagination-link :p == psPage:.current>
+    $if pageCount > 1
-          <a href=#{tblLink $ setParam (wIdent "page") (Just $ tshow p)}>
+      <ul ##{wIdent "pagination"} .pagination>
-            _{MsgPage (succ p)}
+        $forall p <- pageNumbers
+          <li .pagination-link :p == psPage:.current>
+            <a href=#{tblLink $ setParam (wIdent "page") (Just $ tshow p)}>
+              _{MsgPage (succ p)}