From a67a94468cb65afa0a401afc028e889d28917744 Mon Sep 17 00:00:00 2001
From: SJost <jost@tcs.ifi.lmu.de>
Date: Thu, 2 Aug 2018 09:58:43 +0200
Subject: [PATCH] Minor cleaning of redundant alerts

---
 src/Handler/Home.hs             | 2 ++
 src/Handler/Sheet.hs            | 8 ++++----
 templates/home.hamlet           | 7 -------
 templates/homeUser.hamlet       | 7 -------
 templates/versionHistory.hamlet | 7 -------
 5 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/src/Handler/Home.hs b/src/Handler/Home.hs
index 786828b70..960ff2757 100644
--- a/src/Handler/Home.hs
+++ b/src/Handler/Home.hs
@@ -102,6 +102,7 @@ homeAnonymous = do
     , dbtIdent     = "upcomingdeadlines" :: Text
     }
   let features = $(widgetFile "featureList")
+  addMessage "danger" "Vorabversion! Die Implementierung von  Uni2work ist noch nicht abgeschlossen!"
   defaultLayout $ do
     $(widgetFile "dsgvDisclaimer")
     $(widgetFile "home")
@@ -192,6 +193,7 @@ homeUser uid = do
     , dbtStyle     = def { dbsEmptyStyle = DBESNoHeading, dbsEmptyMessage = MsgNoUpcomingSheetDeadlines }
     , dbtIdent     = "upcomingdeadlines" :: Text
     }
+  addMessage "danger" "Vorabversion! Die Implementierung von  Uni2work ist noch nicht abgeschlossen."
   defaultLayout $ do
     -- setTitle "Willkommen zum Uni2work Test!"
     $(widgetFile "homeUser")
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 584c0b4b9..8284164c1 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -238,9 +238,9 @@ getSheetListR tid csh = do
         )
 --    GitLab Issue $143: HOW TO SORT?
 --       , ( "percent"
---         , SortColumn $ \(sheet `E.LeftOuterJoin` (submission `E.InnerJoin` ))) ->
+--         , SortColumn $ \(sheet `E.LeftOuterJoin` (submission `E.InnerJoin` _submissionUser)) ->
 --             case sheetType of -- no Haskell inside Esqueleto, right?
---             (submission E.?. SubmissionRatingPoints) E./. (sheet )
+--             (submission E.?. SubmissionRatingPoints) E./. (sheet E.^. SheetType)
 --         )
       ]
     , dbtFilter    = Map.fromList
@@ -248,8 +248,8 @@ getSheetListR tid csh = do
     , dbtStyle     = def
     , dbtIdent     = "sheets" :: Text
     }
-  cTime <- Just <$> liftIO getCurrentTime -- TODO: remove me and the 2 next TODOs, see issue #142
-  rawStats <- runDB $ do
+  cTime <- Just <$> liftIO getCurrentTime -- TODO: HACK - remove me and the 2 next TODOs, see issue #142
+  rawStats <- runDB $ do -- compute the values of the table once again, since dbTable does not provide a list of raw values for summation/statistics
     E.select $ E.from $ \(sheet `E.LeftOuterJoin` (submission `E.InnerJoin` submissionUser)) -> do
       E.on $ submission E.?. SubmissionId E.==. submissionUser E.?. SubmissionUserSubmission
       E.on $  (E.just $ sheet E.^. SheetId) E.==. submission E.?. SubmissionSheet
diff --git a/templates/home.hamlet b/templates/home.hamlet
index bb378fe62..8f5c3bafb 100644
--- a/templates/home.hamlet
+++ b/templates/home.hamlet
@@ -1,12 +1,5 @@
 <div .container>
 
-  <div .alerts>
-    <div .alert .alert-danger>
-      <div .alert__content>
-        Vorabversion!
-        Die Implementierung von
-        Uni2work ist noch nicht abgeschlossen.
-
   <h1>
     Kurse mit offener Registrierung
   <div .container>
diff --git a/templates/homeUser.hamlet b/templates/homeUser.hamlet
index 714e68b32..c82ea98ef 100644
--- a/templates/homeUser.hamlet
+++ b/templates/homeUser.hamlet
@@ -2,13 +2,6 @@
   <h3>
     Re-Implementierung von <a href="https://uniworx.ifi.lmu.de/">UniWorX</a>
 
-  <div .alerts>
-    <div .alert .alert-danger>
-      <div .alert__content>
-        Vorabversion!
-        Die Implementierung von
-        Uni2work ist noch nicht abgeschlossen.
-
 <div .container>
   <h1>
     Anstehende Übungsblätter
diff --git a/templates/versionHistory.hamlet b/templates/versionHistory.hamlet
index 0ce080032..859356ca5 100644
--- a/templates/versionHistory.hamlet
+++ b/templates/versionHistory.hamlet
@@ -2,13 +2,6 @@
   <h3>
     Re-Implementierung von <a href="https://uniworx.ifi.lmu.de/">UniWorX</a>
 
-  <div .alerts>
-    <div .alert .alert-danger>
-      <div .alert__content>
-        Vorabversion!
-        Die Implementierung von
-        Uni2work ist noch nicht abgeschlossen.
-
   <section>
     ^{features}