From 710b591b4ac1ba3be6685415c7de65ef8df7eba2 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 3 Apr 2019 22:07:30 +0200
Subject: [PATCH 001/238] Improve AuthPred memoisation

---
 src/Foundation.hs                 | 126 +++++++++++++++++-------------
 src/Import/NoFoundation.hs        |   2 +-
 src/Model/Types.hs                |   2 +
 src/Yesod/Core/Instances.hs       |  65 ++++++++++-----
 src/Yesod/Core/Types/Instances.hs |  36 ++++++++-
 start.sh                          |  11 ++-
 6 files changed, 156 insertions(+), 86 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 0d8e5d909..0aca60110 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -60,7 +60,7 @@ import Control.Monad.Trans.Maybe (MaybeT(..))
 import Control.Monad.Trans.Reader (runReader, mapReaderT)
 import Control.Monad.Trans.Writer (WriterT(..), runWriterT)
 import Control.Monad.Writer.Class (MonadWriter(..))
-import Control.Monad.Memo (MemoT, startEvalMemoT, MonadMemo(..))
+import Control.Monad.Memo.Class (MonadMemo(..), for4)
 import qualified Control.Monad.Catch as C
 
 import Handler.Utils.StudyFeatures
@@ -137,6 +137,8 @@ type SMTPPool = Pool SMTPConnection
 -- type Widget    = WidgetT  UniWorX IO ()
 mkYesodData "UniWorX" $(parseRoutesFile "routes")
 
+deriving instance Generic (Route UniWorX)
+
 -- | Convenient Type Synonyms:
 type DB a = YesodDB UniWorX a
 type Form x = Html -> MForm (HandlerT UniWorX IO) (FormResult x, Widget)
@@ -385,24 +387,24 @@ appLanguagesOpts = do
 
 -- Access Control
 data AccessPredicate
-  = APPure     (Route UniWorX -> Bool -> Reader MsgRenderer AuthResult)
-  | APHandler  (Route UniWorX -> Bool -> Handler AuthResult)
-  | APDB       (Route UniWorX -> Bool -> DB AuthResult)
+  = APPure     (Maybe (AuthId UniWorX) -> Route UniWorX -> Bool -> Reader MsgRenderer AuthResult)
+  | APHandler  (Maybe (AuthId UniWorX) -> Route UniWorX -> Bool -> Handler AuthResult)
+  | APDB       (Maybe (AuthId UniWorX) -> Route UniWorX -> Bool -> DB AuthResult)
 
 class (MonadHandler m, HandlerSite m ~ UniWorX) => MonadAP m where
-  evalAccessPred :: AccessPredicate -> Route UniWorX -> Bool -> m AuthResult
+  evalAccessPred :: AccessPredicate -> Maybe (AuthId UniWorX) -> Route UniWorX -> Bool -> m AuthResult
 
 instance {-# INCOHERENT #-} (MonadHandler m, HandlerSite m ~ UniWorX) => MonadAP m where
-  evalAccessPred aPred r w = liftHandlerT $ case aPred of
-    (APPure    p) -> runReader (p r w) <$> getMsgRenderer
-    (APHandler p) -> p r w
-    (APDB      p) -> runDB $ p r w
+  evalAccessPred aPred aid r w = liftHandlerT $ case aPred of
+    (APPure    p) -> runReader (p aid r w) <$> getMsgRenderer
+    (APHandler p) -> p aid r w
+    (APDB      p) -> runDB $ p aid r w
 
 instance (MonadHandler m, HandlerSite m ~ UniWorX, backend ~ YesodPersistBackend UniWorX) => MonadAP (ReaderT backend m) where
-  evalAccessPred aPred r w = mapReaderT liftHandlerT $ case aPred of
-    (APPure    p) -> lift $ runReader (p r w) <$> getMsgRenderer
-    (APHandler p) -> lift $ p r w
-    (APDB      p) -> p r w
+  evalAccessPred aPred aid r w = mapReaderT liftHandlerT $ case aPred of
+    (APPure    p) -> lift $ runReader (p aid r w) <$> getMsgRenderer
+    (APHandler p) -> lift $ p aid r w
+    (APDB      p) -> p aid r w
 
 
 orAR, andAR :: MsgRenderer -> AuthResult -> AuthResult -> AuthResult
@@ -423,16 +425,16 @@ trueAR = const Authorized
 falseAR = Unauthorized . ($ MsgUnauthorized) . render
 
 trueAP, falseAP :: AccessPredicate
-trueAP  = APPure . const . const $ trueAR <$> ask
-falseAP = APPure . const . const $ falseAR <$> ask -- included for completeness
+trueAP  = APPure . const . const . const $ trueAR <$> ask
+falseAP = APPure . const . const . const $ falseAR <$> ask -- included for completeness
 
 
 tagAccessPredicate :: AuthTag -> AccessPredicate
 tagAccessPredicate AuthFree = trueAP
-tagAccessPredicate AuthAdmin = APDB $ \route _ -> case route of
+tagAccessPredicate AuthAdmin = APDB $ \mAuthId route _ -> case route of
   -- Courses: access only to school admins
   CourseR tid ssh csh _ -> exceptT return return $ do
-    authId <- maybeExceptT AuthenticationRequired $ lift maybeAuthId
+    authId <- maybeExceptT AuthenticationRequired $ return mAuthId
     [E.Value c] <- lift . E.select . E.from $ \(course `E.InnerJoin` userAdmin) -> do
       E.on $ course E.^. CourseSchool E.==. userAdmin E.^. UserAdminSchool
       E.where_  $ userAdmin E.^. UserAdminUser E.==. E.val authId
@@ -444,13 +446,13 @@ tagAccessPredicate AuthAdmin = APDB $ \route _ -> case route of
     return Authorized
   -- other routes: access to any admin is granted here
   _other -> exceptT return return $ do
-    authId <- maybeExceptT AuthenticationRequired $ lift maybeAuthId
+    authId <- maybeExceptT AuthenticationRequired $ return mAuthId
     adrights <- lift $ selectFirst [UserAdminUser ==. authId] []
     guardMExceptT (isJust adrights) (unauthorizedI MsgUnauthorizedSiteAdmin)
     return Authorized
-tagAccessPredicate AuthNoEscalation = APDB $ \route _ -> case route of
+tagAccessPredicate AuthNoEscalation = APDB $ \mAuthId route _ -> case route of
   AdminHijackUserR cID -> exceptT return return $ do
-    myUid <- maybeExceptT AuthenticationRequired $ lift maybeAuthId
+    myUid <- maybeExceptT AuthenticationRequired $ return mAuthId
     uid <- decrypt cID
     otherSchoolsAdmin <- lift $ Set.fromList . map (userAdminSchool . entityVal) <$> selectList [UserAdminUser ==. uid] []
     otherSchoolsLecturer <- lift $ Set.fromList . map (userLecturerSchool . entityVal) <$> selectList [UserLecturerUser ==. uid] []
@@ -458,21 +460,21 @@ tagAccessPredicate AuthNoEscalation = APDB $ \route _ -> case route of
     guardMExceptT ((otherSchoolsAdmin `Set.union` otherSchoolsLecturer) `Set.isSubsetOf` mySchools) (unauthorizedI MsgUnauthorizedAdminEscalation)
     return Authorized
   r -> $unsupportedAuthPredicate AuthNoEscalation r
-tagAccessPredicate AuthDeprecated = APHandler $ \r _ -> do
+tagAccessPredicate AuthDeprecated = APHandler $ \_ r _ -> do
   $logWarnS "AccessControl" ("deprecated route: " <> tshow r)
   addMessageI Error MsgDeprecatedRoute
   allow <- appAllowDeprecated . appSettings <$> getYesod
   return $ bool (Unauthorized "Deprecated Route") Authorized allow
-tagAccessPredicate AuthDevelopment = APHandler $ \r _ -> do
+tagAccessPredicate AuthDevelopment = APHandler $ \_ r _ -> do
   $logWarnS "AccessControl" ("route in development: " <> tshow r)
 #ifdef DEVELOPMENT
   return Authorized
 #else
   return $ Unauthorized "Route under development"
 #endif
-tagAccessPredicate AuthLecturer = APDB $ \route _ -> case route of
+tagAccessPredicate AuthLecturer = APDB $ \mAuthId route _ -> case route of
   CourseR tid ssh csh _ -> exceptT return return $ do
-     authId <- maybeExceptT AuthenticationRequired $ lift maybeAuthId
+     authId <- maybeExceptT AuthenticationRequired $ return mAuthId
      [E.Value c] <- lift . E.select . E.from $ \(course `E.InnerJoin` lecturer) -> do
        E.on $ course E.^. CourseId E.==. lecturer E.^. LecturerCourse
        E.where_ $ lecturer E.^. LecturerUser E.==. E.val authId
@@ -484,11 +486,11 @@ tagAccessPredicate AuthLecturer = APDB $ \route _ -> case route of
      return Authorized
   -- lecturer for any school will do
   _ -> exceptT return return $ do
-     authId <- maybeExceptT AuthenticationRequired $ lift maybeAuthId
+     authId <- maybeExceptT AuthenticationRequired $ return mAuthId
      void . maybeMExceptT (unauthorizedI MsgUnauthorizedSchoolLecturer) $ selectFirst [UserLecturerUser ==. authId] []
      return Authorized
-tagAccessPredicate AuthCorrector = APDB $ \route _ -> exceptT return return $ do
-  authId <- maybeExceptT AuthenticationRequired $ lift maybeAuthId
+tagAccessPredicate AuthCorrector = APDB $ \mAuthId route _ -> exceptT return return $ do
+  authId <- maybeExceptT AuthenticationRequired $ return mAuthId
   resList <- lift . E.select . E.from $ \(course `E.InnerJoin` sheet `E.InnerJoin` sheetCorrector) -> do
     E.on $ sheetCorrector E.^. SheetCorrectorSheet E.==. sheet E.^. SheetId
     E.on $ sheet E.^. SheetCourse E.==. course E.^. CourseId
@@ -515,7 +517,7 @@ tagAccessPredicate AuthCorrector = APDB $ \route _ -> exceptT return return $ do
     _ -> do
       guardMExceptT (not $ Map.null resMap) (unauthorizedI MsgUnauthorizedCorrectorAny)
       return Authorized
-tagAccessPredicate AuthTime = APDB $ \route _ -> case route of
+tagAccessPredicate AuthTime = APDB $ \mAuthId route _ -> case route of
   CSheetR tid ssh csh shn subRoute -> maybeT (unauthorizedI MsgUnauthorizedSheetTime) $ do
     Entity cid _ <- MaybeT . getBy $ TermSchoolCourseShort tid ssh csh
     Entity _sid Sheet{..} <- MaybeT . getBy $ CourseSheet cid shn
@@ -541,8 +543,7 @@ tagAccessPredicate AuthTime = APDB $ \route _ -> case route of
   CourseR tid ssh csh CRegisterR -> do
     now <- liftIO getCurrentTime
     mbc <- getBy $ TermSchoolCourseShort tid ssh csh
-    mAid <- lift maybeAuthId
-    registered <- case (mbc,mAid) of
+    registered <- case (mbc,mAuthId) of
       (Just (Entity cid _), Just uid) -> isJust <$> (getBy $ UniqueParticipant uid cid)
       _ -> return False
     case mbc of
@@ -564,9 +565,9 @@ tagAccessPredicate AuthTime = APDB $ \route _ -> case route of
     return Authorized
 
   r -> $unsupportedAuthPredicate AuthTime r
-tagAccessPredicate AuthRegistered = APDB $ \route _ -> case route of
+tagAccessPredicate AuthRegistered = APDB $ \mAuthId route _ -> case route of
   CourseR tid ssh csh _ -> exceptT return return $ do
-    authId <- maybeExceptT AuthenticationRequired $ lift maybeAuthId
+    authId <- maybeExceptT AuthenticationRequired $ return mAuthId
     [E.Value c] <- lift . E.select . E.from $ \(course `E.InnerJoin` courseParticipant) -> do
       E.on $ course E.^. CourseId E.==. courseParticipant E.^. CourseParticipantCourse
       E.where_ $ courseParticipant E.^. CourseParticipantUser E.==. E.val authId
@@ -577,7 +578,7 @@ tagAccessPredicate AuthRegistered = APDB $ \route _ -> case route of
     guardMExceptT (c > 0) (unauthorizedI MsgUnauthorizedRegistered)
     return Authorized
   r -> $unsupportedAuthPredicate AuthRegistered r
-tagAccessPredicate AuthParticipant = APDB $ \route _ -> case route of
+tagAccessPredicate AuthParticipant = APDB $ \_ route _ -> case route of
   CourseR tid ssh csh (CUserR cID) -> exceptT return return $ do
     let authorizedIfExists f = do
           [E.Value ok] <- lift . E.select . return . E.exists $ E.from f
@@ -639,14 +640,14 @@ tagAccessPredicate AuthParticipant = APDB $ \route _ -> case route of
            E.&&. course E.^. CourseShorthand E.==. E.val csh
     unauthorizedI MsgUnauthorizedParticipant
   r -> $unsupportedAuthPredicate AuthParticipant r
-tagAccessPredicate AuthCapacity = APDB $ \route _ -> case route of
+tagAccessPredicate AuthCapacity = APDB $ \_ route _ -> case route of
   CourseR tid ssh csh _ -> maybeT (unauthorizedI MsgCourseNoCapacity) $ do
     Entity cid Course{..} <- MaybeT . getBy $ TermSchoolCourseShort tid ssh csh
     registered <- lift $ fromIntegral <$> count [ CourseParticipantCourse ==. cid ]
     guard $ NTop courseCapacity > NTop (Just registered)
     return Authorized
   r -> $unsupportedAuthPredicate AuthCapacity r
-tagAccessPredicate AuthEmpty = APDB $ \route _ -> case route of
+tagAccessPredicate AuthEmpty = APDB $ \_ route _ -> case route of
   CourseR tid ssh csh _ -> maybeT (unauthorizedI MsgCourseNotEmpty) $ do
     -- Entity cid Course{..} <- MaybeT . getBy $ TermSchoolCourseShort tid ssh csh
     cid <- MaybeT . getKeyBy $ TermSchoolCourseShort tid ssh csh
@@ -657,50 +658,50 @@ tagAccessPredicate AuthEmpty = APDB $ \route _ -> case route of
       return E.countRows
     return Authorized
   r -> $unsupportedAuthPredicate AuthEmpty r
-tagAccessPredicate AuthMaterials = APDB $ \route _ -> case route of
+tagAccessPredicate AuthMaterials = APDB $ \_ route _ -> case route of
   CourseR tid ssh csh _ -> maybeT (unauthorizedI MsgUnfreeMaterials) $ do
     Entity _ Course{..} <- MaybeT . getBy $ TermSchoolCourseShort tid ssh csh
     guard courseMaterialFree
     return Authorized
   r -> $unsupportedAuthPredicate AuthMaterials r
-tagAccessPredicate AuthOwner = APDB $ \route _ -> case route of
+tagAccessPredicate AuthOwner = APDB $ \mAuthId route _ -> case route of
   CSubmissionR _ _ _ _ cID _ -> exceptT return return $ do
     sid <- catchIfMExceptT (const $ unauthorizedI MsgUnauthorizedSubmissionOwner) (const True :: CryptoIDError -> Bool) $ decrypt cID
-    authId <- maybeExceptT AuthenticationRequired $ lift maybeAuthId
+    authId <- maybeExceptT AuthenticationRequired $ return mAuthId
     void . maybeMExceptT (unauthorizedI MsgUnauthorizedSubmissionOwner) . getBy $ UniqueSubmissionUser authId sid
     return Authorized
   r -> $unsupportedAuthPredicate AuthOwner r
-tagAccessPredicate AuthRated = APDB $ \route _ -> case route of
+tagAccessPredicate AuthRated = APDB $ \_ route _ -> case route of
   CSubmissionR _ _ _ _ cID _ -> maybeT (unauthorizedI MsgUnauthorizedSubmissionRated) $ do
     sid <- catchIfMaybeT (const True :: CryptoIDError -> Bool) $ decrypt cID
     sub <- MaybeT $ get sid
     guard $ submissionRatingDone sub
     return Authorized
   r -> $unsupportedAuthPredicate AuthRated r
-tagAccessPredicate AuthUserSubmissions = APDB $ \route _ -> case route of
+tagAccessPredicate AuthUserSubmissions = APDB $ \_ route _ -> case route of
   CSheetR tid ssh csh shn _ -> maybeT (unauthorizedI MsgUnauthorizedUserSubmission) $ do
     Entity cid _ <- MaybeT . getBy $ TermSchoolCourseShort tid ssh csh
     Entity _ Sheet{sheetSubmissionMode} <- MaybeT . getBy $ CourseSheet cid shn
     guard $ sheetSubmissionMode == UserSubmissions
     return Authorized
   r -> $unsupportedAuthPredicate AuthUserSubmissions r
-tagAccessPredicate AuthCorrectorSubmissions = APDB $ \route _ -> case route of
+tagAccessPredicate AuthCorrectorSubmissions = APDB $ \_ route _ -> case route of
   CSheetR tid ssh csh shn _ -> maybeT (unauthorizedI MsgUnauthorizedCorrectorSubmission) $ do
     Entity cid _ <- MaybeT . getBy $ TermSchoolCourseShort tid ssh csh
     Entity _ Sheet{sheetSubmissionMode} <- MaybeT . getBy $ CourseSheet cid shn
     guard $ sheetSubmissionMode == CorrectorSubmissions
     return Authorized
   r -> $unsupportedAuthPredicate AuthCorrectorSubmissions r
-tagAccessPredicate AuthAuthentication = APDB $ \route _ -> case route of
+tagAccessPredicate AuthAuthentication = APDB $ \mAuthId route _ -> case route of
   MessageR cID -> maybeT (unauthorizedI MsgUnauthorizedSystemMessageAuth) $ do
     smId <- decrypt cID
     SystemMessage{..} <- MaybeT $ get smId
-    isAuthenticated <- isJust <$> liftHandlerT maybeAuthId
+    let isAuthenticated = isJust mAuthId
     guard $ not systemMessageAuthenticatedOnly || isAuthenticated
     return Authorized
   r -> $unsupportedAuthPredicate AuthAuthentication r
-tagAccessPredicate AuthRead = APHandler . const $ bool (return Authorized) (unauthorizedI MsgUnauthorizedWrite)
-tagAccessPredicate AuthWrite = APHandler . const $ bool (unauthorizedI MsgUnauthorized) (return Authorized)
+tagAccessPredicate AuthRead = APHandler . const . const $ bool (return Authorized) (unauthorizedI MsgUnauthorizedWrite)
+tagAccessPredicate AuthWrite = APHandler . const . const $ bool (unauthorizedI MsgUnauthorized) (return Authorized)
 
 
 newtype InvalidAuthTag = InvalidAuthTag Text
@@ -734,25 +735,29 @@ routeAuthTags = fmap (impureNonNull . Set.mapMonotonic impureNonNull) . ofoldM p
       | otherwise
         = Left $ InvalidAuthTag t
 
-evalAuthTags :: forall m. (MonadAP m, MonadLogger m) => AuthTagActive -> NonNull (DNF AuthTag) -> Route UniWorX -> Bool -> WriterT (Set AuthTag) m AuthResult
+evalAuthTags :: forall m. (MonadAP m, MonadLogger m) => AuthTagActive -> NonNull (DNF AuthTag) -> Maybe (AuthId UniWorX) -> Route UniWorX -> Bool -> WriterT (Set AuthTag) m AuthResult
 -- ^ `tell`s disabled predicates, identified as pivots
-evalAuthTags AuthTagActive{..} (map (Set.toList . toNullable) . Set.toList . toNullable -> authDNF) route isWrite
-  = startEvalMemoT $ do
-      mr <- lift getMsgRenderer
+evalAuthTags AuthTagActive{..} (map (Set.toList . toNullable) . Set.toList . toNullable -> authDNF) mAuthId route isWrite
+  = do
+      mr <- getMsgRenderer
       let
         authTagIsInactive = not . authTagIsActive
 
-        evalAuthTag :: AuthTag -> MemoT AuthTag AuthResult (WriterT (Set AuthTag) m) AuthResult
-        evalAuthTag = memo $ \authTag -> lift . lift $ evalAccessPred (tagAccessPredicate authTag) route isWrite
+        evalAuthTag :: AuthTag -> WriterT (Set AuthTag) m AuthResult
+        evalAuthTag authTag = lift . (runCachedMemoT :: CachedMemoT (AuthTag, Maybe UserId, Route UniWorX, Bool) AuthResult m _ -> m _) $ for4 memo evalAccessPred' authTag mAuthId route isWrite
+          where
+            evalAccessPred' authTag' mAuthId' route' isWrite' = CachedMemoT $ do
+              $logDebugS "evalAccessPred" $ tshow (authTag', mAuthId', route', isWrite')
+              evalAccessPred (tagAccessPredicate authTag') mAuthId' route' isWrite'
 
         orAR', andAR' :: forall m'. Monad m' => m' AuthResult -> m' AuthResult -> m' AuthResult
         orAR' = shortCircuitM (is _Authorized) (orAR mr)
         andAR' = shortCircuitM (is _Unauthorized) (andAR mr)
 
-        evalDNF :: [[AuthTag]] -> MemoT AuthTag AuthResult (WriterT (Set AuthTag) m) AuthResult
+        evalDNF :: [[AuthTag]] -> WriterT (Set AuthTag) m AuthResult
         evalDNF = foldr (\ats ar -> ar `orAR'` foldr (\aTag ar' -> ar' `andAR'` evalAuthTag aTag) (return $ trueAR mr) ats) (return $ falseAR mr)
 
-      lift . $logDebugS "evalAuthTags" . tshow . (route, isWrite, )$ map (map $ id &&& authTagIsActive) authDNF
+      $logDebugS "evalAuthTags" . tshow . (route, isWrite, )$ map (map $ id &&& authTagIsActive) authDNF
 
       result <- evalDNF $ filter (all authTagIsActive) authDNF
 
@@ -760,16 +765,25 @@ evalAuthTags AuthTagActive{..} (map (Set.toList . toNullable) . Set.toList . toN
         whenM (allM conj (\aTag -> (return . not $ authTagIsActive aTag) `or2M` (not . is _Unauthorized <$> evalAuthTag aTag))) $ do
           let pivots = filter authTagIsInactive conj
           whenM (allM pivots $ fmap (is _Authorized) . evalAuthTag) $ do
-            lift $ $logDebugS "evalAuthTags" [st|Recording pivots: #{tshow pivots}|]
-            lift . tell $ Set.fromList pivots
+            $logDebugS "evalAuthTags" [st|Recording pivots: #{tshow pivots}|]
+            tell $ Set.fromList pivots
 
       return result
 
+evalAccessFor :: (MonadLogger m, MonadHandler m, HandlerSite m ~ UniWorX) => Maybe (AuthId UniWorX) -> Route UniWorX -> Bool -> m AuthResult
+evalAccessFor mAuthId route isWrite = do
+  dnf <- either throwM return $ routeAuthTags route
+  fmap fst . runWriterT $ evalAuthTags (AuthTagActive $ const True) dnf mAuthId route isWrite
+
+evalAccessForDB :: (MonadLogger m, MonadHandler m, HandlerSite m ~ UniWorX) => Maybe (AuthId UniWorX) -> Route UniWorX -> Bool -> ReaderT (YesodPersistBackend UniWorX) m AuthResult
+evalAccessForDB = evalAccessFor
+
 evalAccess :: (MonadLogger m, MonadHandler m, HandlerSite m ~ UniWorX) => Route UniWorX -> Bool -> m AuthResult
 evalAccess route isWrite = do
+  mAuthId <- liftHandlerT maybeAuthId
   tagActive <- fromMaybe def <$> lookupSessionJson SessionActiveAuthTags
   dnf <- either throwM return $ routeAuthTags route
-  (result, deactivated) <- runWriterT $ evalAuthTags tagActive dnf route isWrite
+  (result, deactivated) <- runWriterT $ evalAuthTags tagActive dnf mAuthId route isWrite
   result <$ tellSessionJson SessionInactiveAuthTags deactivated
 
 evalAccessDB :: (MonadLogger m, MonadHandler m, HandlerSite m ~ UniWorX) => Route UniWorX -> Bool -> ReaderT (YesodPersistBackend UniWorX) m AuthResult
diff --git a/src/Import/NoFoundation.hs b/src/Import/NoFoundation.hs
index 457682087..21e0b5de5 100644
--- a/src/Import/NoFoundation.hs
+++ b/src/Import/NoFoundation.hs
@@ -17,7 +17,7 @@ import Yesod.Default.Config2  as Import
 import Utils                  as Import
 import Utils.Modal            as Import
 import Yesod.Core.Json        as Import (provideJson)
-import Yesod.Core.Types.Instances as Import ()
+import Yesod.Core.Types.Instances as Import (CachedMemoT(..))
 
 
 import Data.Fixed             as Import
diff --git a/src/Model/Types.hs b/src/Model/Types.hs
index 775900850..7cf317d0c 100644
--- a/src/Model/Types.hs
+++ b/src/Model/Types.hs
@@ -749,6 +749,8 @@ instance ToJSONKey AuthTag where
 instance FromJSONKey AuthTag where
   fromJSONKey = FromJSONKeyTextParser $ parseJSON . Aeson.String
 
+instance Binary AuthTag
+
 
 newtype AuthTagActive = AuthTagActive { authTagIsActive :: AuthTag -> Bool }
   deriving (Read, Show, Generic)
diff --git a/src/Yesod/Core/Instances.hs b/src/Yesod/Core/Instances.hs
index 6512c936a..b8c6fed80 100644
--- a/src/Yesod/Core/Instances.hs
+++ b/src/Yesod/Core/Instances.hs
@@ -15,37 +15,58 @@ import Data.ByteString.Builder (toLazyByteString)
 import System.FilePath ((</>))
 
 import Data.Aeson
+import Data.Aeson.Types
 
 import Control.Monad.Fix
 import Control.Monad.Fail (MonadFail)
 import qualified Control.Monad.Fail as MonadFail
 import Control.Monad.Except (MonadError(..))
 import Data.Functor.Extend
-  
+
+import Data.Binary (Binary)
+import qualified Data.Binary as Binary
+
+
+routeFromPathPiece :: ParseRoute site => Text -> Maybe (Route site)
+routeFromPathPiece
+  = parseRoute
+  . over (_2.traverse._2) (fromMaybe "")
+  . over _2 queryToQueryText
+  . decodePath
+  . encodeUtf8
+
+routeToPathPiece :: RenderRoute site => Route site -> Text
+routeToPathPiece
+  = pack
+  . ("/" </>)
+  . unpack
+  . decodeUtf8
+  . toLazyByteString
+  . uncurry encodePath
+  . over _2 queryTextToQuery
+  . over (_2.traverse._2) (assertM' $ not . null)
+  . renderRoute
+
 
 instance (RenderRoute site, ParseRoute site) => PathPiece (Route site) where
-  fromPathPiece
-    = parseRoute
-    . over (_2.traverse._2) (fromMaybe "")
-    . over _2 queryToQueryText
-    . decodePath
-    . encodeUtf8
-  toPathPiece
-    = pack
-    . ("/" </>)
-    . unpack
-    . decodeUtf8
-    . toLazyByteString
-    . uncurry encodePath
-    . over _2 queryTextToQuery
-    . over (_2.traverse._2) (assertM' $ not . null)
-    . renderRoute
+  fromPathPiece = routeFromPathPiece
+  toPathPiece = routeToPathPiece
     
-instance (RenderRoute site, ParseRoute site) => FromJSON (Route site) where
-  parseJSON = withText "Route" $ maybe (fail "Could not parse route") return . fromPathPiece
+instance ParseRoute site => FromJSON (Route site) where
+  parseJSON = withText "Route" $ maybe (fail "Could not parse route") return . routeFromPathPiece
 
-instance (RenderRoute site, ParseRoute site) => ToJSON (Route site) where
-  toJSON = String . toPathPiece
+instance RenderRoute site => ToJSON (Route site) where
+  toJSON = String . routeToPathPiece
+
+instance ParseRoute site => FromJSONKey (Route site) where
+  fromJSONKey = FromJSONKeyTextParser $ maybe (fail "Coulde not parse route") return . routeFromPathPiece
+
+instance RenderRoute site => ToJSONKey (Route site) where
+  toJSONKey = toJSONKeyText routeToPathPiece
+
+instance (RenderRoute site, ParseRoute site) => Binary (Route site) where
+  put = Binary.put . toPathPiece
+  get = Binary.get >>= maybe (fail "Could not parse route") return . fromPathPiece
 
 
 instance Monad FormResult where
@@ -77,3 +98,5 @@ instance Extend FormResult where
   duplicated (FormSuccess x)    = FormSuccess $ FormSuccess x
   duplicated  FormMissing       = FormMissing
   duplicated (FormFailure errs) = FormFailure errs
+
+
diff --git a/src/Yesod/Core/Types/Instances.hs b/src/Yesod/Core/Types/Instances.hs
index e296d0c52..5402ce3ba 100644
--- a/src/Yesod/Core/Types/Instances.hs
+++ b/src/Yesod/Core/Types/Instances.hs
@@ -1,16 +1,48 @@
 {-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving, UndecidableInstances #-}
 
 module Yesod.Core.Types.Instances
-  (
+  ( CachedMemoT(..)
   ) where
 
-import ClassyPrelude
+import ClassyPrelude.Yesod
 import Yesod.Core.Types
 
 import Control.Monad.Fix
 
+import Control.Monad.Memo
+
+import Data.Binary (Binary)
+import qualified Data.Binary as Binary
+
+import Control.Monad.Logger (MonadLoggerIO)
+  
+
 instance MonadFix m => MonadFix (HandlerT site m) where
   mfix f = HandlerT $ \r -> mfix $ \a -> unHandlerT (f a) r
   
 instance MonadFix m => MonadFix (WidgetT site m) where
   mfix f = WidgetT $ \r -> mfix $ \ ~(a, _) -> unWidgetT (f a) r
+
+
+-- | Type-level tags for compatability of Yesod `cached`-System with `MonadMemo`
+newtype CachedMemoT k v m a = CachedMemoT { runCachedMemoT :: m a }
+  deriving newtype ( Functor, Applicative, Alternative, Monad, MonadPlus, MonadFix
+                   , MonadIO
+                   , MonadThrow, MonadCatch, MonadMask, MonadLogger, MonadLoggerIO
+                   , MonadResource, MonadHandler, MonadWidget
+                   , IsString, Semigroup, Monoid
+                   )
+
+deriving newtype instance MonadBase b m => MonadBase b (CachedMemoT k v m)
+deriving newtype instance MonadBaseControl b m => MonadBaseControl b (CachedMemoT k v m)
+
+deriving newtype instance MonadReader r m => MonadReader r (CachedMemoT k v m)
+
+instance MonadTrans (CachedMemoT k v) where
+  lift = CachedMemoT
+
+
+-- | Uses `cachedBy` with a `Binary`-encoded @k@
+instance (Typeable v, Binary k, MonadHandler m) => MonadMemo k v (CachedMemoT k v m) where
+  memo act key = cachedBy (toStrict $ Binary.encode key) $ act key
diff --git a/start.sh b/start.sh
index b72d043c2..cdad4b731 100755
--- a/start.sh
+++ b/start.sh
@@ -1,12 +1,11 @@
 #!/usr/bin/env bash
 
 unset HOST
-export DETAILED_LOGGING=true
-export LOG_ALL=false
-export LOGLEVEL=info
-export DUMMY_LOGIN=true
-export ALLOW_DEPRECATED=true
-export PWFILE=users.yml
+export DETAILED_LOGGING=${DETAILED_LOGGIN:-true}
+export LOG_ALL=${LOG_ALL:-false}
+export LOGLEVEL=${LOGLEVEL:-info}
+export DUMMY_LOGIN=${DUMMY_LOGIN:-true}
+export ALLOW_DEPRECATED=${ALLOW_DEPRECATED:-true}
 
 move-back() {
     mv -v .stack-work .stack-work-run

From af6a21438e640bbfe22247c07ecc9e1771f75a17 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 3 Apr 2019 23:21:12 +0200
Subject: [PATCH 002/238] add new JS utility registry and proof-of-concept
 utility

---
 src/Foundation.hs               |  27 ++++----
 static/js/utils/poc.js          |  33 +++++++++
 static/js/utils/registry.js     | 109 ++++++++++++++++++++++++++++++
 static/js/utils/setup.js        | 114 --------------------------------
 templates/default-layout.hamlet |   2 +-
 5 files changed, 157 insertions(+), 128 deletions(-)
 create mode 100644 static/js/utils/poc.js
 create mode 100644 static/js/utils/registry.js
 delete mode 100644 static/js/utils/setup.js

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 0d8e5d909..a15dd5a9b 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1065,19 +1065,20 @@ siteLayout' headingOverride widget = do
       addScript $ StaticR js_polyfills_fetchPolyfill_js
       addScript $ StaticR js_polyfills_urlPolyfill_js
       -- JavaScript utils
-      addScript $ StaticR js_utils_alerts_js
-      addScript $ StaticR js_utils_asidenav_js
-      addScript $ StaticR js_utils_asyncForm_js
-      addScript $ StaticR js_utils_asyncTable_js
-      addScript $ StaticR js_utils_asyncTableFilter_js
-      addScript $ StaticR js_utils_checkAll_js
-      addScript $ StaticR js_utils_httpClient_js
-      addScript $ StaticR js_utils_form_js
-      addScript $ StaticR js_utils_inputs_js
-      addScript $ StaticR js_utils_modal_js
-      addScript $ StaticR js_utils_setup_js
-      addScript $ StaticR js_utils_showHide_js
-      addScript $ StaticR js_utils_tabber_js
+      -- addScript $ StaticR js_utils_alerts_js
+      -- addScript $ StaticR js_utils_asidenav_js
+      -- addScript $ StaticR js_utils_asyncForm_js
+      -- addScript $ StaticR js_utils_asyncTable_js
+      -- addScript $ StaticR js_utils_asyncTableFilter_js
+      -- addScript $ StaticR js_utils_checkAll_js
+      -- addScript $ StaticR js_utils_httpClient_js
+      -- addScript $ StaticR js_utils_form_js
+      -- addScript $ StaticR js_utils_inputs_js
+      -- addScript $ StaticR js_utils_modal_js
+      addScript $ StaticR js_utils_registry_js
+      addScript $ StaticR js_utils_poc_js
+      -- addScript $ StaticR js_utils_showHide_js
+      -- addScript $ StaticR js_utils_tabber_js
       addStylesheet $ StaticR css_utils_alerts_scss
       addStylesheet $ StaticR css_utils_asidenav_scss
       addStylesheet $ StaticR css_utils_asyncForm_scss
diff --git a/static/js/utils/poc.js b/static/js/utils/poc.js
new file mode 100644
index 000000000..5d87a0f82
--- /dev/null
+++ b/static/js/utils/poc.js
@@ -0,0 +1,33 @@
+(function() {
+
+  var UTIL_NAME = 'poc';
+  var UTIL_SELECTOR = '[uw-poc]';
+
+  var util = function(element) {
+
+    function _init() {
+      var color = 'red';
+      if (element.dataset.color) {
+        color = element.dataset.color;
+      }
+      element.style.outline = '1px solid ' + color;
+    }
+
+    _init();
+
+    return {
+      name: UTIL_NAME,
+      element: element,
+      destroy: function() {},
+    };
+  };
+
+  if (UtilRegistry) {
+    UtilRegistry.register({
+      name: UTIL_NAME,
+      selector: UTIL_SELECTOR,
+      setup: util,
+    });
+  }
+
+})();
diff --git a/static/js/utils/registry.js b/static/js/utils/registry.js
new file mode 100644
index 000000000..775b58fe4
--- /dev/null
+++ b/static/js/utils/registry.js
@@ -0,0 +1,109 @@
+(function() {
+  'use strict';
+
+  var registeredUtils = [];
+  var activeUtilInstances = [];
+
+  // Registry
+  // (revealing module pattern)
+  window.UtilRegistry = (function() {
+
+    /**
+     * function registerUtil
+     *
+     * utils need to have at least these properties:
+     *   name: string | utils name, e.g. 'example'
+     *   selector: string | utils selector, e.g. '[uw-example]'
+     *   setup: Function | utils setup function, see below
+     *
+     * setup function must return instance object with at least these properties:
+     *   name: string | utils name
+     *   element: HTMLElement | element the util is applied to
+     *   destroy: Function | function to destroy the util and remove any listeners
+     *
+     * @param util Object Utility that should be added to the registry
+     */
+    function registerUtil(util) {
+      console.log('registering util', util);
+      registeredUtils.push(util);
+    }
+
+    function deregisterUtil(name, destroy) {
+      var utilIndex = _findUtilIndex(name);
+
+      if (utilIndex >= 0) {
+        if (destroy === true) {
+          _destroyUtilInstances(name);
+        }
+
+        registeredUtils.splice(utilIndex, 1);
+      }
+    }
+
+    function setupAllUtils() {
+      console.log('setting up all registered utils');
+      registeredUtils.forEach(function(util) {
+        setupUtil(util);
+      });
+    }
+
+    function setupUtil(util, scope) {
+      console.log('setting up util', { util });
+      scope = scope || document;
+
+      if (util && typeof util.setup === 'function') {
+        const elements = _findUtilElements(util, scope);
+
+        elements.forEach(function(element) {
+          var utilInstance = util.setup(element);
+          if (utilInstance) {
+            activeUtilInstances.push(utilInstance);
+          }
+        });
+      }
+    }
+
+    function findUtil(name) {
+      return registeredUtils.find(function(util) {
+        return util.name === name;
+      });
+    }
+
+    function _findUtilElements(util, scope) {
+      return Array.from(scope.querySelectorAll(util.selector));
+    }
+
+    function _findUtilIndex(name) {
+      return registeredUtils.findIndex(function(util) {
+        return util.name === name;
+      });
+    }
+
+    function _destroyUtilInstances(name) {
+      console.log('TODO: destroy util instances', { name });
+      // call destroy on each activeUtilInstance that matches the name
+    }
+
+    // public API
+    return {
+      register: registerUtil,
+      deregister: deregisterUtil,
+      setupAll: setupAllUtils,
+      setup: setupUtil,
+      find: findUtil,
+    }
+  })();
+
+  document.addEventListener('DOMContentLoaded', function() {
+    window.UtilRegistry.setupAll();
+  });
+
+
+  // REMOVE ME. JUST HERE TO AVOID JS ERRORS
+  window.utils = {
+    setup: function(name) {
+      console.log('not really setting up', name);
+    },
+  };
+
+})();
diff --git a/static/js/utils/setup.js b/static/js/utils/setup.js
deleted file mode 100644
index bb3bb0e3d..000000000
--- a/static/js/utils/setup.js
+++ /dev/null
@@ -1,114 +0,0 @@
-(function() {
-  'use strict';
-
-  window.utils = window.utils || {};
-
-  var registeredSetupListeners = {};
-  var activeInstances = {};
-
-/**
- * setup function to initiate a util (utilName) on a scope (sope) with options (options).
- *
- * Utils need to be defined as property of `window.utils` and need to accept a scope and (optionally) options.
- * Example: `window.utils.autoSubmit = function(scope, options) { ... };`
- */
-
-  window.utils.setup = function(utilName, scope, options) {
-    if (!utilName || !scope) {
-      return;
-    }
-
-    options = options || {};
-
-    var utilInstance;
-
-    // i18n
-    if (window.I18N) {
-      options.i18n = window.I18N;
-    }
-
-    if (activeInstances[utilName]) {
-      var instanceWithSameScope = activeInstances[utilName]
-        .filter(function(instance) { return !!instance; })
-        .find(function(instance) {
-          return instance.scope === scope;
-        });
-      var isAlreadySetup = !!instanceWithSameScope;
-
-      if (isAlreadySetup) {
-        console.warn('Trying to setup a JS utility that\'s already been set up', { utility: utilName, scope, options });
-        if (!options.force) {
-          return false;
-        }
-      }
-    }
-
-    function setup() {
-      var listener = function(event) {
-        if (event.detail.targetUtil !== utilName) {
-          return false;
-        }
-
-        if (options.setupFunction) {
-          utilInstance = options.setupFunction(scope, options);
-        } else {
-          var util = window.utils[utilName];
-          if (!util) {
-            throw new Error('"' + utilName + '" is not a known js util');
-          }
-
-          utilInstance = util(scope, options);
-        }
-
-        if (utilInstance) {
-          if (activeInstances[utilName] && Array.isArray(activeInstances[utilName])) {
-            activeInstances[utilName].push(utilInstance);
-          } else {
-            activeInstances[utilName] = [ utilInstance ];
-          }
-        }
-      };
-
-      if (registeredSetupListeners[utilName] && Array.isArray(registeredSetupListeners[utilName])) {
-        window.utils.teardown(utilName);
-      }
-
-      if (!registeredSetupListeners[utilName] || Array.isArray(registeredSetupListeners[utilName])) {
-        registeredSetupListeners[utilName] = [];
-      }
-      registeredSetupListeners[utilName].push(listener);
-
-      document.addEventListener('setup', listener);
-
-      document.dispatchEvent(new CustomEvent('setup', {
-        detail: { targetUtil: utilName, module: 'none' },
-        bubbles: true,
-        cancelable: true,
-      }));
-    }
-
-    setup();
-
-    return utilInstance;
-  };
-
-  window.utils.teardown = function(utilName, destroy) {
-    if (registeredSetupListeners[utilName]) {
-      registeredSetupListeners[utilName]
-        .filter(function(listener) { return !!listener })
-        .forEach(function(listener) {
-          document.removeEventListener('setup', listener);
-        });
-      delete registeredSetupListeners[utilName];
-    }
-
-    if (destroy === true && activeInstances[utilName]) {
-      activeInstances[utilName]
-        .filter(function(instance) { return !!instance })
-        .forEach(function(instance) {
-          instance.destroy();
-        });
-      delete activeInstances[utilName];
-    }
-  }
-})();
diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet
index f43282fb0..7a679af27 100644
--- a/templates/default-layout.hamlet
+++ b/templates/default-layout.hamlet
@@ -6,7 +6,7 @@ $if not isModal
 
 <div .main>
 
-  <div .main__content>
+  <div .main__content uw-poc>
 
     $if not isModal
       <!-- breadcrumbs -->

From 6d824d33928a39c66054cc814648787213ce2984 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 3 Apr 2019 23:23:53 +0200
Subject: [PATCH 003/238] WIP: refactor show hide JS utility to work with new
 registry

---
 src/Foundation.hs           |   2 +-
 static/js/utils/showHide.js | 106 ++++++++++++++++++++++--------------
 2 files changed, 65 insertions(+), 43 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index a15dd5a9b..a0d739bc7 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1077,7 +1077,7 @@ siteLayout' headingOverride widget = do
       -- addScript $ StaticR js_utils_modal_js
       addScript $ StaticR js_utils_registry_js
       addScript $ StaticR js_utils_poc_js
-      -- addScript $ StaticR js_utils_showHide_js
+      addScript $ StaticR js_utils_showHide_js
       -- addScript $ StaticR js_utils_tabber_js
       addStylesheet $ StaticR css_utils_alerts_scss
       addStylesheet $ StaticR css_utils_asidenav_scss
diff --git a/static/js/utils/showHide.js b/static/js/utils/showHide.js
index 0441cde4b..6689b83bd 100644
--- a/static/js/utils/showHide.js
+++ b/static/js/utils/showHide.js
@@ -1,77 +1,99 @@
 (function() {
   'use strict';
 
-  window.utils = window.utils || {};
+  var UTIL_NAME = 'showHide';
+  var UTIL_SELECTOR = '[uw-show-hide]';
 
   var JS_INITIALIZED_CLASS = 'js-show-hide-initialized';
   var LOCAL_STORAGE_SHOW_HIDE = 'SHOW_HIDE';
-  var SHOW_HIDE_TOGGLE_CLASS = 'js-show-hide__toggle';
   var SHOW_HIDE_COLLAPSED_CLASS = 'js-show-hide--collapsed';
   var SHOW_HIDE_TARGET_CLASS = 'js-show-hide__target';
 
   /**
-   * div
-   *   div.js-show-hide__toggle
-   *     toggle here
-   *   div
-   *     content here
+   * <div>
+   *   <div uw-show-hide>
+   *     [toggle here]
+   *   <div>
+   *     [content here]
    */
-  window.utils.showHide = function(wrapper, options) {
+  var util = function(element) {
 
-    options = options || {};
+    function _init() {
+      if (!element) {
+        throw new Error('ShowHide utility cannot be setup without an element!');
+      }
 
-    function addEventHandler(el) {
-      el.addEventListener('click', function elClickListener() {
-        var newState = el.parentElement.classList.toggle(SHOW_HIDE_COLLAPSED_CLASS);
-        updateLSState(el.dataset.shIndex || null, newState);
+      if (element.classList.contains(JS_INITIALIZED_CLASS)) {
+        return false;
+      }
+
+      _addEventHandler();
+    }
+
+    function _addEventHandler() {
+      element.addEventListener('click', function clickListener() {
+        console.log('showhide clicked');
+        var newState = element.parentElement.classList.toggle(SHOW_HIDE_COLLAPSED_CLASS);
+        _updateLSState(element.dataset.shIndex || null, newState);
       });
     }
 
-    function updateLSState(index, state) {
+    function _updateLSState(index, state) {
       if (!index) {
         return false;
       }
-      var lsData = getLocalStorageData();
+      var lsData = _getLocalStorageData();
       lsData[index] = state;
       window.localStorage.setItem(LOCAL_STORAGE_SHOW_HIDE, JSON.stringify(lsData));
     }
 
-    function collapsedStateInLocalStorage(index) {
-      var lsState = getLocalStorageData();
-      return lsState[index];
-    }
+    // function _getCollapsedLSState(index) {
+    //   var lsState = _getLocalStorageData();
+    //   return lsState[index];
+    // }
 
-    function getLocalStorageData() {
+    function _getLocalStorageData() {
       return JSON.parse(window.localStorage.getItem(LOCAL_STORAGE_SHOW_HIDE)) || {};
     }
 
-    Array
-      .from(wrapper.querySelectorAll('.' + SHOW_HIDE_TOGGLE_CLASS))
-      .forEach(function(el) {
-        if (el.classList.contains(JS_INITIALIZED_CLASS)) {
-          return false;
-        }
+    // var showHides = Array.from(scope.querySelectorAll(UTIL_SELECTOR));
+    // showHides.forEach(function(el) {
+    //   if (el.classList.contains(JS_INITIALIZED_CLASS)) {
+    //     return false;
+    //   }
 
-        var index = el.dataset.shIndex || null;
-        var isCollapsed = el.dataset.collapsed === 'true';
-        var lsCollapsedState = collapsedStateInLocalStorage(index);
-        if (typeof lsCollapsedState !== 'undefined') {
-          isCollapsed = lsCollapsedState;
-        }
-        el.parentElement.classList.toggle(SHOW_HIDE_COLLAPSED_CLASS, isCollapsed);
+    //   var index = el.dataset.shIndex || null;
+    //   var isCollapsed = el.dataset.collapsed === 'true';
+    //   var lsCollapsedState = _getCollapsedLSState(index);
+    //   if (typeof lsCollapsedState !== 'undefined') {
+    //     isCollapsed = lsCollapsedState;
+    //   }
+    //   el.parentElement.classList.toggle(SHOW_HIDE_COLLAPSED_CLASS, isCollapsed);
 
-        Array.from(el.parentElement.children).forEach(function(el) {
-          if (!el.classList.contains('' + SHOW_HIDE_TOGGLE_CLASS)) {
-            el.classList.add(SHOW_HIDE_TARGET_CLASS);
-          }
-        });
-        el.classList.add(JS_INITIALIZED_CLASS);
-        addEventHandler(el);
-    });
+    //   Array.from(el.parentElement.children).forEach(function(el) {
+    //     if (!el.matches(UTIL_SELECTOR)) {
+    //       el.classList.add(SHOW_HIDE_TARGET_CLASS);
+    //     }
+    //   });
+    //   el.classList.add(JS_INITIALIZED_CLASS);
+    //   _addEventHandler(el);
+    // });
+
+    _init();
 
     return {
-      scope: wrapper,
+      name: UTIL_NAME,
+      element: element,
       destroy: function() {},
     };
   };
+
+  if (UtilRegistry) {
+    UtilRegistry.register({
+      name: UTIL_NAME,
+      selector: UTIL_SELECTOR,
+      setup: util
+    });
+  }
+
 })();

From ff59d0a41269e105865cf589fac364de34935bf7 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 3 Apr 2019 23:31:22 +0200
Subject: [PATCH 004/238] move JS UtilRegistry to top of imports to ensure its
 present in scope

---
 src/Foundation.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index a0d739bc7..365a64ccf 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1065,6 +1065,7 @@ siteLayout' headingOverride widget = do
       addScript $ StaticR js_polyfills_fetchPolyfill_js
       addScript $ StaticR js_polyfills_urlPolyfill_js
       -- JavaScript utils
+      addScript $ StaticR js_utils_registry_js
       -- addScript $ StaticR js_utils_alerts_js
       -- addScript $ StaticR js_utils_asidenav_js
       -- addScript $ StaticR js_utils_asyncForm_js
@@ -1075,7 +1076,6 @@ siteLayout' headingOverride widget = do
       -- addScript $ StaticR js_utils_form_js
       -- addScript $ StaticR js_utils_inputs_js
       -- addScript $ StaticR js_utils_modal_js
-      addScript $ StaticR js_utils_registry_js
       addScript $ StaticR js_utils_poc_js
       addScript $ StaticR js_utils_showHide_js
       -- addScript $ StaticR js_utils_tabber_js

From 4520c1be49098c5eb768c6162ffe0e71bff28ad8 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 4 Apr 2019 15:59:45 +0200
Subject: [PATCH 005/238] email page form incomplete

---
 messages/uniworx/de.msg             |  8 ++-
 routes                              |  1 +
 src/Handler/Course.hs               | 11 +++-
 src/Handler/Utils/Communication.hs  | 88 +++++++++++++++++++++++++++++
 src/Handler/Utils/Form/MassInput.hs | 33 ++++++++---
 src/Utils/Form.hs                   |  1 +
 src/Utils/Parameters.hs             |  2 +-
 7 files changed, 132 insertions(+), 12 deletions(-)
 create mode 100644 src/Handler/Utils/Communication.hs

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index e5eed4900..b36af2378 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -729,4 +729,10 @@ DBTIRowsMissing n@Int: #{pluralDE n "Eine Zeile ist" "Einige Zeile sind"} aus de
 MassInputAddDimension: Hinzufügen
 MassInputDeleteCell: Entfernen
 
-NavigationFavourites: Favoriten
\ No newline at end of file
+NavigationFavourites: Favoriten
+
+CommSubject: Betreff
+CommRecipients: Empfänger
+
+AddRecipientGroups: Empfängergruppen
+AddRecipientCustom: Weitere Empfänger
diff --git a/routes b/routes
index d558de967..391821721 100644
--- a/routes
+++ b/routes
@@ -78,6 +78,7 @@
   /users                      CUsersR         GET POST
   /users/#CryptoUUIDUser      CUserR          GET POST        !lecturerANDparticipant
   /correctors                 CHiWisR         GET
+  /mail                       CCommR          GET POST
   /notes                      CNotesR         GET POST        !corrector
   /subs                       CCorrectionsR   GET POST
   /ex                         SheetListR      GET             !registered !materials !corrector
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 5d4ec2bf9..3a2867f62 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -821,7 +821,7 @@ colUserDegreeShort = sortable (Just "degree-short") (i18nCell MsgStudyFeatureDeg
     foldMap (i18nCell . ShortStudyDegree) . preview (_userTableFeatures . _2 . _Just)
 
 
-data CourseUserAction = CourseUserDeregister
+data CourseUserAction = CourseUserSendMail | CourseUserDeregister
   deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
 
 instance Universe CourseUserAction
@@ -915,6 +915,9 @@ postCUsersR tid ssh csh = do
     table <- makeCourseUserTable cid colChoices psValidator
     return (ent, numParticipants, table)
   formResult participantRes $ \case
+    (CourseUserSendMail, selectedUsers) -> do
+        cids <- traverse encrypt $ Set.toList selectedUsers :: Handler [CryptoUUIDUser]
+        redirect (CourseR tid ssh csh CCommR, [(toPathPiece GetRecipient, toPathPiece cid) | cid <- cids])
     (CourseUserDeregister,selectedUsers) -> do
         nrDel <- runDB $ deleteWhereCount
           [ CourseParticipantCourse ==. cid
@@ -1026,3 +1029,9 @@ getCNotesR, postCNotesR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 -- If they are shared, adjust MsgCourseUserNoteTooltip
 getCNotesR  = error "CNotesR: Not implemented"
 postCNotesR = error "CNotesR: Not implemented"
+
+
+
+getCCommR, postCCommR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
+getCCommR = postCCommR
+postCCommR tid ssh csh = commR _hole
diff --git a/src/Handler/Utils/Communication.hs b/src/Handler/Utils/Communication.hs
new file mode 100644
index 000000000..7e7d24522
--- /dev/null
+++ b/src/Handler/Utils/Communication.hs
@@ -0,0 +1,88 @@
+module Handler.Utils.Communication where
+
+import Import
+
+import qualified Database.Esqueleto as E
+
+data RecipientGroup = RGCourseParticipants | RGCourseLecturers | RGCourseCorrectors
+  deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
+
+instance Universe RecipientGroup
+instance Finite RecipientGroup
+nullaryPathPiece ''RecipientGroup $ camelToPathPiece' 1
+embedRenderMessage ''UniWorX ''RecipientGroup id
+
+
+data RecipientAddOptions
+  = AddRecipientGroups
+  | AddRecipientGroup RecipientGroup
+  | AddRecipientCustom
+  deriving (Eq, Ord, Read, Show, Generic, Typeable)
+
+instance Universe RecipientAddOptions where
+  universe = AddRecipientGroups:
+             [AddRecipientGroup g | g <- universe]
+             ++ [AddRecipientCustom]
+instance Finite RecipientAddOptions
+
+instance PathPiece RecipientAddOption where
+  toPathPiece AddRecipientGroups    = "recipient-groups"
+  toPathPiece AddRecipientCustom    = "recipient-custom"
+  toPathPiece (AddRecipientGroup g) = toPathPiece g
+
+  fromPathPiece = finiteFromPathPiece
+
+instance RenderMessage UniWorX RecipientAddOption where
+  renderMessage foundation ls = \case
+    AddRecipientGroups  -> renderMessage' MsgAddRecipientGroups
+    AddRecipientCustom  -> renderMessage' MsgAddRecipientCustom
+    AddRecipientGroup g -> renderMessage' g
+    where renderMessage' = renderMessage foundation ls
+
+
+data CommunicationRoute = CommuncationRoute
+  { crRecipients :: Map RecipientGroup (E.SqlQuery (E.SqlExpr (Entity User)))
+  , crJob        :: MailT Handler () -> Handler Job
+  }
+
+data Communication = Communication
+ { cRecipients :: Set (Either Email UserId)
+ , cSubject :: Text
+ }
+
+
+
+commR :: CommunicationRoute -> Handler Html
+commR CommunicationRoute{..} =  do
+  MsgRenderer mr <- getMsgRenderer
+
+  suggestedRecipients' <- runDB $ traverse E.select crRecipients
+  suggestedRecipients <- forM suggestedRecipients' . mapM $ \ent@(Entity rid _) -> (,) <$> encrypt rid <*> pure ent
+
+  let recipientAForm :: AForm (Set (Either Email UserId))
+      recipientAForm = postProcess <$> massInputA MassInput{..} (fslI MsgCommRecipients) True Nothing
+        where miAdd _ _ nudge submitButton = Just $ \csrf -> do
+                let addOptions = Map.fromList . concat $
+                      [ pure (AddRecipientGroups, apreq (selectField . return $ mkOptionsList
+                              [ Option (mr g) (Set.fromList $ map (Right . entityKey . snd) recs) (toPathPiece g) | (g,recs) <- Map.toList suggestedRecipients ]
+                          ) )
+                      , do
+                          (g,recs) <- Map.toList suggestedRecipients
+                          return ( AddRecipientGroup g
+                                 , apreq (selectField . return $ mkOptionsList
+                                     [ Option userDisplayName (Right rid) (toPathPiece cid) | (cid, Entity rid User{..}) <- recs ]
+                                 )
+                      -- , pure (AddRecipientCustom, _ )
+                      ]
+
+
+                multiAction ()
+              miCell
+              miDelete
+              miAllowAdd
+              miButtonAction
+
+  runFormPost . identifyForm FIDCommunication $ renderAForm FormStandard $ Communication
+    <$> recipientAForm
+    <*> areq textField (fslI MsgCommSubject) Nothing
+
diff --git a/src/Handler/Utils/Form/MassInput.hs b/src/Handler/Utils/Form/MassInput.hs
index d1c403ec7..6f5e9f6dc 100644
--- a/src/Handler/Utils/Form/MassInput.hs
+++ b/src/Handler/Utils/Form/MassInput.hs
@@ -3,10 +3,11 @@
 module Handler.Utils.Form.MassInput
   ( MassInput(..)
   , massInput
-  , massInputList
   , BoxDimension(..)
   , IsBoxCoord(..), boxDimension
   , Liveliness(..)
+  , massInputA
+  , massInputList
   , ListLength(..), ListPosition(..), miDeleteList
   ) where
 
@@ -33,7 +34,7 @@ import Control.Monad.Reader.Class (MonadReader(local))
 
 
 data BoxDimension x = forall n. (Enum n, Num n) => BoxDimension (Lens' x n)
-  
+
 class (PathPiece x, ToJSONKey x, FromJSONKey x, Eq x, Ord x) => IsBoxCoord x where
   boxDimensions :: [BoxDimension x]
   boxOrigin :: x
@@ -47,7 +48,7 @@ boxDimension n
 
 -- zeroDimension :: IsBoxCoord x => Natural -> x -> x
 -- zeroDimension (boxDimension -> BoxDimension dim) = set dim $ boxOrigin ^. dim
-  
+
 class (IsBoxCoord (BoxCoord a), Lattice a, BoundedJoinSemiLattice a) => Liveliness a where
   type BoxCoord a :: *
   liveCoords :: Prism' (Set (BoxCoord a)) a
@@ -221,12 +222,12 @@ massInput :: forall handler cellData cellResult liveliness.
           -> (Markup -> MForm handler (FormResult (Map (BoxCoord liveliness) (cellData, cellResult)), FieldView UniWorX))
 massInput MassInput{..} FieldSettings{..} fvRequired initialResult csrf = do
   let initialShape = fmap fst <$> initialResult
-  
+
   miName <- maybe newFormIdent return fsName
   fvId <- maybe newIdent return fsId
   miAction <- traverse toTextUrl $ miButtonAction fvId
   let addFormAction = maybe id (addAttr "formaction") miAction
-  
+
   let
     shapeName :: MassInputFieldName (BoxCoord liveliness)
     shapeName = MassInputShape{..}
@@ -303,8 +304,8 @@ massInput MassInput{..} FieldSettings{..} fvRequired initialResult csrf = do
   let shapeChanged = Fold.any (isn't _FormMissing . view _1) addResults || Fold.any (is _FormSuccess . view _1) delResults
 
   shape <- if
-    | Just s <- addShape -> return s 
-    | Just s <- delShape -> return s 
+    | Just s <- addShape -> return s
+    | Just s <- delShape -> return s
     | otherwise          -> return sentShape'
   liveliness <- maybe (throwM MassInputInvalidShape) return $ Map.keysSet shape ^? liveCoords :: MForm handler liveliness
 
@@ -349,7 +350,7 @@ massInput MassInput{..} FieldSettings{..} fvRequired initialResult csrf = do
             cells
               | [] <- remDims = do
                   coord <- coords
-                  Just (_data, (_cellRes, cellWdgt)) <- return $ Map.lookup coord cellResults 
+                  Just (_data, (_cellRes, cellWdgt)) <- return $ Map.lookup coord cellResults
                   let deleteButton = snd <$> Map.lookup coord delResults
                   return (coord, $(widgetFile "widgets/massinput/cell"))
               | otherwise =
@@ -360,7 +361,7 @@ massInput MassInput{..} FieldSettings{..} fvRequired initialResult csrf = do
       miWidget = miWidget' boxOrigin $ zip [0..] boxDimensions
 
   MsgRenderer mr <- getMsgRenderer
-  
+
   let
     fvLabel = toHtml $ mr fsLabel
     fvTooltip = toHtml . mr <$> fsTooltip
@@ -393,3 +394,17 @@ massInputList field fieldSettings miButtonAction miSettings miRequired miPrevRes
   miSettings
   miRequired
   (Map.fromList . zip [0..] . map ((), ) <$> miPrevResult)
+
+massInputA :: forall handler cellData cellResult liveliness.
+           ( MonadHandler handler, HandlerSite handler ~ UniWorX
+           , ToJSON cellData, FromJSON cellData
+           , Liveliness liveliness
+           , MonadLogger handler
+           )
+          => MassInput handler liveliness cellData cellResult
+          -> FieldSettings UniWorX
+          -> Bool -- ^ Required?
+          -> Maybe (Map (BoxCoord liveliness) (cellData, cellResult))
+          -> AForm handler (Map (BoxCoord liveliness) (cellData, cellResult))
+massInputA  mi fs fvRequired initialResult = formToAForm $
+  over _2 pure <$> massInput mi fs fvRequired initialResult mempty
\ No newline at end of file
diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index 96dec5423..1f207d484 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -189,6 +189,7 @@ data FormIdentifier
   | FIDcUserNote
   | FIDAdminDemo
   | FIDUserDelete
+  | FIDCommunication
   deriving (Eq, Ord, Read, Show)
 
 instance PathPiece FormIdentifier where
diff --git a/src/Utils/Parameters.hs b/src/Utils/Parameters.hs
index 81b0c210a..5d5335a98 100644
--- a/src/Utils/Parameters.hs
+++ b/src/Utils/Parameters.hs
@@ -20,7 +20,7 @@ import Data.Universe
 import Control.Monad.Trans.Maybe (MaybeT(..))
 
 
-data GlobalGetParam = GetReferer
+data GlobalGetParam = GetReferer | GetRecipient
   deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic)
 
 instance Universe GlobalGetParam

From 680b674b09c474db22dae9135ddaf60435a5a302 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 4 Apr 2019 19:33:39 +0200
Subject: [PATCH 006/238] Solidify design of BearerToken

---
 config/settings.yml               |   1 +
 package.yaml                      |   2 +
 src/Application.hs                |  18 ++--
 src/Auth/LDAP.hs                  |   2 +-
 src/CryptoID.hs                   |   5 +
 src/Data/Aeson/Types/Instances.hs |  14 +++
 src/Data/NonNull/Instances.hs     |  20 ++++
 src/Foundation.hs                 |  45 +++++----
 src/Handler/Utils.hs              |   4 +-
 src/Handler/Utils/DateTime.hs     |   6 +-
 src/Import/NoFoundation.hs        |   4 +
 src/Jobs.hs                       |  17 ++--
 src/Jobs/Crontab.hs               |   2 +-
 src/Jobs/Handler/HelpRequest.hs   |   2 +-
 src/Jose/Jwt/Instances.hs         |  18 ++++
 src/Model/Migration/Types.hs      |   1 -
 src/Model/Token.hs                | 158 ++++++++++++++++++++++++++++++
 src/Model/Types.hs                |  43 +++++++-
 src/Model/Types/JSON.hs           |  23 ++++-
 src/Settings.hs                   |   4 +
 src/Settings/Cluster.hs           |  14 +++
 src/Utils/Lens.hs                 |   8 ++
 22 files changed, 363 insertions(+), 48 deletions(-)
 create mode 100644 src/Data/Aeson/Types/Instances.hs
 create mode 100644 src/Data/NonNull/Instances.hs
 create mode 100644 src/Jose/Jwt/Instances.hs
 create mode 100644 src/Model/Token.hs

diff --git a/config/settings.yml b/config/settings.yml
index 3211d42db..9479d002a 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -27,6 +27,7 @@ notification-rate-limit: 3600
 notification-collate-delay: 300
 notification-expiration: 259201
 session-timeout: 7200
+jwt-expiration: 604800
 maximum-content-length: 52428800
 
 log-settings:
diff --git a/package.yaml b/package.yaml
index 339ecff3e..c856a6e95 100644
--- a/package.yaml
+++ b/package.yaml
@@ -117,6 +117,8 @@ dependencies:
   - lattices
   - hsass
   - semigroupoids
+  - jose-jwt
+  - mono-traversable
 
 other-extensions:
   - GeneralizedNewtypeDeriving
diff --git a/src/Application.hs b/src/Application.hs
index 20824d216..5b130dd50 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -101,7 +101,7 @@ mkYesodDispatch "UniWorX" resourcesUniWorX
 -- the place to put your migrate statements to have automatic database
 -- migrations handled by Yesod.
 makeFoundation :: (MonadResource m, MonadBaseControl IO m) => AppSettings -> m UniWorX
-makeFoundation appSettings@AppSettings{..} = do
+makeFoundation appSettings'@AppSettings{..} = do
     -- Some basic initializations: HTTP connection manager, logger, and static
     -- subsite.
     appHttpManager <- newManager
@@ -141,7 +141,7 @@ makeFoundation appSettings@AppSettings{..} = do
     -- logging function. To get out of this loop, we initially create a
     -- temporary foundation without a real connection pool, get a log function
     -- from there, and then create the real foundation.
-    let mkFoundation appConnPool appSmtpPool appLdapPool appCryptoIDKey appSessionKey appSecretBoxKey appWidgetMemcached = UniWorX {..}
+    let mkFoundation appConnPool appSmtpPool appLdapPool appCryptoIDKey appSessionKey appSecretBoxKey appWidgetMemcached appJSONWebKeySet = UniWorX {..}
         -- The UniWorX {..} syntax is an example of record wild cards. For more
         -- information, see:
         -- https://ocharles.org.uk/blog/posts/2014-12-04-record-wildcards.html
@@ -153,13 +153,14 @@ makeFoundation appSettings@AppSettings{..} = do
           (error "sessionKey forced in tempFoundation")
           (error "secretBoxKey forced in tempFoundation")
           (error "widgetMemcached forced in tempFoundation")
+          (error "JSONWebKeySet forced in tempFoundation")
         logFunc loc src lvl str = do
           f <- messageLoggerSource tempFoundation <$> readTVarIO (snd appLogger)
           f loc src lvl str
 
     flip runLoggingT logFunc $ do
       $logDebugS "InstanceID" $ UUID.toText appInstanceID
-      -- logDebugS "Configuration" $ tshow appSettings
+      -- logDebugS "Configuration" $ tshow appSettings'
 
       smtpPool <- traverse createSmtpPool appSmtpConf
 
@@ -177,8 +178,9 @@ makeFoundation appSettings@AppSettings{..} = do
       appCryptoIDKey <- clusterSetting (Proxy :: Proxy 'ClusterCryptoIDKey) `runSqlPool` sqlPool
       appSessionKey <- clusterSetting (Proxy :: Proxy 'ClusterClientSessionKey) `runSqlPool` sqlPool
       appSecretBoxKey <- clusterSetting (Proxy :: Proxy 'ClusterSecretBoxKey) `runSqlPool` sqlPool
+      appJSONWebKeySet <- clusterSetting (Proxy :: Proxy 'ClusterJSONWebKeySet) `runSqlPool` sqlPool
 
-      let foundation = mkFoundation sqlPool smtpPool ldapPool appCryptoIDKey appSessionKey appSecretBoxKey appWidgetMemcached
+      let foundation = mkFoundation sqlPool smtpPool ldapPool appCryptoIDKey appSessionKey appSecretBoxKey appWidgetMemcached appJSONWebKeySet
 
       handleJobs foundation
 
@@ -265,7 +267,7 @@ makeLogWare app = do
       logger <- readTVarIO . snd $ appLogger app
       logWare <- mkRequestLogger def
         { outputFormat = bool
-            (Apache . bool FromSocket FromHeader . appIpFromHeader $ appSettings app)
+            (Apache . bool FromSocket FromHeader $ app ^. _appIpFromHeader)
             (Detailed True)
             logDetailed
         , destination = Logger $ loggerSet logger
@@ -287,8 +289,8 @@ makeLogWare app = do
 -- | Warp settings for the given foundation value.
 warpSettings :: UniWorX -> Settings
 warpSettings foundation = defaultSettings
-    & setPort (appPort $ appSettings foundation)
-    & setHost (appHost $ appSettings foundation)
+    & setPort (foundation ^. _appPort)
+    & setHost (foundation ^. _appHost)
     & setOnException (\_req e ->
         when (defaultShouldDisplayException e) $ do
           logger <- readTVarIO . snd $ appLogger foundation
@@ -384,6 +386,6 @@ addPWEntry :: User
            -> Text {-^ Password -}
            -> IO ()
 addPWEntry User{ userAuthentication = _, ..} (Text.encodeUtf8 -> pw) = db $ do
-  PWHashConf{..} <- getsYesod $ appAuthPWHash . appSettings
+  PWHashConf{..} <- getsYesod $ view _appAuthPWHash
   (AuthPWHash . Text.decodeUtf8 -> userAuthentication) <- liftIO $ makePasswordWith pwHashAlgorithm pw pwHashStrength
   void $ insert User{..}
diff --git a/src/Auth/LDAP.hs b/src/Auth/LDAP.hs
index 5233faaf3..d65c1ee9b 100644
--- a/src/Auth/LDAP.hs
+++ b/src/Auth/LDAP.hs
@@ -159,7 +159,7 @@ campusUser conf@LdapConf{..} pool Creds{..} = liftIO . (`catches` errHandlers) $
                   ]
 
 -- ldapConfig :: UniWorX -> LDAPConfig
--- ldapConfig _app@(appSettings -> settings) = LDAPConfig
+-- ldapConfig _app@(appSettings' -> settings) = LDAPConfig
 --   { usernameFilter = \u -> principalName <> "=" <> u
 --   , identifierModifier
 --   , ldapUri = appLDAPURI settings
diff --git a/src/CryptoID.hs b/src/CryptoID.hs
index 899047c3b..22266fc3a 100644
--- a/src/CryptoID.hs
+++ b/src/CryptoID.hs
@@ -29,6 +29,11 @@ import Data.Aeson (ToJSON(..), ToJSONKey(..), ToJSONKeyFunction(..), FromJSON(..
 import Data.Aeson.Encoding (text)
 
 
+instance {-# OVERLAPPING #-} MonadThrow m => MonadCrypto (ReaderT CryptoIDKey m) where
+  type MonadCryptoKey (ReaderT CryptoIDKey m) = CryptoIDKey
+  cryptoIDKey f = ask >>= f
+
+
 -- Generates CryptoUUID... and CryptoFileName... Datatypes
 decCryptoIDs [ ''SubmissionId
              , ''FileId
diff --git a/src/Data/Aeson/Types/Instances.hs b/src/Data/Aeson/Types/Instances.hs
new file mode 100644
index 000000000..f785576f2
--- /dev/null
+++ b/src/Data/Aeson/Types/Instances.hs
@@ -0,0 +1,14 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Data.Aeson.Types.Instances
+  (
+  ) where
+
+import ClassyPrelude
+
+import Data.Aeson.Types (Parser)
+import Control.Monad.Catch
+
+
+instance MonadThrow Parser where
+  throwM = fail . show
diff --git a/src/Data/NonNull/Instances.hs b/src/Data/NonNull/Instances.hs
new file mode 100644
index 000000000..1a11a66d9
--- /dev/null
+++ b/src/Data/NonNull/Instances.hs
@@ -0,0 +1,20 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Data.NonNull.Instances
+  (
+  ) where
+
+import ClassyPrelude
+
+import Data.Aeson
+
+
+instance ToJSON a => ToJSON (NonNull a) where
+  toJSON = toJSON . toNullable
+
+instance (FromJSON a, MonoFoldable a) => FromJSON (NonNull a) where
+  parseJSON = parseJSON >=> maybe (fail "Expected non-empty structure") return . fromNullable
+
+
+instance Hashable a => Hashable (NonNull a) where
+  hashWithSalt s = hashWithSalt s . toNullable
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 0aca60110..09755de7d 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -77,6 +77,7 @@ import qualified Yesod.Auth.Message as Auth
 import qualified Data.Conduit.List as C
 
 import qualified Crypto.Saltine.Core.SecretBox as SecretBox
+import qualified Jose.Jwk as Jose
 
 import qualified Database.Memcached.Binary.IO as Memcached
 import Data.Bits (Bits(zeroBits))
@@ -96,6 +97,8 @@ instance DisplayAble TermId where
 instance DisplayAble SchoolId where
   display = CI.original . unSchoolKey
 
+type SMTPPool = Pool SMTPConnection
+
 -- infixl 9 :$:
 -- pattern a :$: b = a b
 
@@ -104,7 +107,7 @@ instance DisplayAble SchoolId where
 -- starts running, such as database connections. Every handler will have
 -- access to the data present here.
 data UniWorX = UniWorX
-    { appSettings        :: AppSettings
+    { appSettings'       :: AppSettings
     , appStatic          :: EmbeddedStatic -- ^ Settings for static file serving.
     , appConnPool        :: ConnectionPool -- ^ Database connection pool.
     , appSmtpPool        :: Maybe SMTPPool
@@ -119,9 +122,16 @@ data UniWorX = UniWorX
     , appCronThread      :: TMVar (ReleaseKey, ThreadId)
     , appSessionKey      :: ClientSession.Key
     , appSecretBoxKey    :: SecretBox.Key
+    , appJSONWebKeySet   :: Jose.JwkSet
     }
 
-type SMTPPool = Pool SMTPConnection
+makeLenses_ ''UniWorX
+instance HasInstanceID UniWorX InstanceId where
+  instanceID = _appInstanceID
+instance HasJSONWebKeySet UniWorX Jose.JwkSet where
+  jsonWebKeySet = _appJSONWebKeySet
+instance HasAppSettings UniWorX where
+  appSettings = _appSettings'
 
 -- This is where we define all of the routes in our application. For a full
 -- explanation of the syntax, please see:
@@ -463,7 +473,7 @@ tagAccessPredicate AuthNoEscalation = APDB $ \mAuthId route _ -> case route of
 tagAccessPredicate AuthDeprecated = APHandler $ \_ r _ -> do
   $logWarnS "AccessControl" ("deprecated route: " <> tshow r)
   addMessageI Error MsgDeprecatedRoute
-  allow <- appAllowDeprecated . appSettings <$> getYesod
+  allow <- view _appAllowDeprecated
   return $ bool (Unauthorized "Deprecated Route") Authorized allow
 tagAccessPredicate AuthDevelopment = APHandler $ \_ r _ -> do
   $logWarnS "AccessControl" ("route in development: " <> tshow r)
@@ -809,17 +819,17 @@ instance Yesod UniWorX where
     -- Controls the base of generated URLs. For more information on modifying,
     -- see: https://github.com/yesodweb/yesod/wiki/Overriding-approot
     approot = ApprootRequest $ \app req ->
-        case appRoot $ appSettings app of
+        case app ^. _appRoot of
             Nothing -> getApprootText guessApproot app req
             Just root -> root
 
     -- Store session data on the client in encrypted cookies,
     -- default session idle timeout is 120 minutes
-    makeSessionBackend UniWorX{appSessionKey,appSettings=AppSettings{appSessionTimeout}} = do
-      (getCachedDate, _) <- clientSessionDateCacher appSessionTimeout
-      return . Just $ clientSessionBackend appSessionKey getCachedDate
+    makeSessionBackend app = do
+      (getCachedDate, _) <- clientSessionDateCacher (app ^. _appSessionTimeout)
+      return . Just $ clientSessionBackend (app ^. _appSessionKey) getCachedDate
 
-    maximumContentLength UniWorX{appSettings=AppSettings{appMaximumContentLength}} _ = appMaximumContentLength
+    maximumContentLength app _ = app ^. _appMaximumContentLength
 
     -- Yesod Middleware allows you to run code before and after each handler function.
     -- The defaultYesodMiddleware adds the response header "Vary: Accept, Accept-Language" and performs authorization checks.
@@ -878,7 +888,7 @@ instance Yesod UniWorX where
         encrypted :: ToJSON a => a -> Widget -> Widget
         encrypted plaintextJson plaintext = do
           canDecrypt <- (== Authorized) <$> evalAccess AdminErrMsgR True
-          shouldEncrypt <- getsYesod $ appEncryptErrors . appSettings
+          shouldEncrypt <- view _appEncryptErrors
           if
             | shouldEncrypt
             , not canDecrypt -> do
@@ -919,8 +929,8 @@ instance Yesod UniWorX where
     isAuthorized = evalAccess
 
     addStaticContent ext _mime content = do
-      UniWorX{appWidgetMemcached, appSettings} <- getYesod
-      for ((,) <$> appWidgetMemcached <*> appWidgetMemcachedConf appSettings) $ \(mConn, WidgetMemcachedConf{ widgetMemcachedConnectInfo = _, .. }) -> do
+      UniWorX{appWidgetMemcached, appSettings'} <- getYesod
+      for ((,) <$> appWidgetMemcached <*> appWidgetMemcachedConf appSettings') $ \(mConn, WidgetMemcachedConf{ widgetMemcachedConnectInfo = _, .. }) -> do
         let expiry = (maybe 0 ceiling widgetMemcachedExpiry)
             touch = liftIO $ Memcached.touch expiry (encodeUtf8 $ pack fileName) mConn
             add = liftIO $ Memcached.add zeroBits expiry (encodeUtf8 $ pack fileName) content mConn
@@ -971,8 +981,7 @@ siteLayout = siteLayout' . Just
 siteLayout' :: Maybe Widget -- ^ Optionally override `pageHeading`
            -> Widget -> Handler Html
 siteLayout' headingOverride widget = do
-  master <- getYesod
-  let AppSettings { appUserDefaults = UserDefaultConf{..}, .. } = appSettings master
+  AppSettings { appUserDefaults = UserDefaultConf{..}, .. } <- view appSettings
 
   isModal <- hasCustomHeader HeaderIsModal
 
@@ -2081,7 +2090,7 @@ instance YesodAuth UniWorX where
             _other -> return res
 
       $logDebugS "auth" $ tshow Creds{..}
-      UniWorX{ appSettings = AppSettings{ appUserDefaults = UserDefaultConf{..}, ..}, .. } <- getYesod
+      UniWorX{ appSettings' = AppSettings{ appUserDefaults = UserDefaultConf{..}, ..}, .. } <- getYesod
 
       flip catches excHandlers $ case (,) <$> appLdapConf <*> appLdapPool of
         Just (ldapConf, ldapPool) -> fmap (either id id) . runExceptT $ do
@@ -2200,7 +2209,7 @@ instance YesodAuth UniWorX where
       where
         insertMaybe key val = get key >>= maybe (insert_ val) (\_ -> return ())
 
-    authPlugins (UniWorX{ appSettings = AppSettings{..}, appLdapPool }) = catMaybes
+    authPlugins (UniWorX{ appSettings' = AppSettings{..}, appLdapPool }) = catMaybes
       [ campusLogin <$> appLdapConf <*> appLdapPool
       , Just . hashLogin $ pwHashAlgorithm appAuthPWHash
       , dummyLogin <$ guard appAuthDummyLogin
@@ -2225,9 +2234,9 @@ unsafeHandler f h = do
 
 
 instance YesodMail UniWorX where
-  defaultFromAddress = getsYesod $ appMailFrom . appSettings
-  mailObjectIdDomain = getsYesod $ appMailObjectDomain . appSettings
-  mailVerp = getsYesod $ appMailVerp . appSettings
+  defaultFromAddress = getsYesod $ view _appMailFrom
+  mailObjectIdDomain = getsYesod $ view _appMailObjectDomain
+  mailVerp = getsYesod $ view _appMailVerp
   mailDateTZ = return appTZ
   mailSmtp act = do
     pool <- maybe (throwM MailNotAvailable) return =<< getsYesod appSmtpPool
diff --git a/src/Handler/Utils.hs b/src/Handler/Utils.hs
index 46abeddd5..6e250cfd9 100644
--- a/src/Handler/Utils.hs
+++ b/src/Handler/Utils.hs
@@ -4,6 +4,8 @@ module Handler.Utils
 
 import Import
 
+import Utils.Lens
+
 import qualified Data.Text as T
 -- import qualified Data.Set (Set)
 import qualified Data.Set as Set
@@ -40,7 +42,7 @@ downloadFiles = do
   case mauth of
     Just (Entity _ User{..}) -> return userDownloadFiles
     Nothing -> do
-      AppSettings{ appUserDefaults = UserDefaultConf{..} } <- getsYesod appSettings
+      UserDefaultConf{..} <- getsYesod $ view _appUserDefaults
       return userDefaultDownloadFiles
 
 tidFromText :: Text -> Maybe TermId
diff --git a/src/Handler/Utils/DateTime.hs b/src/Handler/Utils/DateTime.hs
index de2b0705a..15ecfc780 100644
--- a/src/Handler/Utils/DateTime.hs
+++ b/src/Handler/Utils/DateTime.hs
@@ -13,6 +13,8 @@ module Handler.Utils.DateTime
 
 import Import
 
+import Utils.Lens
+
 import Data.Time.Zones
 import qualified Data.Time.Zones as TZ
 
@@ -83,7 +85,7 @@ getTimeLocale = getTimeLocale' <$> languages
 getDateTimeFormat :: (MonadHandler m, HandlerSite m ~ UniWorX) => SelDateTimeFormat -> m DateTimeFormat
 getDateTimeFormat sel = do
   mauth <- liftHandlerT maybeAuth
-  AppSettings{ appUserDefaults = UserDefaultConf{..} } <- getsYesod appSettings
+  UserDefaultConf{..} <- getsYesod $ view _appUserDefaults
   let
     fmt
       | Just (Entity _ User{..}) <- mauth
@@ -182,4 +184,4 @@ weeksToAdd old new = loop 0 old
   where
     loop n t
       | t > new   = n
-      | otherwise = loop (succ n) (addOneWeek t)
\ No newline at end of file
+      | otherwise = loop (succ n) (addOneWeek t)
diff --git a/src/Import/NoFoundation.hs b/src/Import/NoFoundation.hs
index 21e0b5de5..fd37d73bc 100644
--- a/src/Import/NoFoundation.hs
+++ b/src/Import/NoFoundation.hs
@@ -43,6 +43,7 @@ import GHC.Exts               as Import (IsList)
 import Data.Hashable          as Import
 import Data.List.NonEmpty     as Import (NonEmpty(..))
 import Data.List.NonEmpty.Instances as Import ()
+import Data.NonNull.Instances as Import ()
 import Data.Text.Encoding.Error as Import(UnicodeException(..))
 import Data.Semigroup         as Import (Semigroup)
 import Data.Monoid            as Import (Last(..), First(..))
@@ -56,6 +57,7 @@ import Control.Monad.Trans.Resource as Import (ReleaseKey)
 
 import Network.Mail.Mime.Instances as Import ()
 import Yesod.Core.Instances as Import ()
+import Data.Aeson.Types.Instances as Import ()
 
 import Ldap.Client.Pool as Import
 
@@ -67,6 +69,8 @@ import Numeric.Natural.Instances as Import ()
 import System.Random as Import (Random)
 import Control.Monad.Random.Class as Import (MonadRandom(..))
 
+import Jose.Jwt.Instances as Import ()
+
 
 import Control.Monad.Trans.RWS (RWST)
 
diff --git a/src/Jobs.hs b/src/Jobs.hs
index 2a9a42556..04df2686c 100644
--- a/src/Jobs.hs
+++ b/src/Jobs.hs
@@ -6,6 +6,7 @@ module Jobs
   ) where
 
 import Import
+import Utils.Lens
 
 import Jobs.Types as Types hiding (JobCtl(JobCtlQueue))
 import Jobs.Types (JobCtl(JobCtlQueue))
@@ -77,7 +78,7 @@ handleJobs :: ( MonadResource m
 -- Uses `unsafeHandler`, as per documentation all HTTP-related fields of state/environment are meaningless placeholders.
 -- Handling commands in `HandlerT` provides us with the facilities to render urls, unifies logging, provides a value of the foundation type, ...
 handleJobs foundation@UniWorX{..} = do
-  let num = appJobWorkers appSettings
+  let num = foundation ^. _appJobWorkers
 
   jobCrontab <- liftIO $ newTMVarIO HashMap.empty
   jobConfirm <- liftIO $ newTVarIO HashMap.empty
@@ -135,7 +136,7 @@ execCrontab = evalStateT go HashMap.empty
         runConduit $ transPipe lift (selectSource [] []) .| C.mapM_ merge
 
       refT <- liftIO getCurrentTime
-      settings <- getsYesod appSettings
+      settings <- getsYesod appSettings'
       currentState <- mapStateT (mapReaderT $ liftIO . atomically) $ do
         crontab' <- liftBase . tryReadTMVar =<< asks jobCrontab
         case crontab' of
@@ -157,7 +158,7 @@ execCrontab = evalStateT go HashMap.empty
                     | ((==) `on` HashMap.lookup jobCtl) newCrontab currentCrontab
                       -> do
                         now <- liftIO $ getCurrentTime
-                        instanceID <- getsYesod appInstanceID
+                        instanceID' <- getsYesod appInstanceID
                         State.modify $ HashMap.alter (Just . ($ Max now) . maybe id (<>)) jobCtl
                         case jobCtl of
                           JobCtlQueue job -> do
@@ -166,7 +167,7 @@ execCrontab = evalStateT go HashMap.empty
                               CronLastExec
                                 { cronLastExecJob = toJSON job
                                 , cronLastExecTime = now
-                                , cronLastExecInstance = instanceID
+                                , cronLastExecInstance = instanceID'
                                 }
                               [ CronLastExecTime =. now ]
                             lift . lift $ queueDBJob job
@@ -285,21 +286,21 @@ jLocked jId act = do
   let
     lock = runDB . setSerializable $ do
       qj@QueuedJob{..} <- maybe (throwM $ JNonexistant jId) return =<< get jId
-      instanceID <- getsYesod appInstanceID
-      threshold <- getsYesod $ appJobStaleThreshold . appSettings
+      instanceID' <- getsYesod $ view instanceID
+      threshold <- getsYesod $ view _appJobStaleThreshold
       now <- liftIO getCurrentTime
       hadStale <- maybeT (return False) $ do
         lockTime <- MaybeT $ return queuedJobLockTime
         lockInstance <- MaybeT $ return queuedJobLockInstance
         if
-          | lockInstance == instanceID
+          | lockInstance == instanceID'
           , diffUTCTime now lockTime >= threshold
             -> return True
           | otherwise
             -> throwM $ JLocked jId lockInstance lockTime
       when hadStale .
         $logWarnS "Jobs" $ "Ignored stale lock: " <> tshow qj
-      val <- updateGet jId [ QueuedJobLockInstance =. Just instanceID
+      val <- updateGet jId [ QueuedJobLockInstance =. Just instanceID'
                            , QueuedJobLockTime =. Just now
                            ]
       liftIO . atomically $ writeTVar hasLock True
diff --git a/src/Jobs/Crontab.hs b/src/Jobs/Crontab.hs
index 41b3441c6..af83ef1c5 100644
--- a/src/Jobs/Crontab.hs
+++ b/src/Jobs/Crontab.hs
@@ -23,7 +23,7 @@ import qualified Data.Conduit.List as C
 determineCrontab :: DB (Crontab JobCtl)
 -- ^ Extract all future jobs from the database (sheet deadlines, ...)
 determineCrontab = execWriterT $ do
-  AppSettings{..} <- getsYesod appSettings
+  AppSettings{..} <- getsYesod appSettings'
 
   case appJobFlushInterval of
     Just interval -> tell $ HashMap.singleton
diff --git a/src/Jobs/Handler/HelpRequest.hs b/src/Jobs/Handler/HelpRequest.hs
index 1ec904e2b..5623be772 100644
--- a/src/Jobs/Handler/HelpRequest.hs
+++ b/src/Jobs/Handler/HelpRequest.hs
@@ -20,7 +20,7 @@ dispatchJobHelpRequest :: Either (Maybe Address) UserId
                        -> Maybe Text -- ^ Referer
                        -> Handler ()
 dispatchJobHelpRequest jSender jRequestTime jHelpRequest jReferer = do
-  supportAddress <- getsYesod $ appMailSupport . appSettings
+  supportAddress <- view _appMailSupport
   userInfo <- bitraverse return (runDB . getEntity) jSender
   let userAddress = either
         id
diff --git a/src/Jose/Jwt/Instances.hs b/src/Jose/Jwt/Instances.hs
new file mode 100644
index 000000000..f7607168c
--- /dev/null
+++ b/src/Jose/Jwt/Instances.hs
@@ -0,0 +1,18 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Jose.Jwt.Instances
+  (
+  ) where
+
+import ClassyPrelude.Yesod
+
+import Jose.Jwt
+
+
+instance PathPiece Jwt where
+  toPathPiece (Jwt bytes) = decodeUtf8 bytes
+  fromPathPiece = Just . Jwt . encodeUtf8
+
+deriving instance Typeable JwtError
+
+instance Exception JwtError
diff --git a/src/Model/Migration/Types.hs b/src/Model/Migration/Types.hs
index 0aed744b0..5ec81cd81 100644
--- a/src/Model/Migration/Types.hs
+++ b/src/Model/Migration/Types.hs
@@ -2,7 +2,6 @@ module Model.Migration.Types where
 
 import ClassyPrelude.Yesod
 import Data.Aeson.TH (deriveJSON, defaultOptions)
-import Database.Persist.Sql
 
 import qualified Model as Current
 import qualified Model.Types.JSON as Current
diff --git a/src/Model/Token.hs b/src/Model/Token.hs
new file mode 100644
index 000000000..a57b5244b
--- /dev/null
+++ b/src/Model/Token.hs
@@ -0,0 +1,158 @@
+{-# LANGUAGE UndecidableInstances #-}
+
+module Model.Token
+  ( BearerToken(..)
+  , bearerToken
+  , encodeToken, decodeToken
+  , tokenToJSON, tokenParseJSON
+  ) where
+
+import ClassyPrelude.Yesod
+import Model
+import Settings
+import Utils.Lens hiding ((.=))
+
+import Yesod.Auth (AuthId)
+
+-- import qualified Jose.Jwa as Jose
+import Jose.Jwk (JwkSet)
+-- import qualified Jose.Jwk as Jose
+import Jose.Jwt (Jwt, JwtError, IntDate(..))
+import qualified Jose.Jwt as Jose
+
+import Jose.Jwt.Instances ()
+import Data.Aeson.Types.Instances ()
+
+import qualified Crypto.Random as Crypto (MonadRandom)
+
+import Data.HashSet (HashSet)
+
+import qualified Data.HashMap.Strict as HashMap
+
+import Data.Aeson.Types (Parser, (.:?), (.:))
+import qualified Data.Aeson as JSON
+import qualified Data.Aeson.Types as JSON
+
+import CryptoID
+
+import Data.Time.Clock
+import Data.Time.Clock.POSIX
+
+import Control.Monad.Random (MonadRandom(..))
+
+
+data BearerToken site = BearerToken
+  { tokenIdentifier :: TokenId
+  , tokenAuthority  :: AuthId site
+  , tokenRoutes     :: Maybe (HashSet (Route site))
+  , tokenAddAuth    :: AuthCNF
+  , tokenIssuedAt   :: UTCTime
+  , tokenIssuedBy   :: InstanceId
+  , tokenExpiresAt
+  , tokenStartsAt   :: Maybe UTCTime
+  } deriving (Generic, Typeable)
+
+deriving instance (Eq (AuthId site), Eq (Route site)) => Eq (BearerToken site)
+deriving instance (Read (AuthId site), Eq (Route site), Hashable (Route site), Read (Route site)) => Read (BearerToken site)
+deriving instance (Show (AuthId site), Show (Route site)) => Show (BearerToken site)
+
+tokenToJSON :: forall m.
+               ( MonadHandler m
+               , HasCryptoUUID (AuthId (HandlerSite m)) m
+               , RenderRoute (HandlerSite m)
+               ) => BearerToken (HandlerSite m) -> m Value
+tokenToJSON BearerToken{..} = do
+  cID <- encrypt tokenAuthority :: m (CryptoUUID (AuthId (HandlerSite m)))
+  let stdPayload = Jose.JwtClaims
+        { jwtIss = Just $ toPathPiece tokenIssuedBy
+        , jwtSub = Nothing
+        , jwtAud = Nothing
+        , jwtExp = IntDate . utcTimeToPOSIXSeconds <$> tokenExpiresAt
+        , jwtNbf = IntDate . utcTimeToPOSIXSeconds <$> tokenStartsAt
+        , jwtIat = Just . IntDate $ utcTimeToPOSIXSeconds tokenIssuedAt
+        , jwtJti = Just $ toPathPiece tokenIdentifier
+        }
+  return . JSON.object $
+    [ "authority" .= cID
+    , "routes"    .= tokenRoutes
+    , "add-auth"  .= tokenAddAuth
+    ] ++ let JSON.Object hm = toJSON stdPayload in HashMap.toList hm
+
+tokenParseJSON :: forall site.
+                  ( HasCryptoUUID (AuthId site) (ReaderT CryptoIDKey Parser)
+                  , ParseRoute site
+                  , Hashable (Route site)
+                  )
+               => Value
+               -> ReaderT CryptoIDKey Parser (BearerToken site)
+tokenParseJSON v@(Object o) = do
+  tokenAuthority' <- lift (o .: "authority") :: ReaderT CryptoIDKey Parser (CryptoUUID (AuthId site))
+  tokenAuthority <- decrypt tokenAuthority'
+
+  tokenRoutes    <- lift $ o .:? "routes"
+  tokenAddAuth   <- lift $ o .:  "add-auth"
+  Jose.JwtClaims{..} <- lift $ parseJSON v
+
+  let unIntDate (IntDate posix) = posixSecondsToUTCTime posix
+
+  Just tokenIssuedBy <- return $ jwtIss >>= fromPathPiece
+  Just tokenIdentifier <- return $ jwtJti >>= fromPathPiece
+  Just tokenIssuedAt <- return $ unIntDate <$> jwtIat
+  let tokenExpiresAt = unIntDate <$> jwtExp
+      tokenStartsAt = unIntDate <$> jwtNbf
+
+  return BearerToken{..}
+tokenParseJSON v = lift $ JSON.typeMismatch "BearerToken" v
+
+
+bearerToken :: forall m.
+               ( MonadHandler m
+               , HasInstanceID (HandlerSite m) InstanceId
+               , HasCryptoUUID (AuthId (HandlerSite m)) m
+               , HasAppSettings (HandlerSite m)
+               )
+            => AuthId (HandlerSite m)
+            -> Maybe (HashSet (Route (HandlerSite m)))
+            -> AuthCNF
+            -> Maybe (Maybe UTCTime) -- ^ @Nothing@ determines default expiry time automatically
+            -> Maybe UTCTime -- ^ @Nothing@ means token starts to be valid immediately
+            -> m (BearerToken (HandlerSite m))
+bearerToken tokenAuthority tokenRoutes tokenAddAuth mTokenExpiresAt tokenStartsAt = do
+  tokenIdentifier <- liftIO $ getRandom
+  tokenIssuedAt <- liftIO $ getCurrentTime
+  tokenIssuedBy <- getsYesod $ view instanceID
+
+  defaultExpiration <- getsYesod $ view _appJWTExpiration
+  
+  let tokenExpiresAt
+        | Just t <- mTokenExpiresAt
+        = t
+        | Just tDiff <- defaultExpiration
+        = Just $ tDiff `addUTCTime` fromMaybe tokenIssuedAt tokenStartsAt
+        | otherwise
+        = Nothing
+
+  return BearerToken{..}
+
+
+encodeToken :: forall m.
+               ( Crypto.MonadRandom m
+               , MonadHandler m
+               , HasJSONWebKeySet (HandlerSite m) JwkSet
+               , HasInstanceID (HandlerSite m) InstanceId
+               , HasCryptoUUID (AuthId (HandlerSite m)) m
+               , RenderRoute (HandlerSite m)
+               )
+            => BearerToken (HandlerSite m) -> m Jwt
+encodeToken token = do
+  _payload <- tokenToJSON token
+  error "Not implemented"
+
+decodeToken :: forall m.
+               ( Crypto.MonadRandom m
+               , MonadHandler m
+               , HasJSONWebKeySet (HandlerSite m) JwkSet
+               , HasCryptoUUID (AuthId (HandlerSite m)) m
+               )
+            => Jwt -> m (Either JwtError (BearerToken (HandlerSite m)))
+decodeToken = error "Not implemented"
diff --git a/src/Model/Types.hs b/src/Model/Types.hs
index 7cf317d0c..5c292d146 100644
--- a/src/Model/Types.hs
+++ b/src/Model/Types.hs
@@ -27,6 +27,8 @@ import Data.Universe.Helpers
 import Data.UUID.Types (UUID)
 import qualified Data.UUID.Types as UUID
 
+import Data.NonNull.Instances ()
+
 import Data.Default
 
 import Text.Read (readMaybe)
@@ -54,7 +56,7 @@ import qualified Data.Aeson as Aeson
 import qualified Data.Aeson.Types as Aeson
 import Data.Aeson (FromJSON(..), ToJSON(..), FromJSONKey(..), ToJSONKey(..), FromJSONKeyFunction(..), withText, withObject, Value())
 import Data.Aeson.Types (toJSONKeyText)
-import Data.Aeson.TH (deriveJSON, defaultOptions, Options(..), SumEncoding(..))
+import Data.Aeson.TH (deriveJSON, defaultOptions, Options(..), SumEncoding(..), mkToJSON, mkParseJSON)
 
 import GHC.Generics (Generic)
 import Generics.Deriving.Monoid (memptydefault, mappenddefault)
@@ -79,7 +81,7 @@ import Model.Types.Wordlist
 import Data.Text.Metrics (damerauLevenshtein)
 
 import Data.Binary (Binary)
-
+  
 
 instance PathPiece UUID where
   fromPathPiece = UUID.fromString . unpack
@@ -731,7 +733,7 @@ data AuthTag -- sortiert nach gewünschter Reihenfolge auf /authpreds, d.h. Prä
   | AuthDeprecated
   | AuthDevelopment
   | AuthFree
-  deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic)
+  deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
 
 instance Universe AuthTag
 instance Finite AuthTag
@@ -774,6 +776,40 @@ instance FromJSON AuthTagActive where
 derivePersistFieldJSON ''AuthTagActive
 
 
+data PredLiteral a = PLVariable { plVar :: a } | PLNegated { plVar :: a }
+  deriving (Eq, Ord, Read, Show, Generic, Typeable)
+
+instance Hashable a => Hashable (PredLiteral a)
+deriveJSON defaultOptions
+  { constructorTagModifier = camelToPathPiece' 1
+  , sumEncoding = ObjectWithSingleField
+  , unwrapUnaryRecords = True
+  } ''PredLiteral
+
+
+newtype PredCNF a = PredCNF (Set (NonNull (Set (PredLiteral a))))
+  deriving (Eq, Ord, Read, Show, Generic, Typeable)
+  deriving newtype (Semigroup, Monoid)
+
+newtype PredDNF a = PredDNF (Set (NonNull (Set (PredLiteral a))))
+  deriving (Eq, Ord, Read, Show, Generic, Typeable)
+  deriving newtype (Semigroup, Monoid)
+
+$(return [])
+
+instance (Ord a, ToJSON a) => ToJSON (PredCNF a) where
+  toJSON = $(mkToJSON predNFAesonOptions ''PredCNF)
+instance (Ord a, FromJSON a) => FromJSON (PredCNF a) where
+  parseJSON = $(mkParseJSON predNFAesonOptions ''PredCNF)
+ 
+instance (Ord a, ToJSON a) => ToJSON (PredDNF a) where
+  toJSON = $(mkToJSON predNFAesonOptions ''PredDNF)
+instance (Ord a, FromJSON a) => FromJSON (PredDNF a) where
+  parseJSON = $(mkParseJSON predNFAesonOptions ''PredDNF)
+
+type AuthCNF = PredCNF AuthTag
+type AuthDNF = PredDNF AuthTag
+
 
 data LecturerType = CourseLecturer | CourseAssistant
   deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
@@ -801,4 +837,5 @@ type UserEmail       = CI Email
 
 type PWHashAlgorithm = ByteString -> PWStore.Salt -> Int -> ByteString
 type InstanceId      = UUID
+type TokenId         = UUID
 type TermCandidateIncidence = UUID
diff --git a/src/Model/Types/JSON.hs b/src/Model/Types/JSON.hs
index e69f8f1b2..66ed78163 100644
--- a/src/Model/Types/JSON.hs
+++ b/src/Model/Types/JSON.hs
@@ -1,5 +1,6 @@
 module Model.Types.JSON
   ( derivePersistFieldJSON
+  , predNFAesonOptions
   ) where
 
 import ClassyPrelude.Yesod hiding (derivePersistFieldJSON)
@@ -9,11 +10,13 @@ import Database.Persist.Sql
 import qualified Data.ByteString.Lazy as LBS
 import qualified Data.Text.Encoding as Text
 
-import qualified Data.Aeson as JSON
+import Data.Aeson as JSON
 
 import Language.Haskell.TH
 import Language.Haskell.TH.Datatype
 
+import Utils.PathPiece
+
 
 derivePersistFieldJSON :: Name -> DecsQ
 derivePersistFieldJSON tName = do
@@ -28,10 +31,10 @@ derivePersistFieldJSON tName = do
         | otherwise = cxt [[t|PersistField|] `appT` t]
   sequence
     [ instanceD iCxt ([t|PersistField|] `appT` t)
-      [ funD (mkName "toPersistValue")
+      [ funD 'toPersistValue
         [ clause [] (normalB [e|PersistDbSpecific . LBS.toStrict . JSON.encode|]) []
         ]
-      , funD (mkName "fromPersistValue")
+      , funD 'fromPersistValue
         [ do
             bs <- newName "bs"
             clause [[p|PersistDbSpecific $(varP bs)|]] (normalB [e|first pack $ JSON.eitherDecodeStrict' $(varE bs)|]) []
@@ -45,8 +48,20 @@ derivePersistFieldJSON tName = do
         ]
       ]
     , instanceD sqlCxt ([t|PersistFieldSql|] `appT` t)
-      [ funD (mkName "sqlType")
+      [ funD 'sqlType
         [ clause [wildP] (normalB [e|SqlOther "jsonb"|]) []
         ]
       ]
     ]
+
+
+predNFAesonOptions :: Options
+-- ^ Needed for JSON instances of `predCNF` and `predDNF`
+--
+-- Moved to this module due to stage restriction
+predNFAesonOptions = defaultOptions
+  { constructorTagModifier = camelToPathPiece' 1
+  , sumEncoding = ObjectWithSingleField
+  , tagSingleConstructors = True
+  }
+  
diff --git a/src/Settings.hs b/src/Settings.hs
index f717ee378..ae2ce4b30 100644
--- a/src/Settings.hs
+++ b/src/Settings.hs
@@ -100,6 +100,7 @@ data AppSettings = AppSettings
     , appNotificationExpiration :: NominalDiffTime
     , appSessionTimeout         :: NominalDiffTime
     , appMaximumContentLength   :: Maybe Word64
+    , appJWTExpiration          :: Maybe NominalDiffTime
 
     , appInitialLogSettings     :: LogSettings
 
@@ -352,6 +353,7 @@ instance FromJSON AppSettings where
         appNotificationRateLimit  <- o .:  "notification-rate-limit"
         appNotificationCollateDelay <- o .: "notification-collate-delay"
         appNotificationExpiration <- o .: "notification-expiration"
+        appJWTExpiration          <- o .:? "jwt-expiration"
 
         appSessionTimeout         <- o .: "session-timeout"
 
@@ -379,6 +381,8 @@ instance FromJSON AppSettings where
 
         return AppSettings {..}
 
+makeClassy_ ''AppSettings
+
 -- | Settings for 'widgetFile', such as which template languages to support and
 -- default Hamlet settings.
 --
diff --git a/src/Settings/Cluster.hs b/src/Settings/Cluster.hs
index a6fb11799..872d901b7 100644
--- a/src/Settings/Cluster.hs
+++ b/src/Settings/Cluster.hs
@@ -32,11 +32,16 @@ import qualified Data.Binary as Binary
 import qualified Data.Serialize as Serialize
 import qualified Data.ByteString.Base64.URL as Base64
 
+import qualified Jose.Jwa as Jose
+import qualified Jose.Jwk as Jose
+import qualified Jose.Jwt as Jose
+
 
 data ClusterSettingsKey
   = ClusterCryptoIDKey
   | ClusterClientSessionKey
   | ClusterSecretBoxKey
+  | ClusterJSONWebKeySet
   deriving (Eq, Ord, Enum, Bounded, Show, Read)
 
 instance Universe ClusterSettingsKey
@@ -120,3 +125,12 @@ instance FromJSON SecretBox.Key where
   parseJSON = Aeson.withText "Key" $ \t -> do
     bytes <- either fail return . Base64.decode $ encodeUtf8 t
     maybe (fail "Could not parse key") return $ Saltine.decode bytes
+
+
+instance ClusterSetting 'ClusterJSONWebKeySet where
+  type ClusterSettingValue 'ClusterJSONWebKeySet = Jose.JwkSet
+  initClusterSetting _ = liftIO $ do
+    now <- getCurrentTime
+    jwkSig <- Jose.generateSymmetricKey 32 (Jose.UTCKeyId now) Jose.Sig (Just $ Jose.Signed Jose.HS256)
+    return $ Jose.JwkSet [jwkSig]
+  knownClusterSetting _ = ClusterJSONWebKeySet
diff --git a/src/Utils/Lens.hs b/src/Utils/Lens.hs
index 0abc9a8ee..b6a09e3c3 100644
--- a/src/Utils/Lens.hs
+++ b/src/Utils/Lens.hs
@@ -93,4 +93,12 @@ makeLenses_ ''StudyTermCandidate
 
 -- makeClassy_ ''Load
 
+--------------------------
+-- Fields for `UniWorX` --
+--------------------------
 
+class HasInstanceID s a | s -> a where
+  instanceID :: Lens' s a
+  
+class HasJSONWebKeySet s a | s -> a where
+  jsonWebKeySet :: Lens' s a

From cc8823c7cabc4cdee6c920f413ff08c995918063 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 5 Apr 2019 00:05:56 +0200
Subject: [PATCH 007/238] Prototype of !token

---
 haddock.sh                  |  13 ++++-
 messages/uniworx/de.msg     |   5 ++
 src/Foundation.hs           |  87 +++++++++++++++++++++----------
 src/Jose/Jwt/Instances.hs   |   1 +
 src/Model/Token.hs          | 101 ++++++++++++++++++++++++++----------
 src/Model/Types.hs          |  20 +++----
 src/Utils.hs                |   6 +++
 src/Utils/Parameters.hs     |   3 +-
 src/Yesod/Core/Instances.hs |   3 ++
 test/Database.hs            |   4 +-
 10 files changed, 176 insertions(+), 67 deletions(-)

diff --git a/haddock.sh b/haddock.sh
index aaceeb329..7414e60e8 100755
--- a/haddock.sh
+++ b/haddock.sh
@@ -1,3 +1,14 @@
 #!/usr/bin/env bash
 
-exec -- stack build --fast --flag uniworx:library-only --flag uniworx:dev --haddock --haddock-hyperlink-source --haddock-deps --haddock-internal
+move-back() {
+    mv -v .stack-work .stack-work-doc
+    [[ -d .stack-work-build ]] && mv -v .stack-work-build .stack-work
+}
+
+if [[ -d .stack-work-doc ]]; then
+    [[ -d .stack-work ]] && mv -v .stack-work .stack-work-build
+    mv -v .stack-work-doc .stack-work
+    trap move-back EXIT
+fi
+
+stack build --fast --flag uniworx:library-only --flag uniworx:dev --haddock --haddock-hyperlink-source --haddock-deps --haddock-internal
diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index da8e563fa..3172caf4e 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -203,6 +203,10 @@ CorrectorAssignTitle: Korrektor zuweisen
 Unauthorized: Sie haben hierfür keine explizite Berechtigung.
 UnauthorizedAnd l@Text r@Text: (#{l} UND #{r})
 UnauthorizedOr  l@Text r@Text: (#{l} ODER #{r})
+UnauthorizedNoToken: Ihrer Anfrage war kein Authorisierungs-Token beigefügt. 
+UnauthorizedTokenExpired: Ihr Authorisierungs-Token ist abgelaufen.
+UnauthorizedTokenNotStarted: Ihr Authorisierungs-Token ist noch nicht gültig.
+UnauthorizedTokenInvalidRoute: Ihr Authorisierungs-Token ist auf dieser Unterseite nicht gültig.
 UnauthorizedSiteAdmin: Sie sind kein System-weiter Administrator.
 UnauthorizedSchoolAdmin: Sie sind nicht als Administrator für dieses Institut eingetragen.
 UnauthorizedAdminEscalation: Sie sind nicht Administrator für alle Institute, für die dieser Nutzer Administrator oder Veranstalter ist.
@@ -698,6 +702,7 @@ AuthPredsActive: Aktive Authorisierungsprädikate
 AuthPredsActiveChanged: Authorisierungseinstellungen für aktuelle Sitzung gespeichert
 AuthTagFree: Seite ist universell zugänglich
 AuthTagAdmin: Nutzer ist Administrator
+AuthTagToken: Nutzer präsentiert Authorisierungs-Token
 AuthTagNoEscalation: Nutzer-Rechte werden nicht auf fremde Institute ausgeweitet
 AuthTagDeprecated: Seite ist nicht überholt
 AuthTagDevelopment: Seite ist nicht in Entwicklung
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 09755de7d..9634fda67 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -15,6 +15,7 @@ import Auth.LDAP
 import Auth.PWHash
 import Auth.Dummy
 import Jobs.Types
+import Model.Token
 
 import qualified Network.Wai as W (pathInfo)
 
@@ -43,6 +44,7 @@ import Data.Set (Set)
 import qualified Data.Set as Set
 import Data.Map (Map, (!?))
 import qualified Data.Map as Map
+import qualified Data.HashSet as HashSet
 
 import Data.List (nubBy)
 
@@ -396,6 +398,17 @@ appLanguagesOpts = do
 
 
 -- Access Control
+newtype InvalidAuthTag = InvalidAuthTag Text
+  deriving (Eq, Ord, Show, Read, Generic, Typeable)
+instance Exception InvalidAuthTag
+
+data SessionAuthTags = SessionActiveAuthTags | SessionInactiveAuthTags
+  deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic)
+instance Universe SessionAuthTags
+instance Finite SessionAuthTags
+nullaryPathPiece ''SessionAuthTags (camelToPathPiece' 1)
+
+
 data AccessPredicate
   = APPure     (Maybe (AuthId UniWorX) -> Route UniWorX -> Bool -> Reader MsgRenderer AuthResult)
   | APHandler  (Maybe (AuthId UniWorX) -> Route UniWorX -> Bool -> Handler AuthResult)
@@ -460,6 +473,26 @@ tagAccessPredicate AuthAdmin = APDB $ \mAuthId route _ -> case route of
     adrights <- lift $ selectFirst [UserAdminUser ==. authId] []
     guardMExceptT (isJust adrights) (unauthorizedI MsgUnauthorizedSiteAdmin)
     return Authorized
+tagAccessPredicate AuthToken = APDB $ \mAuthId route isWrite -> exceptT return return $ do
+  jwt <- maybeTMExceptT (unauthorizedI MsgUnauthorizedNoToken) $ asum
+    [ MaybeT lookupBearerAuth >>= hoistMaybe . fromPathPiece
+    , MaybeT $ lookupGlobalPostParam PostToken
+    , MaybeT $ lookupGlobalGetParam GetToken
+    ]
+  BearerToken{..} <- catch (decodeToken jwt) $ \case
+    BearerTokenExpired -> throwError =<< unauthorizedI MsgUnauthorizedTokenExpired
+    BearerTokenNotStarted -> throwError =<< unauthorizedI MsgUnauthorizedTokenNotStarted
+    other -> throwM other
+  unless (maybe True (HashSet.member route) tokenRoutes) $
+    throwError =<< unauthorizedI MsgUnauthorizedTokenInvalidRoute
+  authorityVal <- evalAccessFor (Just tokenAuthority) route isWrite
+  unless (is _Authorized authorityVal) $
+    throwError authorityVal
+  whenIsJust tokenAddAuth $ \addDNF -> do
+    additionalVal <- fmap fst . runWriterT $ evalAuthTags (AuthTagActive $ const True) addDNF mAuthId route isWrite
+    unless (is _Authorized additionalVal) $
+      throwError additionalVal
+  return Authorized
 tagAccessPredicate AuthNoEscalation = APDB $ \mAuthId route _ -> case route of
   AdminHijackUserR cID -> exceptT return return $ do
     myUid <- maybeExceptT AuthenticationRequired $ return mAuthId
@@ -714,27 +747,21 @@ tagAccessPredicate AuthRead = APHandler . const . const $ bool (return Authorize
 tagAccessPredicate AuthWrite = APHandler . const . const $ bool (unauthorizedI MsgUnauthorized) (return Authorized)
 
 
-newtype InvalidAuthTag = InvalidAuthTag Text
-  deriving (Eq, Ord, Show, Read, Generic, Typeable)
-instance Exception InvalidAuthTag
+defaultAuthDNF :: AuthDNF
+defaultAuthDNF = PredDNF $ Set.fromList
+  [ impureNonNull . Set.singleton $ PLVariable AuthAdmin
+  , impureNonNull . Set.singleton $ PLVariable AuthToken
+  ]
 
-type DNF a = Set (NonNull (Set a))
-
-data SessionAuthTags = SessionActiveAuthTags | SessionInactiveAuthTags
-  deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic)
-instance Universe SessionAuthTags
-instance Finite SessionAuthTags
-nullaryPathPiece ''SessionAuthTags (camelToPathPiece' 1)
-
-routeAuthTags :: Route UniWorX -> Either InvalidAuthTag (NonNull (DNF AuthTag))
+routeAuthTags :: Route UniWorX -> Either InvalidAuthTag AuthDNF
 -- ^ DNF up to entailment:
 --
 -- > (A_1 && A_2 && ...) OR' B OR' ...
 --
 -- > A OR' B := ((A |- B) ==> A) && (A || B)
-routeAuthTags = fmap (impureNonNull . Set.mapMonotonic impureNonNull) . ofoldM partition' (Set.singleton $ Set.singleton AuthAdmin) . routeAttrs
+routeAuthTags = fmap (PredDNF . Set.mapMonotonic impureNonNull) . ofoldM partition' (Set.mapMonotonic toNullable $ dnfTerms defaultAuthDNF) . routeAttrs
   where
-    partition' :: Set (Set AuthTag) -> Text -> Either InvalidAuthTag (Set (Set AuthTag))
+    partition' :: Set (Set AuthLiteral) -> Text -> Either InvalidAuthTag (Set (Set AuthLiteral))
     partition' prev t
       | Just (Set.fromList . toNullable -> authTags) <- fromNullable =<< mapM fromPathPiece (Text.splitOn "AND" t)
         = if
@@ -745,9 +772,9 @@ routeAuthTags = fmap (impureNonNull . Set.mapMonotonic impureNonNull) . ofoldM p
       | otherwise
         = Left $ InvalidAuthTag t
 
-evalAuthTags :: forall m. (MonadAP m, MonadLogger m) => AuthTagActive -> NonNull (DNF AuthTag) -> Maybe (AuthId UniWorX) -> Route UniWorX -> Bool -> WriterT (Set AuthTag) m AuthResult
+evalAuthTags :: forall m. (MonadAP m, MonadLogger m) => AuthTagActive -> AuthDNF -> Maybe (AuthId UniWorX) -> Route UniWorX -> Bool -> WriterT (Set AuthTag) m AuthResult
 -- ^ `tell`s disabled predicates, identified as pivots
-evalAuthTags AuthTagActive{..} (map (Set.toList . toNullable) . Set.toList . toNullable -> authDNF) mAuthId route isWrite
+evalAuthTags AuthTagActive{..} (map (Set.toList . toNullable) . Set.toList . dnfTerms -> authDNF) mAuthId route isWrite
   = do
       mr <- getMsgRenderer
       let
@@ -760,23 +787,31 @@ evalAuthTags AuthTagActive{..} (map (Set.toList . toNullable) . Set.toList . toN
               $logDebugS "evalAccessPred" $ tshow (authTag', mAuthId', route', isWrite')
               evalAccessPred (tagAccessPredicate authTag') mAuthId' route' isWrite'
 
+        evalAuthLiteral :: AuthLiteral -> WriterT (Set AuthTag) m AuthResult
+        evalAuthLiteral PLVariable{..} = evalAuthTag plVar
+        evalAuthLiteral PLNegated{..} = evalAuthTag plVar >>= \case
+          Unauthorized _         -> return Authorized
+          AuthenticationRequired -> return AuthenticationRequired
+          Authorized             -> unauthorizedI plVar
+
         orAR', andAR' :: forall m'. Monad m' => m' AuthResult -> m' AuthResult -> m' AuthResult
         orAR' = shortCircuitM (is _Authorized) (orAR mr)
         andAR' = shortCircuitM (is _Unauthorized) (andAR mr)
 
-        evalDNF :: [[AuthTag]] -> WriterT (Set AuthTag) m AuthResult
-        evalDNF = foldr (\ats ar -> ar `orAR'` foldr (\aTag ar' -> ar' `andAR'` evalAuthTag aTag) (return $ trueAR mr) ats) (return $ falseAR mr)
+        evalDNF :: [[AuthLiteral]] -> WriterT (Set AuthTag) m AuthResult
+        evalDNF = foldr (\ats ar -> ar `orAR'` foldr (\aTag ar' -> ar' `andAR'` evalAuthLiteral aTag) (return $ trueAR mr) ats) (return $ falseAR mr)
 
-      $logDebugS "evalAuthTags" . tshow . (route, isWrite, )$ map (map $ id &&& authTagIsActive) authDNF
+      $logDebugS "evalAuthTags" . tshow . (route, isWrite, )$ map (map $ id &&& authTagIsActive . plVar) authDNF
 
-      result <- evalDNF $ filter (all authTagIsActive) authDNF
+      result <- evalDNF $ filter (all $ authTagIsActive . plVar) authDNF
 
-      unless (is _Authorized result) . forM_ (filter (any authTagIsInactive) authDNF) $ \conj ->
-        whenM (allM conj (\aTag -> (return . not $ authTagIsActive aTag) `or2M` (not . is _Unauthorized <$> evalAuthTag aTag))) $ do
-          let pivots = filter authTagIsInactive conj
-          whenM (allM pivots $ fmap (is _Authorized) . evalAuthTag) $ do
-            $logDebugS "evalAuthTags" [st|Recording pivots: #{tshow pivots}|]
-            tell $ Set.fromList pivots
+      unless (is _Authorized result) . forM_ (filter (any $ authTagIsInactive . plVar) authDNF) $ \conj ->
+        whenM (allM conj (\aTag -> (return . not . authTagIsActive $ plVar aTag) `or2M` (not . is _Unauthorized <$> evalAuthLiteral aTag))) $ do
+          let pivots = filter (authTagIsInactive . plVar) conj
+          whenM (allM pivots $ fmap (is _Authorized) . evalAuthLiteral) $ do
+            let pivots' = plVar <$> pivots
+            $logDebugS "evalAuthTags" [st|Recording pivots: #{tshow pivots'}|]
+            tell $ Set.fromList pivots'
 
       return result
 
diff --git a/src/Jose/Jwt/Instances.hs b/src/Jose/Jwt/Instances.hs
index f7607168c..4bf4e3827 100644
--- a/src/Jose/Jwt/Instances.hs
+++ b/src/Jose/Jwt/Instances.hs
@@ -13,6 +13,7 @@ instance PathPiece Jwt where
   toPathPiece (Jwt bytes) = decodeUtf8 bytes
   fromPathPiece = Just . Jwt . encodeUtf8
 
+deriving instance Generic JwtError
 deriving instance Typeable JwtError
 
 instance Exception JwtError
diff --git a/src/Model/Token.hs b/src/Model/Token.hs
index a57b5244b..d9c3afe94 100644
--- a/src/Model/Token.hs
+++ b/src/Model/Token.hs
@@ -3,28 +3,26 @@
 module Model.Token
   ( BearerToken(..)
   , bearerToken
-  , encodeToken, decodeToken
-  , tokenToJSON, tokenParseJSON
+  , encodeToken, BearerTokenException(..), decodeToken
+  , tokenToJSON, tokenParseJSON, tokenParseJSON'
   ) where
 
 import ClassyPrelude.Yesod
 import Model
 import Settings
+import Utils (NTop(..))
 import Utils.Lens hiding ((.=))
 
 import Yesod.Auth (AuthId)
 
--- import qualified Jose.Jwa as Jose
-import Jose.Jwk (JwkSet)
--- import qualified Jose.Jwk as Jose
-import Jose.Jwt (Jwt, JwtError, IntDate(..))
+import qualified Jose.Jwa as Jose
+import Jose.Jwk (JwkSet(..))
+import Jose.Jwt (Jwt(..), IntDate(..))
 import qualified Jose.Jwt as Jose
 
 import Jose.Jwt.Instances ()
 import Data.Aeson.Types.Instances ()
 
-import qualified Crypto.Random as Crypto (MonadRandom)
-
 import Data.HashSet (HashSet)
 
 import qualified Data.HashMap.Strict as HashMap
@@ -32,6 +30,9 @@ import qualified Data.HashMap.Strict as HashMap
 import Data.Aeson.Types (Parser, (.:?), (.:))
 import qualified Data.Aeson as JSON
 import qualified Data.Aeson.Types as JSON
+import qualified Data.Aeson.Parser as JSON
+import qualified Data.Aeson.Parser.Internal as JSON (jsonEOF')
+import qualified Data.Aeson.Internal as JSON (iparse, formatError)
 
 import CryptoID
 
@@ -42,10 +43,10 @@ import Control.Monad.Random (MonadRandom(..))
 
 
 data BearerToken site = BearerToken
-  { tokenIdentifier :: TokenId
-  , tokenAuthority  :: AuthId site
-  , tokenRoutes     :: Maybe (HashSet (Route site))
-  , tokenAddAuth    :: AuthCNF
+  { tokenIdentifier :: TokenId -- ^ Unique identifier for each token; maybe useful for tracing usage of tokens
+  , tokenAuthority  :: AuthId site -- ^ Tokens only grant rights the `tokenAuthority` has (i.e. `AuthTag`s are evaluated with the user set to `tokenAuthority`)
+  , tokenRoutes     :: Maybe (HashSet (Route site)) -- ^ Tokens can optionally be restricted to only be usable on a subset of routes
+  , tokenAddAuth    :: Maybe AuthDNF -- ^ Tokens can specify an additional predicate logic formula of `AuthTag`s that needs to evaluate to `Authorized` in order for the token to be valid.
   , tokenIssuedAt   :: UTCTime
   , tokenIssuedBy   :: InstanceId
   , tokenExpiresAt
@@ -73,10 +74,11 @@ tokenToJSON BearerToken{..} = do
         , jwtJti = Just $ toPathPiece tokenIdentifier
         }
   return . JSON.object $
-    [ "authority" .= cID
-    , "routes"    .= tokenRoutes
-    , "add-auth"  .= tokenAddAuth
-    ] ++ let JSON.Object hm = toJSON stdPayload in HashMap.toList hm
+    catMaybes [ Just $ "authority" .= cID
+              , ("routes" .=) <$> tokenRoutes
+              , ("add-auth" .=) <$> tokenAddAuth
+              ]
+    ++ let JSON.Object hm = toJSON stdPayload in HashMap.toList hm
 
 tokenParseJSON :: forall site.
                   ( HasCryptoUUID (AuthId site) (ReaderT CryptoIDKey Parser)
@@ -90,7 +92,7 @@ tokenParseJSON v@(Object o) = do
   tokenAuthority <- decrypt tokenAuthority'
 
   tokenRoutes    <- lift $ o .:? "routes"
-  tokenAddAuth   <- lift $ o .:  "add-auth"
+  tokenAddAuth   <- lift $ o .:? "add-auth"
   Jose.JwtClaims{..} <- lift $ parseJSON v
 
   let unIntDate (IntDate posix) = posixSecondsToUTCTime posix
@@ -104,6 +106,19 @@ tokenParseJSON v@(Object o) = do
   return BearerToken{..}
 tokenParseJSON v = lift $ JSON.typeMismatch "BearerToken" v
 
+tokenParseJSON' :: forall m.
+                  ( HasCryptoUUID (AuthId (HandlerSite m)) (ReaderT CryptoIDKey Parser)
+                  , ParseRoute (HandlerSite m)
+                  , Hashable (Route (HandlerSite m))
+                  , MonadHandler m
+                  , MonadCrypto m
+                  , MonadCryptoKey m ~ CryptoIDKey
+                  )
+               => m (Value -> Parser (BearerToken (HandlerSite m)))
+tokenParseJSON' = do
+  cidKey <- cryptoIDKey return
+  return $ flip runReaderT cidKey . tokenParseJSON
+
 
 bearerToken :: forall m.
                ( MonadHandler m
@@ -113,7 +128,7 @@ bearerToken :: forall m.
                )
             => AuthId (HandlerSite m)
             -> Maybe (HashSet (Route (HandlerSite m)))
-            -> AuthCNF
+            -> Maybe AuthDNF
             -> Maybe (Maybe UTCTime) -- ^ @Nothing@ determines default expiry time automatically
             -> Maybe UTCTime -- ^ @Nothing@ means token starts to be valid immediately
             -> m (BearerToken (HandlerSite m))
@@ -135,9 +150,12 @@ bearerToken tokenAuthority tokenRoutes tokenAddAuth mTokenExpiresAt tokenStartsA
   return BearerToken{..}
 
 
+jwtEncoding :: Jose.JwtEncoding
+jwtEncoding = Jose.JwsEncoding Jose.HS256
+
+
 encodeToken :: forall m.
-               ( Crypto.MonadRandom m
-               , MonadHandler m
+               ( MonadHandler m
                , HasJSONWebKeySet (HandlerSite m) JwkSet
                , HasInstanceID (HandlerSite m) InstanceId
                , HasCryptoUUID (AuthId (HandlerSite m)) m
@@ -145,14 +163,43 @@ encodeToken :: forall m.
                )
             => BearerToken (HandlerSite m) -> m Jwt
 encodeToken token = do
-  _payload <- tokenToJSON token
-  error "Not implemented"
+  payload <- Jose.Claims . toStrict . JSON.encode <$> tokenToJSON token
+  JwkSet jwks <- getsYesod $ view jsonWebKeySet
+  either throwM return =<< liftIO (Jose.encode jwks jwtEncoding payload)
+
+
+data BearerTokenException
+  = BearerTokenJwtError Jose.JwtError
+  | BearerTokenUnsecured
+  | BearerTokenInvalidFormat String
+  | BearerTokenExpired | BearerTokenNotStarted
+  deriving (Eq, Show, Generic, Typeable)
+
+instance Exception BearerTokenException
 
 decodeToken :: forall m.
-               ( Crypto.MonadRandom m
-               , MonadHandler m
+               ( MonadHandler m
                , HasJSONWebKeySet (HandlerSite m) JwkSet
-               , HasCryptoUUID (AuthId (HandlerSite m)) m
+               , HasCryptoUUID (AuthId (HandlerSite m)) (ReaderT CryptoIDKey Parser)
+               , MonadCryptoKey m ~ CryptoIDKey
+               , MonadCrypto m
+               , MonadThrow m
+               , ParseRoute (HandlerSite m)
+               , Hashable (Route (HandlerSite m))
                )
-            => Jwt -> m (Either JwtError (BearerToken (HandlerSite m)))
-decodeToken = error "Not implemented"
+            => Jwt -> m (BearerToken (HandlerSite m))
+decodeToken (Jwt bs) = do
+  JwkSet jwks <- getsYesod $ view jsonWebKeySet
+  content <- either (throwM . BearerTokenJwtError) return =<< liftIO (Jose.decode jwks Nothing bs)
+  content' <- case content of
+    Jose.Unsecured _ -> throwM BearerTokenUnsecured
+    Jose.Jws (_header, payload) -> return payload
+    Jose.Jwe (_header, payload) -> return payload
+  parser <- tokenParseJSON'
+  token@BearerToken{..} <- either (throwM . BearerTokenInvalidFormat . uncurry JSON.formatError) return $ JSON.eitherDecodeStrictWith JSON.jsonEOF' (JSON.iparse parser) content'
+  now <- liftIO getCurrentTime
+  unless (NTop tokenExpiresAt > NTop (Just now)) $
+    throwM BearerTokenExpired
+  unless (tokenStartsAt <= Just now) $
+    throwM BearerTokenNotStarted
+  return token
diff --git a/src/Model/Types.hs b/src/Model/Types.hs
index 5c292d146..0c3fb1198 100644
--- a/src/Model/Types.hs
+++ b/src/Model/Types.hs
@@ -714,6 +714,7 @@ pseudonymFragments = folding
 
 data AuthTag -- sortiert nach gewünschter Reihenfolge auf /authpreds, d.h. Prädikate sind sortier nach Relevanz für Benutzer
   = AuthAdmin
+  | AuthToken
   | AuthLecturer
   | AuthCorrector
   | AuthRegistered
@@ -786,28 +787,27 @@ deriveJSON defaultOptions
   , unwrapUnaryRecords = True
   } ''PredLiteral
 
+instance PathPiece a => PathPiece (PredLiteral a) where
+  toPathPiece PLVariable{..} = toPathPiece plVar
+  toPathPiece PLNegated{..} = "¬" <> toPathPiece plVar
 
-newtype PredCNF a = PredCNF (Set (NonNull (Set (PredLiteral a))))
-  deriving (Eq, Ord, Read, Show, Generic, Typeable)
-  deriving newtype (Semigroup, Monoid)
+  fromPathPiece t = PLVariable <$> fromPathPiece t
+                <|> PLNegated <$> (Text.stripPrefix "¬" t >>= fromPathPiece)
 
-newtype PredDNF a = PredDNF (Set (NonNull (Set (PredLiteral a))))
+
+newtype PredDNF a = PredDNF { dnfTerms :: Set (NonNull (Set (PredLiteral a))) }
   deriving (Eq, Ord, Read, Show, Generic, Typeable)
   deriving newtype (Semigroup, Monoid)
 
 $(return [])
 
-instance (Ord a, ToJSON a) => ToJSON (PredCNF a) where
-  toJSON = $(mkToJSON predNFAesonOptions ''PredCNF)
-instance (Ord a, FromJSON a) => FromJSON (PredCNF a) where
-  parseJSON = $(mkParseJSON predNFAesonOptions ''PredCNF)
- 
 instance (Ord a, ToJSON a) => ToJSON (PredDNF a) where
   toJSON = $(mkToJSON predNFAesonOptions ''PredDNF)
 instance (Ord a, FromJSON a) => FromJSON (PredDNF a) where
   parseJSON = $(mkParseJSON predNFAesonOptions ''PredDNF)
 
-type AuthCNF = PredCNF AuthTag
+type AuthLiteral = PredLiteral AuthTag
+
 type AuthDNF = PredDNF AuthTag
 
 
diff --git a/src/Utils.hs b/src/Utils.hs
index 88adf17e4..a95cb7bfc 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -490,6 +490,12 @@ maybeExceptT err act = lift act >>= maybe (throwE err) return
 maybeMExceptT :: Monad m => m e -> m (Maybe b) -> ExceptT e m b
 maybeMExceptT err act = lift act >>= maybe (lift err >>= throwE) return
 
+maybeTExceptT :: Monad m => e -> MaybeT m b -> ExceptT e m b
+maybeTExceptT err act = maybeExceptT err $ runMaybeT act
+  
+maybeTMExceptT :: Monad m => m e -> MaybeT m b -> ExceptT e m b
+maybeTMExceptT err act = maybeMExceptT err $ runMaybeT act
+
 whenExceptT :: Monad m => Bool -> e -> ExceptT e m ()
 whenExceptT b err = when b $ throwE err
 
diff --git a/src/Utils/Parameters.hs b/src/Utils/Parameters.hs
index 81b0c210a..f7922adcb 100644
--- a/src/Utils/Parameters.hs
+++ b/src/Utils/Parameters.hs
@@ -20,7 +20,7 @@ import Data.Universe
 import Control.Monad.Trans.Maybe (MaybeT(..))
 
 
-data GlobalGetParam = GetReferer
+data GlobalGetParam = GetReferer | GetToken
   deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic)
 
 instance Universe GlobalGetParam
@@ -51,6 +51,7 @@ globalGetParamField ident Field{fieldParse} = runMaybeT $ do
 data GlobalPostParam = PostFormIdentifier
                      | PostDeleteTarget
                      | PostMassInputShape
+                     | PostToken
   deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic)
 
 instance Universe GlobalPostParam
diff --git a/src/Yesod/Core/Instances.hs b/src/Yesod/Core/Instances.hs
index b8c6fed80..50b37679b 100644
--- a/src/Yesod/Core/Instances.hs
+++ b/src/Yesod/Core/Instances.hs
@@ -68,6 +68,9 @@ instance (RenderRoute site, ParseRoute site) => Binary (Route site) where
   put = Binary.put . toPathPiece
   get = Binary.get >>= maybe (fail "Could not parse route") return . fromPathPiece
 
+instance RenderRoute site => Hashable (Route site) where
+  hashWithSalt s = hashWithSalt s . routeToPathPiece
+
 
 instance Monad FormResult where
   (FormSuccess a)    >>= f = f a
diff --git a/test/Database.hs b/test/Database.hs
index 2c1992fa1..d0404df66 100755
--- a/test/Database.hs
+++ b/test/Database.hs
@@ -24,7 +24,7 @@ import qualified Data.ByteString as BS
 
 import Data.Time
 
-import Utils.Lens (review)
+import Utils.Lens (review, view)
 import Control.Monad.Random.Class (MonadRandom(..))
 
 
@@ -82,7 +82,7 @@ insertFile fileTitle = do
 
 fillDb :: DB ()
 fillDb = do
-  AppSettings{ appUserDefaults = UserDefaultConf{..}, .. } <- getsYesod appSettings
+  AppSettings{ appUserDefaults = UserDefaultConf{..}, .. } <- getsYesod $ view appSettings
   now <- liftIO getCurrentTime
   let
     insert' :: PersistRecordBackend r (YesodPersistBackend UniWorX) => r -> YesodDB UniWorX (Key r)

From af6821c7c82966199c39b8a5f844331d809f4a80 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 5 Apr 2019 15:23:10 +0200
Subject: [PATCH 008/238] UserNotificationR

---
 messages/uniworx/de.msg                       |  8 ++++-
 routes                                        |  2 ++
 src/Foundation.hs                             | 28 ++++++++++++++++-
 src/Handler/Profile.hs                        | 31 +++++++++++++++++--
 src/Import.hs                                 |  1 +
 .../SendNotification/CorrectionsAssigned.hs   |  4 ++-
 .../Handler/SendNotification/SheetActive.hs   |  4 ++-
 .../Handler/SendNotification/SheetInactive.hs |  7 +++--
 .../SendNotification/SubmissionRated.hs       |  4 ++-
 .../SendNotification/UserRightsUpdate.hs      |  3 +-
 src/Jobs/Handler/SendNotification/Utils.hs    | 20 ++++++++++++
 src/Model/Types.hs                            |  1 +
 templates/mail/editNotifications.hamlet       |  5 ++-
 13 files changed, 105 insertions(+), 13 deletions(-)
 create mode 100644 src/Jobs/Handler/SendNotification/Utils.hs

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 3172caf4e..2e3b06abe 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -206,6 +206,7 @@ UnauthorizedOr  l@Text r@Text: (#{l} ODER #{r})
 UnauthorizedNoToken: Ihrer Anfrage war kein Authorisierungs-Token beigefügt. 
 UnauthorizedTokenExpired: Ihr Authorisierungs-Token ist abgelaufen.
 UnauthorizedTokenNotStarted: Ihr Authorisierungs-Token ist noch nicht gültig.
+UnauthorizedTokenInvalid: Ihr Authorisierungs-Token konnte nicht verarbeitet werden.
 UnauthorizedTokenInvalidRoute: Ihr Authorisierungs-Token ist auf dieser Unterseite nicht gültig.
 UnauthorizedSiteAdmin: Sie sind kein System-weiter Administrator.
 UnauthorizedSchoolAdmin: Sie sind nicht als Administrator für dieses Institut eingetragen.
@@ -235,6 +236,7 @@ UnsupportedAuthPredicate authTagT@Text shownRoute@String: "#{authTagT}" wurde au
 UnauthorizedDisabledTag authTag@AuthTag: Authorisierungsprädikat "#{toPathPiece authTag}" ist für Ihre Sitzung nicht aktiv
 UnknownAuthPredicate tag@String: Authorisierungsprädikat "#{tag}" ist dem System nicht bekannt
 UnauthorizedRedirect: Die angeforderte Seite existiert nicht oder Sie haben keine Berechtigung, die angeforderte Seite zu sehen.
+UnauthorizedSelf: Aktueller Nutzer ist nicht angegebener Benutzer.
 
 EMail: E-Mail
 EMailUnknown email@UserEmail: E-Mail #{email} gehört zu keinem bekannten Benutzer.
@@ -276,6 +278,7 @@ ImpressumHeading: Impressum
 DataProtHeading: Datenschutzerklärung
 SystemMessageHeading: Uni2work Statusmeldung
 SystemMessageListHeading: Uni2work Statusmeldungen
+NotificationSettingsHeading displayName@Text: Benachrichtigungs-Einstellungen für #{displayName}
 
 HomeOpenCourses: Kurse mit offener Registrierung
 HomeUpcomingSheets: Anstehende Übungsblätter
@@ -292,7 +295,8 @@ Plugin: Plugin
 Ident: Identifikation
 LastLogin: Letzter Login
 Settings: Individuelle Benutzereinstellungen
-SettingsUpdate: Einstellungen wurden gespeichert.
+SettingsUpdate: Einstellungen erfolgreich gespeichert
+NotificationSettingsUpdate: Benachrichtigungs-Einstellungen erfolgreich gespeichert
 Never: Nie
 
 MultiFileUploadInfo: (Mehrere Dateien mit Shift oder Strg auswählen)
@@ -668,6 +672,7 @@ MenuCourseMembers: Kursteilnehmer
 MenuTermShow: Semester
 MenuSubmissionDelete: Abgabe löschen
 MenuUsers: Benutzer
+MenuUserNotifications: Benachrichtigungs-Einstellungen
 MenuAdminTest: Admin-Demo
 MenuMessageList: Systemnachrichten
 MenuAdminErrMsg: Fehlermeldung entschlüsseln
@@ -718,6 +723,7 @@ AuthTagOwner: Nutzer ist Besitzer
 AuthTagRated: Korrektur ist bewertet
 AuthTagUserSubmissions: Abgaben erfolgen durch Kursteilnehmer
 AuthTagCorrectorSubmissions: Abgaben erfolgen durch Korrektoren
+AuthTagSelf: Nutzer greift nur auf eigene Daten zu
 AuthTagAuthentication: Nutzer ist angemeldet, falls erforderlich
 AuthTagRead: Zugriff ist nur lesend
 AuthTagWrite: Zugriff ist i.A. schreibend
diff --git a/routes b/routes
index f76fd47b7..24ce58838 100644
--- a/routes
+++ b/routes
@@ -16,6 +16,7 @@
 --    !registered     -- participant for this course (no effect outside of courses)
 --    !participant    -- connected with a given course (not necessarily registered), i.e. has a submission, is a corrector, etc. (no effect outside of courses)
 --    !owner          -- part of the group of owners of this submission
+--    !self           -- route refers to the currently logged in user themselves
 --    !capacity       -- course this route is associated with has at least one unit of participant capacity
 --    !empty          -- course this route is associated with has no participants whatsoever
 --
@@ -39,6 +40,7 @@
 /users/#CryptoUUIDUser        AdminUserR        GET POST
 /users/#CryptoUUIDUser/delete AdminUserDeleteR      POST
 /users/#CryptoUUIDUser/hijack AdminHijackUserR  POST          !adminANDno-escalation
+/users/#CryptoUUIDUser/notifications UserNotificationR GET POST      !self
 /admin                        AdminR            GET
 /admin/features               AdminFeaturesR    GET POST
 /admin/test                   AdminTestR        GET POST
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 9634fda67..533804953 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -482,7 +482,9 @@ tagAccessPredicate AuthToken = APDB $ \mAuthId route isWrite -> exceptT return r
   BearerToken{..} <- catch (decodeToken jwt) $ \case
     BearerTokenExpired -> throwError =<< unauthorizedI MsgUnauthorizedTokenExpired
     BearerTokenNotStarted -> throwError =<< unauthorizedI MsgUnauthorizedTokenNotStarted
-    other -> throwM other
+    other -> do
+      $logWarnS "AuthToken" $ tshow other
+      throwError =<< unauthorizedI MsgUnauthorizedTokenInvalid
   unless (maybe True (HashSet.member route) tokenRoutes) $
     throwError =<< unauthorizedI MsgUnauthorizedTokenInvalidRoute
   authorityVal <- evalAccessFor (Just tokenAuthority) route isWrite
@@ -735,6 +737,20 @@ tagAccessPredicate AuthCorrectorSubmissions = APDB $ \_ route _ -> case route of
     guard $ sheetSubmissionMode == CorrectorSubmissions
     return Authorized
   r -> $unsupportedAuthPredicate AuthCorrectorSubmissions r
+tagAccessPredicate AuthSelf = APHandler $ \mAuthId route _ -> exceptT return return $ do
+  referencedUser <- case route of
+    AdminUserR cID -> return cID
+    AdminUserDeleteR cID -> return cID
+    AdminHijackUserR cID -> return cID
+    UserNotificationR cID -> return cID
+    CourseR _ _ _ (CUserR cID) -> return cID
+    _other -> throwError =<< $unsupportedAuthPredicate AuthSelf route
+  referencedUser' <- decrypt referencedUser
+  case mAuthId of
+    Just uid
+      | uid == referencedUser' -> return Authorized
+    Nothing -> return AuthenticationRequired
+    _other  -> unauthorizedI MsgUnauthorizedSelf
 tagAccessPredicate AuthAuthentication = APDB $ \mAuthId route _ -> case route of
   MessageR cID -> maybeT (unauthorizedI MsgUnauthorizedSystemMessageAuth) $ do
     smId <- decrypt cID
@@ -1465,6 +1481,16 @@ pageActions (AdminR) =
       , menuItemAccessCallback' = return True
       }
   ]
+pageActions (AdminUserR cID) = [
+    MenuItem
+      { menuItemType  = PageActionPrime
+      , menuItemLabel = MsgMenuUserNotifications
+      , menuItemIcon  = Nothing
+      , menuItemRoute = SomeRoute $ UserNotificationR cID
+      , menuItemModal = True
+      , menuItemAccessCallback' = return True
+      }
+  ]
 pageActions (InfoR) = [
     MenuItem
       { menuItemType  = PageActionPrime
diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs
index 5de418a34..326beb0d6 100644
--- a/src/Handler/Profile.hs
+++ b/src/Handler/Profile.hs
@@ -42,11 +42,10 @@ makeSettingForm template = identifyForm FIDsettings $ \html -> do
                                    & setTooltip MsgDownloadFilesTip
                                 ) (stgDownloadFiles <$> template)
         <*  aformSection MsgFormNotifications
-        <*> (NotificationSettings <$> funcForm nsForm (fslI MsgNotificationSettings) True)
+        <*> notificationForm (stgNotificationSettings <$> template)
     return (result, widget) -- no validation required here
   where
     themeList = [Option (display t) t (toPathPiece t) | t <- universeF]
-    nsForm nt = fromMaybe False <$> aopt checkBoxField (fslI nt) (Just $ flip notificationAllowed nt . stgNotificationSettings <$> template)
 --
 -- Version with proper grouping:
 --
@@ -76,6 +75,12 @@ makeSettingForm template = identifyForm FIDsettings $ \html -> do
 --       <*> (NotificationSettings <$> funcForm nsForm (fslI MsgNotificationSettings) True)
 --     nsForm nt = fromMaybe False <$> aopt checkBoxField (fslI nt) (Just $ flip notificationAllowed nt . stgNotificationSettings <$> template)
 
+notificationForm :: Maybe NotificationSettings -> AForm Handler NotificationSettings
+notificationForm template = NotificationSettings <$> funcForm nsForm (fslI MsgNotificationSettings) True
+  where
+    nsForm nt = fromMaybe False <$> aopt checkBoxField (fslI nt) (Just $ flip notificationAllowed nt <$> template)
+    
+
 getProfileR, postProfileR :: Handler Html
 getProfileR = postProfileR
 postProfileR = do
@@ -532,3 +537,25 @@ postAuthPredsR = do
   siteLayoutMsg MsgAuthPredsActive $ do
     setTitleI MsgAuthPredsActive
     $(widgetFile "authpreds")
+
+
+getUserNotificationR, postUserNotificationR :: CryptoUUIDUser -> Handler Html
+getUserNotificationR = postUserNotificationR
+postUserNotificationR cID = do
+  uid <- decrypt cID
+  User{userNotificationSettings, userDisplayName} <- runDB $ get404 uid
+  
+  ((nsRes, nsInnerWdgt), nsEnc) <- runFormPost . renderAForm FormStandard . notificationForm $ Just userNotificationSettings
+  isModal <- hasCustomHeader HeaderIsModal
+  let formWidget = wrapForm nsInnerWdgt def
+        { formAction = Just . SomeRoute $ UserNotificationR cID
+        , formEncoding = nsEnc
+        , formAttrs = [ ("data-ajax-submit", "") | isModal ]
+        }
+
+  formResultModal nsRes (UserNotificationR cID) $ \ns -> do
+    lift . runDB $ update uid [ UserNotificationSettings =. ns ]
+    tell . pure =<< messageI Success MsgNotificationSettingsUpdate
+
+  siteLayoutMsg (MsgNotificationSettingsHeading userDisplayName) $
+    formWidget
diff --git a/src/Import.hs b/src/Import.hs
index 27dc6e5df..9743e86ac 100644
--- a/src/Import.hs
+++ b/src/Import.hs
@@ -6,3 +6,4 @@ import Foundation            as Import
 import Import.NoFoundation   as Import
 
 import Utils.SystemMessage   as Import
+import Model.Token           as Import
diff --git a/src/Jobs/Handler/SendNotification/CorrectionsAssigned.hs b/src/Jobs/Handler/SendNotification/CorrectionsAssigned.hs
index 51ec02f77..f7943cb6c 100644
--- a/src/Jobs/Handler/SendNotification/CorrectionsAssigned.hs
+++ b/src/Jobs/Handler/SendNotification/CorrectionsAssigned.hs
@@ -6,6 +6,7 @@ module Jobs.Handler.SendNotification.CorrectionsAssigned
 
 import Import
 
+import Jobs.Handler.SendNotification.Utils
 import Handler.Utils.Mail
 
 import Text.Hamlet
@@ -27,6 +28,7 @@ dispatchNotificationCorrectionsAssigned  nUser nSheet jRecipient = do
     MsgRenderer mr <- getMailMsgRenderer
     let termDesc = mr . ShortTermIdentifier $ unTermKey courseTerm
 
+    editNotifications <- mkEditNotifications jRecipient
+
     addAlternatives $ do
-      let editNotifications = $(ihamletFile "templates/mail/editNotifications.hamlet")
       providePreferredAlternative ($(ihamletFile "templates/mail/correctionsAssigned.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX))
diff --git a/src/Jobs/Handler/SendNotification/SheetActive.hs b/src/Jobs/Handler/SendNotification/SheetActive.hs
index 91a8fc716..6e3618de2 100644
--- a/src/Jobs/Handler/SendNotification/SheetActive.hs
+++ b/src/Jobs/Handler/SendNotification/SheetActive.hs
@@ -7,6 +7,7 @@ module Jobs.Handler.SendNotification.SheetActive
 import Import
 
 import Handler.Utils.Mail
+import Jobs.Handler.SendNotification.Utils
 
 import Text.Hamlet
 import qualified Data.CaseInsensitive as CI
@@ -26,6 +27,7 @@ dispatchNotificationSheetActive nSheet jRecipient = userMailT jRecipient $ do
       csh = courseShorthand
       shn = sheetName
 
+  editNotifications <- mkEditNotifications jRecipient
+
   addAlternatives $ do
-    let editNotifications = $(ihamletFile "templates/mail/editNotifications.hamlet")
     providePreferredAlternative ($(ihamletFile "templates/mail/sheetActive.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX))
diff --git a/src/Jobs/Handler/SendNotification/SheetInactive.hs b/src/Jobs/Handler/SendNotification/SheetInactive.hs
index 7112e5c39..bab937c89 100644
--- a/src/Jobs/Handler/SendNotification/SheetInactive.hs
+++ b/src/Jobs/Handler/SendNotification/SheetInactive.hs
@@ -8,6 +8,7 @@ module Jobs.Handler.SendNotification.SheetInactive
 import Import
 
 import Handler.Utils.Mail
+import Jobs.Handler.SendNotification.Utils
 
 import Text.Hamlet
 import qualified Data.CaseInsensitive as CI
@@ -29,8 +30,9 @@ dispatchNotificationSheetSoonInactive nSheet jRecipient = userMailT jRecipient $
       csh = courseShorthand
       shn = sheetName
 
+  editNotifications <- mkEditNotifications jRecipient
+
   addAlternatives $ do
-    let editNotifications = $(ihamletFile "templates/mail/editNotifications.hamlet")
     providePreferredAlternative ($(ihamletFile "templates/mail/sheetSoonInactive.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX))
 
 dispatchNotificationSheetInactive :: SheetId -> UserId -> Handler ()
@@ -54,7 +56,8 @@ dispatchNotificationSheetInactive nSheet jRecipient = userMailT jRecipient $ do
       csh = courseShorthand
       shn = sheetName
 
+  editNotifications <- mkEditNotifications jRecipient
+
   addAlternatives $ do
-    let editNotifications = $(ihamletFile "templates/mail/editNotifications.hamlet")
     providePreferredAlternative ($(ihamletFile "templates/mail/sheetInactive.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX))
 
diff --git a/src/Jobs/Handler/SendNotification/SubmissionRated.hs b/src/Jobs/Handler/SendNotification/SubmissionRated.hs
index 78083d83f..16423a924 100644
--- a/src/Jobs/Handler/SendNotification/SubmissionRated.hs
+++ b/src/Jobs/Handler/SendNotification/SubmissionRated.hs
@@ -9,6 +9,7 @@ import Import
 import Utils.Lens
 import Handler.Utils.DateTime
 import Handler.Utils.Mail
+import Jobs.Handler.SendNotification.Utils
 
 import Text.Hamlet
 import qualified Data.Aeson as Aeson
@@ -34,6 +35,8 @@ dispatchNotificationSubmissionRated nSubmission jRecipient = userMailT jRecipien
       csh = courseShorthand
       shn = sheetName
 
+  editNotifications <- mkEditNotifications jRecipient
+
   -- TODO: provide convienience template-haskell for `addAlternatives`
   addAlternatives $ do
     provideAlternative $ Aeson.object
@@ -51,5 +54,4 @@ dispatchNotificationSubmissionRated nSubmission jRecipient = userMailT jRecipien
       , "course-school" Aeson..= courseSchool
       ]
     -- provideAlternative $ \(MsgRenderer mr) -> ($(textFile "templates/mail/submissionRated.txt") :: TextUrl (Route UniWorX)) -- textFile does not support control statements
-    let editNotifications = $(ihamletFile "templates/mail/editNotifications.hamlet")
     providePreferredAlternative ($(ihamletFile "templates/mail/submissionRated.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX))
diff --git a/src/Jobs/Handler/SendNotification/UserRightsUpdate.hs b/src/Jobs/Handler/SendNotification/UserRightsUpdate.hs
index aaf50ac72..90e645de7 100644
--- a/src/Jobs/Handler/SendNotification/UserRightsUpdate.hs
+++ b/src/Jobs/Handler/SendNotification/UserRightsUpdate.hs
@@ -8,6 +8,7 @@ import Import
 
 import Handler.Utils.Database
 import Handler.Utils.Mail
+import Jobs.Handler.SendNotification.Utils
 
 import Text.Hamlet
 -- import qualified Data.CaseInsensitive as CI
@@ -21,7 +22,7 @@ dispatchNotificationUserRightsUpdate  nUser _originalRights jRecipient = userMai
       return (user,adminSchools,lecturerSchools)
     setSubjectI $ MsgMailSubjectUserRightsUpdate userDisplayName
     -- MsgRenderer mr <- getMailMsgRenderer
+    editNotifications <- mkEditNotifications jRecipient
     addAlternatives $ do
-      let editNotifications = $(ihamletFile "templates/mail/editNotifications.hamlet")
       providePreferredAlternative ($(ihamletFile "templates/mail/userRightsUpdate.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX))
 
diff --git a/src/Jobs/Handler/SendNotification/Utils.hs b/src/Jobs/Handler/SendNotification/Utils.hs
new file mode 100644
index 000000000..d7ca82a76
--- /dev/null
+++ b/src/Jobs/Handler/SendNotification/Utils.hs
@@ -0,0 +1,20 @@
+module Jobs.Handler.SendNotification.Utils
+  ( mkEditNotifications
+  ) where
+
+import Import
+
+import Text.Hamlet
+
+import qualified Data.HashSet as HashSet
+
+
+mkEditNotifications :: (MonadHandler m, HandlerSite m ~ UniWorX) => UserId -> m (HtmlUrlI18n UniWorXMessage (Route UniWorX))
+mkEditNotifications uid = liftHandlerT $ do
+  cID <- encrypt uid
+  jwt <- encodeToken =<< bearerToken uid (Just . HashSet.singleton $ UserNotificationR cID) Nothing Nothing Nothing
+  let
+    editNotificationsUrl :: SomeRoute UniWorX
+    editNotificationsUrl = SomeRoute (UserNotificationR cID, [(toPathPiece GetToken, toPathPiece jwt)])
+  editNotificationsUrl' <- toTextUrl editNotificationsUrl
+  return ($(ihamletFile "templates/mail/editNotifications.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX))
diff --git a/src/Model/Types.hs b/src/Model/Types.hs
index 0c3fb1198..21672d9d2 100644
--- a/src/Model/Types.hs
+++ b/src/Model/Types.hs
@@ -727,6 +727,7 @@ data AuthTag -- sortiert nach gewünschter Reihenfolge auf /authpreds, d.h. Prä
   | AuthCorrectorSubmissions
   | AuthCapacity
   | AuthEmpty
+  | AuthSelf
   | AuthAuthentication
   | AuthNoEscalation
   | AuthRead
diff --git a/templates/mail/editNotifications.hamlet b/templates/mail/editNotifications.hamlet
index 7ca5d9f8b..6e701e511 100644
--- a/templates/mail/editNotifications.hamlet
+++ b/templates/mail/editNotifications.hamlet
@@ -1,4 +1,3 @@
 <p>      
-  <a href=@{ProfileR}>
-    _{MsgProfileHeading}
-  \ _{MsgMailEditNotifications}
\ No newline at end of file
+  <a href=#{editNotificationsUrl'}>
+    _{MsgMailEditNotifications}

From 6e29d8ed89513200ef4b6ea9de9c8d80bbb7de6d Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 5 Apr 2019 16:37:39 +0200
Subject: [PATCH 009/238] Token revocation & Bugfixes

---
 messages/uniworx/de.msg                      |   3 +
 models/users                                 |   1 +
 src/Foundation.hs                            |  23 ++--
 src/Handler/Profile.hs                       | 115 +++++++++++++------
 src/Model/Token.hs                           |  17 ++-
 templates/profile.hamlet                     |   2 -
 templates/profile/profile.hamlet             |  13 +++
 templates/profile/tokenExplanation/de.hamlet |  13 +++
 8 files changed, 141 insertions(+), 46 deletions(-)
 delete mode 100644 templates/profile.hamlet
 create mode 100644 templates/profile/profile.hamlet
 create mode 100644 templates/profile/tokenExplanation/de.hamlet

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 2e3b06abe..1c07086f8 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -10,6 +10,7 @@ BtnSave: Speichern
 BtnCandidatesInfer: Studienfachzuordnung automatisch lernen
 BtnCandidatesDeleteConflicts: Konflikte löschen
 BtnCandidatesDeleteAll: Alle Beobachtungen löschen
+BtnResetTokens: Authorisierungs-Tokens invalidieren
 
 Aborted: Abgebrochen
 Remarks: Hinweise
@@ -279,6 +280,8 @@ DataProtHeading: Datenschutzerklärung
 SystemMessageHeading: Uni2work Statusmeldung
 SystemMessageListHeading: Uni2work Statusmeldungen
 NotificationSettingsHeading displayName@Text: Benachrichtigungs-Einstellungen für #{displayName}
+TokensLastReset: Tokens zuletzt invalidiert
+TokensResetSuccess: Authorisierungs-Tokens invalidiert
 
 HomeOpenCourses: Kurse mit offener Registrierung
 HomeUpcomingSheets: Anstehende Übungsblätter
diff --git a/models/users b/models/users
index 80e5ff43c..cd08164d1 100644
--- a/models/users
+++ b/models/users
@@ -11,6 +11,7 @@ User json    -- Each Uni2work user has a corresponding row in this table; create
     ident          (CI Text)                -- Case-insensitive user-identifier
     authentication AuthenticationMode       -- 'AuthLDAP' or ('AuthPWHash'+password-hash)
     lastAuthentication UTCTime Maybe        -- last login date
+    tokensIssuedAfter  UTCTime Maybe        -- do not accept bearer tokens issued before this time (accept all tokens if null) 
     matrikelnummer Text Maybe               -- optional immatriculation-string; usually a number, but not always (e.g. lecturers, pupils, guests,...)
     email          (CI Text)                -- Case-insensitive eMail address
     displayName    Text                     -- we only show LDAP-DisplayName, and highlight LDAP-Surname within (appended if not contained)
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 533804953..4e2ea8695 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -474,26 +474,26 @@ tagAccessPredicate AuthAdmin = APDB $ \mAuthId route _ -> case route of
     guardMExceptT (isJust adrights) (unauthorizedI MsgUnauthorizedSiteAdmin)
     return Authorized
 tagAccessPredicate AuthToken = APDB $ \mAuthId route isWrite -> exceptT return return $ do
-  jwt <- maybeTMExceptT (unauthorizedI MsgUnauthorizedNoToken) $ asum
-    [ MaybeT lookupBearerAuth >>= hoistMaybe . fromPathPiece
-    , MaybeT $ lookupGlobalPostParam PostToken
-    , MaybeT $ lookupGlobalGetParam GetToken
-    ]
+  jwt <- maybeMExceptT (unauthorizedI MsgUnauthorizedNoToken) askJwt
   BearerToken{..} <- catch (decodeToken jwt) $ \case
     BearerTokenExpired -> throwError =<< unauthorizedI MsgUnauthorizedTokenExpired
     BearerTokenNotStarted -> throwError =<< unauthorizedI MsgUnauthorizedTokenNotStarted
     other -> do
       $logWarnS "AuthToken" $ tshow other
       throwError =<< unauthorizedI MsgUnauthorizedTokenInvalid
-  unless (maybe True (HashSet.member route) tokenRoutes) $
-    throwError =<< unauthorizedI MsgUnauthorizedTokenInvalidRoute
+
+  guardMExceptT (maybe True (HashSet.member route) tokenRoutes) (unauthorizedI MsgUnauthorizedTokenInvalidRoute)
+
+  User{userTokensIssuedAfter} <- lift $ get404 tokenAuthority
+  guardMExceptT (Just tokenIssuedAt >= userTokensIssuedAfter) (unauthorizedI MsgUnauthorizedTokenExpired)
+
   authorityVal <- evalAccessFor (Just tokenAuthority) route isWrite
-  unless (is _Authorized authorityVal) $
-    throwError authorityVal
+  guardExceptT (is _Authorized authorityVal) authorityVal
+
   whenIsJust tokenAddAuth $ \addDNF -> do
     additionalVal <- fmap fst . runWriterT $ evalAuthTags (AuthTagActive $ const True) addDNF mAuthId route isWrite
-    unless (is _Authorized additionalVal) $
-      throwError additionalVal
+    guardExceptT (is _Authorized additionalVal) additionalVal
+
   return Authorized
 tagAccessPredicate AuthNoEscalation = APDB $ \mAuthId route _ -> case route of
   AdminHijackUserR cID -> exceptT return return $ do
@@ -2206,6 +2206,7 @@ instance YesodAuth UniWorX where
               , userDownloadFiles        = userDefaultDownloadFiles
               , userNotificationSettings = def
               , userMailLanguages        = def
+              , userTokensIssuedAfter    = Nothing
               , ..
               }
             userUpdate =  [ UserMatrikelnummer     =. userMatrikelnummer
diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs
index 326beb0d6..f01f34281 100644
--- a/src/Handler/Profile.hs
+++ b/src/Handler/Profile.hs
@@ -79,7 +79,26 @@ notificationForm :: Maybe NotificationSettings -> AForm Handler NotificationSett
 notificationForm template = NotificationSettings <$> funcForm nsForm (fslI MsgNotificationSettings) True
   where
     nsForm nt = fromMaybe False <$> aopt checkBoxField (fslI nt) (Just $ flip notificationAllowed nt <$> template)
-    
+
+
+data ButtonResetTokens = BtnResetTokens
+  deriving (Enum, Eq, Ord, Bounded, Read, Show, Generic, Typeable)
+instance Universe ButtonResetTokens
+instance Finite ButtonResetTokens
+
+nullaryPathPiece ''ButtonResetTokens $ camelToPathPiece' 1
+
+embedRenderMessage ''UniWorX ''ButtonResetTokens id
+instance Button UniWorX ButtonResetTokens where
+  btnClasses BtnResetTokens = [BCIsButton, BCDanger]
+
+data ProfileAnchor = ProfileSettings | ProfileResetTokens
+  deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
+instance Universe ProfileAnchor
+instance Finite ProfileAnchor
+
+nullaryPathPiece ''ProfileAnchor $ camelToPathPiece' 1
+
 
 getProfileR, postProfileR :: Handler Html
 getProfileR = postProfileR
@@ -94,37 +113,60 @@ postProfileR = do
         , stgDownloadFiles = userDownloadFiles
         , stgNotificationSettings = userNotificationSettings
         }
-  ((res,formWidget), formEnctype) <- runFormPost $ makeSettingForm settingsTemplate
-  case res of
-    (FormSuccess SettingsForm{..}) -> do
-        runDB $ do
-          update uid  [ UserMaxFavourites  =. stgMaxFavourties
-                      , UserTheme          =. stgTheme
-                      , UserDateTimeFormat =. stgDateTime
-                      , UserDateFormat     =. stgDate
-                      , UserTimeFormat     =. stgTime
-                      , UserDownloadFiles  =. stgDownloadFiles
-                      , UserNotificationSettings =. stgNotificationSettings
-                      ]
-          when (stgMaxFavourties < userMaxFavourites) $ do
-            -- prune Favourites to user-defined size
-            oldFavs <- selectKeysList [ CourseFavouriteUser ==. uid]
-                                      [ Desc CourseFavouriteTime
-                                      , OffsetBy stgMaxFavourties
-                                      ]
-            mapM_ delete oldFavs
-        addMessageI Info MsgSettingsUpdate
-        redirect ProfileR -- TODO: them change does not happen without redirect
+  ((res,formWidget), formEnctype) <- runFormPost . identifyForm ProfileSettings $ makeSettingForm settingsTemplate
 
-    (FormFailure msgs) -> forM_ msgs $ addMessage Warning . toHtml
-    _ -> return ()
+  formResult res $ \SettingsForm{..} -> do
+    runDB $ do
+      update uid  [ UserMaxFavourites  =. stgMaxFavourties
+                  , UserTheme          =. stgTheme
+                  , UserDateTimeFormat =. stgDateTime
+                  , UserDateFormat     =. stgDate
+                  , UserTimeFormat     =. stgTime
+                  , UserDownloadFiles  =. stgDownloadFiles
+                  , UserNotificationSettings =. stgNotificationSettings
+                  ]
+      when (stgMaxFavourties < userMaxFavourites) $ do
+        -- prune Favourites to user-defined size
+        oldFavs <- selectKeysList [ CourseFavouriteUser ==. uid]
+                                  [ Desc CourseFavouriteTime
+                                  , OffsetBy stgMaxFavourties
+                                  ]
+        mapM_ delete oldFavs
+    addMessageI Info MsgSettingsUpdate
+    redirect $ ProfileR :#: ProfileSettings
+
+  ((tokenRes, tokenFormWidget), tokenEnctype) <- runFormPost . identifyForm ProfileResetTokens $ buttonForm
+
+  formResult tokenRes $ \BtnResetTokens -> do
+    now <- liftIO getCurrentTime
+    runDB $ update uid [ UserTokensIssuedAfter =. Just now ]
+    addMessageI Info MsgTokensResetSuccess
+    redirect $ ProfileR :#: ProfileResetTokens
+
+  tResetTime <- traverse (formatTime SelFormatDateTime) userTokensIssuedAfter
 
   siteLayout [whamlet|_{MsgProfileFor} ^{nameWidget userDisplayName userSurname}|] $ do
     setTitle . toHtml $ "Profil " <> userIdent
-    wrapForm formWidget def
-      { formAction = Just $ SomeRoute ProfileR
-      , formEncoding = formEnctype
-      }
+    let settingsForm = 
+          wrapForm formWidget FormSettings
+            { formMethod = POST
+            , formAction = Just . SomeRoute $ ProfileR :#: ProfileSettings
+            , formEncoding = formEnctype
+            , formAttrs = []
+            , formSubmit = FormSubmit
+            , formAnchor = Just ProfileSettings
+            }
+        tokenForm =
+          wrapForm tokenFormWidget FormSettings
+            { formMethod = POST
+            , formAction = Just . SomeRoute $ ProfileR :#: ProfileResetTokens
+            , formEncoding = tokenEnctype
+            , formAttrs = []
+            , formSubmit = FormNoSubmit
+            , formAnchor = Just ProfileResetTokens
+            }
+        tokenExplanation = $(i18nWidgetFile "profile/tokenExplanation")
+    $(widgetFile "profile/profile")
 
 
 getProfileDataR :: Handler Html
@@ -544,18 +586,27 @@ getUserNotificationR = postUserNotificationR
 postUserNotificationR cID = do
   uid <- decrypt cID
   User{userNotificationSettings, userDisplayName} <- runDB $ get404 uid
-  
+
   ((nsRes, nsInnerWdgt), nsEnc) <- runFormPost . renderAForm FormStandard . notificationForm $ Just userNotificationSettings
+  mJwt <- askJwt
   isModal <- hasCustomHeader HeaderIsModal
-  let formWidget = wrapForm nsInnerWdgt def
+  let formWidget = wrapForm nsInnerWdgt' def
         { formAction = Just . SomeRoute $ UserNotificationR cID
         , formEncoding = nsEnc
         , formAttrs = [ ("data-ajax-submit", "") | isModal ]
         }
+      nsInnerWdgt'
+        = [whamlet|
+            $newline never
+            $maybe jwt <- mJwt
+              <input type=hidden name=#{toPathPiece PostToken} value=#{toPathPiece jwt}>
+            ^{nsInnerWdgt}
+          |]
 
-  formResultModal nsRes (UserNotificationR cID) $ \ns -> do
+  formResultModal nsRes (UserNotificationR cID, [ (toPathPiece GetToken, toPathPiece jwt) | Just jwt <- pure mJwt ]) $ \ns -> do
     lift . runDB $ update uid [ UserNotificationSettings =. ns ]
     tell . pure =<< messageI Success MsgNotificationSettingsUpdate
 
-  siteLayoutMsg (MsgNotificationSettingsHeading userDisplayName) $
+  siteLayoutMsg (MsgNotificationSettingsHeading userDisplayName) $ do
+    setTitleI $ MsgNotificationSettingsHeading userDisplayName
     formWidget
diff --git a/src/Model/Token.hs b/src/Model/Token.hs
index d9c3afe94..a4d108714 100644
--- a/src/Model/Token.hs
+++ b/src/Model/Token.hs
@@ -5,13 +5,15 @@ module Model.Token
   , bearerToken
   , encodeToken, BearerTokenException(..), decodeToken
   , tokenToJSON, tokenParseJSON, tokenParseJSON'
+  , askJwt
   ) where
 
 import ClassyPrelude.Yesod
 import Model
 import Settings
-import Utils (NTop(..))
+import Utils (NTop(..), hoistMaybe)
 import Utils.Lens hiding ((.=))
+import Utils.Parameters
 
 import Yesod.Auth (AuthId)
 
@@ -40,6 +42,7 @@ import Data.Time.Clock
 import Data.Time.Clock.POSIX
 
 import Control.Monad.Random (MonadRandom(..))
+import Control.Monad.Trans.Maybe (MaybeT(..))
 
 
 data BearerToken site = BearerToken
@@ -203,3 +206,15 @@ decodeToken (Jwt bs) = do
   unless (tokenStartsAt <= Just now) $
     throwM BearerTokenNotStarted
   return token
+
+
+askJwt :: forall m.
+          ( MonadHandler m
+          )
+       => m (Maybe Jwt)
+-- | Retrieve current `Jwt` from HTTP-Header, POST-Parameter, or GET-Parameter
+askJwt = runMaybeT $ asum
+  [ MaybeT lookupBearerAuth >>= hoistMaybe . fromPathPiece
+  , MaybeT $ lookupGlobalPostParam PostToken
+  , MaybeT $ lookupGlobalGetParam GetToken
+  ]
diff --git a/templates/profile.hamlet b/templates/profile.hamlet
deleted file mode 100644
index fc6a9bef7..000000000
--- a/templates/profile.hamlet
+++ /dev/null
@@ -1,2 +0,0 @@
-<div .profile>
-  ^{settingsForm}
diff --git a/templates/profile/profile.hamlet b/templates/profile/profile.hamlet
new file mode 100644
index 000000000..e2b1e4365
--- /dev/null
+++ b/templates/profile/profile.hamlet
@@ -0,0 +1,13 @@
+$newline never
+<section>
+  ^{settingsForm}
+<section>
+  ^{tokenExplanation}
+  <p>
+    _{MsgTokensLastReset}:
+    $maybe tResetTime' <- tResetTime
+      \ #{tResetTime'}
+    $nothing
+      \ _{MsgNever}
+    <br />
+    ^{tokenForm}
diff --git a/templates/profile/tokenExplanation/de.hamlet b/templates/profile/tokenExplanation/de.hamlet
new file mode 100644
index 000000000..2237bddee
--- /dev/null
+++ b/templates/profile/tokenExplanation/de.hamlet
@@ -0,0 +1,13 @@
+<p>
+  Das System stellt gelegentlich Benutzer-bezogene <i>Authorisierungs-Tokens</i> aus.
+  Diese Tokens erlauben es jedem, der in Besitz dieses Tokens ist, bestimmte Ihrer Benutzer-Rechte anzunehmen.
+
+<p>
+  Dies ist insbesondere notwendig um verschickten Emails einen Link beifügen zu können, der das Deabonnieren von Benachrichtigungen erlaubt.
+
+<p>
+  Mit dem untigen Knopf können Sie alle Authorisierungs-Tokens, die bisher für Sie ausgestellt wurden, als ungültig markieren.
+  Dies ist zum Beispiel dann notwendig, wenn Sie Grund haben zu vermuten, dass Dritte Zugriff auf eines Ihrer Tokens gehabt haben könnten.
+
+<p>
+  Für die sichere Verwahrung Ihnen ausgehändigter Tokens sind immer Sie selbst verantwortlich.

From e94792195595c07a08124e778cba6785c80f92e5 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 5 Apr 2019 17:15:26 +0200
Subject: [PATCH 010/238] Fix Test

---
 .../Handler/SendNotification/CorrectionsAssigned.hs   |  2 +-
 src/Jobs/Handler/SendNotification/SheetActive.hs      |  2 +-
 src/Jobs/Handler/SendNotification/SheetInactive.hs    |  4 ++--
 src/Jobs/Handler/SendNotification/UserRightsUpdate.hs |  2 +-
 src/Model/Token.hs                                    |  4 ++--
 test.sh                                               | 11 +++++++++++
 test/Database.hs                                      |  5 +++++
 test/ModelSpec.hs                                     |  1 +
 test/TestImport.hs                                    |  3 ++-
 9 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/Jobs/Handler/SendNotification/CorrectionsAssigned.hs b/src/Jobs/Handler/SendNotification/CorrectionsAssigned.hs
index f7943cb6c..2644a36ef 100644
--- a/src/Jobs/Handler/SendNotification/CorrectionsAssigned.hs
+++ b/src/Jobs/Handler/SendNotification/CorrectionsAssigned.hs
@@ -30,5 +30,5 @@ dispatchNotificationCorrectionsAssigned  nUser nSheet jRecipient = do
 
     editNotifications <- mkEditNotifications jRecipient
 
-    addAlternatives $ do
+    addAlternatives $
       providePreferredAlternative ($(ihamletFile "templates/mail/correctionsAssigned.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX))
diff --git a/src/Jobs/Handler/SendNotification/SheetActive.hs b/src/Jobs/Handler/SendNotification/SheetActive.hs
index 6e3618de2..1530d3e44 100644
--- a/src/Jobs/Handler/SendNotification/SheetActive.hs
+++ b/src/Jobs/Handler/SendNotification/SheetActive.hs
@@ -29,5 +29,5 @@ dispatchNotificationSheetActive nSheet jRecipient = userMailT jRecipient $ do
 
   editNotifications <- mkEditNotifications jRecipient
 
-  addAlternatives $ do
+  addAlternatives $
     providePreferredAlternative ($(ihamletFile "templates/mail/sheetActive.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX))
diff --git a/src/Jobs/Handler/SendNotification/SheetInactive.hs b/src/Jobs/Handler/SendNotification/SheetInactive.hs
index bab937c89..21cd7aced 100644
--- a/src/Jobs/Handler/SendNotification/SheetInactive.hs
+++ b/src/Jobs/Handler/SendNotification/SheetInactive.hs
@@ -32,7 +32,7 @@ dispatchNotificationSheetSoonInactive nSheet jRecipient = userMailT jRecipient $
 
   editNotifications <- mkEditNotifications jRecipient
 
-  addAlternatives $ do
+  addAlternatives $
     providePreferredAlternative ($(ihamletFile "templates/mail/sheetSoonInactive.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX))
 
 dispatchNotificationSheetInactive :: SheetId -> UserId -> Handler ()
@@ -58,6 +58,6 @@ dispatchNotificationSheetInactive nSheet jRecipient = userMailT jRecipient $ do
 
   editNotifications <- mkEditNotifications jRecipient
 
-  addAlternatives $ do
+  addAlternatives $
     providePreferredAlternative ($(ihamletFile "templates/mail/sheetInactive.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX))
 
diff --git a/src/Jobs/Handler/SendNotification/UserRightsUpdate.hs b/src/Jobs/Handler/SendNotification/UserRightsUpdate.hs
index 90e645de7..a70d167e9 100644
--- a/src/Jobs/Handler/SendNotification/UserRightsUpdate.hs
+++ b/src/Jobs/Handler/SendNotification/UserRightsUpdate.hs
@@ -23,6 +23,6 @@ dispatchNotificationUserRightsUpdate  nUser _originalRights jRecipient = userMai
     setSubjectI $ MsgMailSubjectUserRightsUpdate userDisplayName
     -- MsgRenderer mr <- getMailMsgRenderer
     editNotifications <- mkEditNotifications jRecipient
-    addAlternatives $ do
+    addAlternatives $
       providePreferredAlternative ($(ihamletFile "templates/mail/userRightsUpdate.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX))
 
diff --git a/src/Model/Token.hs b/src/Model/Token.hs
index a4d108714..cfaaacb55 100644
--- a/src/Model/Token.hs
+++ b/src/Model/Token.hs
@@ -136,8 +136,8 @@ bearerToken :: forall m.
             -> Maybe UTCTime -- ^ @Nothing@ means token starts to be valid immediately
             -> m (BearerToken (HandlerSite m))
 bearerToken tokenAuthority tokenRoutes tokenAddAuth mTokenExpiresAt tokenStartsAt = do
-  tokenIdentifier <- liftIO $ getRandom
-  tokenIssuedAt <- liftIO $ getCurrentTime
+  tokenIdentifier <- liftIO getRandom
+  tokenIssuedAt <- liftIO getCurrentTime
   tokenIssuedBy <- getsYesod $ view instanceID
 
   defaultExpiration <- getsYesod $ view _appJWTExpiration
diff --git a/test.sh b/test.sh
index 09d4b3a53..f4a4da1cf 100755
--- a/test.sh
+++ b/test.sh
@@ -1,3 +1,14 @@
 #!/usr/bin/env bash
 
+move-back() {
+    mv -v .stack-work .stack-work-test
+    [[ -d .stack-work-build ]] && mv -v .stack-work-build .stack-work
+}
+
+if [[ -d .stack-work-test ]]; then
+    [[ -d .stack-work ]] && mv -v .stack-work .stack-work-build
+    mv -v .stack-work-test .stack-work
+    trap move-back EXIT
+fi
+
 exec -- stack build --test --fast --flag uniworx:dev --flag uniworx:library-only ${@}
diff --git a/test/Database.hs b/test/Database.hs
index d0404df66..3943263db 100755
--- a/test/Database.hs
+++ b/test/Database.hs
@@ -94,6 +94,7 @@ fillDb = do
     { userIdent  = "G.Kleen@campus.lmu.de"
     , userAuthentication = AuthLDAP
     , userLastAuthentication = Just now
+    , userTokensIssuedAfter = Just now
     , userMatrikelnummer = Nothing
     , userEmail  = "G.Kleen@campus.lmu.de"
     , userDisplayName = "Gregor Kleen"
@@ -111,6 +112,7 @@ fillDb = do
     { userIdent  = "felix.hamann@campus.lmu.de"
     , userAuthentication = AuthLDAP
     , userLastAuthentication = Nothing
+    , userTokensIssuedAfter = Nothing
     , userMatrikelnummer = Nothing
     , userEmail  = "felix.hamann@campus.lmu.de"
     , userDisplayName = "Felix Hamann"
@@ -128,6 +130,7 @@ fillDb = do
     { userIdent  = "jost@tcs.ifi.lmu.de"
     , userAuthentication = AuthLDAP
     , userLastAuthentication = Nothing
+    , userTokensIssuedAfter = Nothing
     , userMatrikelnummer = Nothing
     , userEmail  = "jost@tcs.ifi.lmu.de"
     , userDisplayName = "Steffen Jost"
@@ -145,6 +148,7 @@ fillDb = do
     { userIdent  = "max@campus.lmu.de"
     , userAuthentication = AuthLDAP
     , userLastAuthentication = Just now
+    , userTokensIssuedAfter = Nothing
     , userMatrikelnummer = Just "1299"
     , userEmail  = "max@campus.lmu.de"
     , userDisplayName = "Max Musterstudent"
@@ -162,6 +166,7 @@ fillDb = do
     { userIdent  = "tester@campus.lmu.de"
     , userAuthentication = AuthLDAP
     , userLastAuthentication = Nothing
+    , userTokensIssuedAfter = Nothing
     , userMatrikelnummer = Just "999"
     , userEmail  = "tester@campus.lmu.de"
     , userDisplayName = "Tina Tester"
diff --git a/test/ModelSpec.hs b/test/ModelSpec.hs
index 258211f94..3850363a6 100644
--- a/test/ModelSpec.hs
+++ b/test/ModelSpec.hs
@@ -41,6 +41,7 @@ instance Arbitrary User where
       ]
     userAuthentication <- arbitrary
     userLastAuthentication <- arbitrary
+    userTokensIssuedAfter <- arbitrary
     userMatrikelnummer <- fmap pack . assertM' (not . null) <$> listOf (elements ['0'..'9'])
     userEmail <- CI.mk . decodeUtf8 . Email.toByteString <$> arbitrary
 
diff --git a/test/TestImport.hs b/test/TestImport.hs
index f576ccf30..4ba8082bd 100644
--- a/test/TestImport.hs
+++ b/test/TestImport.hs
@@ -103,11 +103,12 @@ authenticateAs (Entity _ User{..}) = do
 -- checking is switched off in wipeDB for those database backends which need it.
 createUser :: (User -> User) -> YesodExample UniWorX (Entity User)
 createUser adjUser = do
-  UserDefaultConf{..} <- appUserDefaults . appSettings <$> getTestYesod
+  UserDefaultConf{..} <- appUserDefaults . view appSettings <$> getTestYesod
   let
     userMatrikelnummer = Nothing
     userAuthentication = AuthLDAP
     userLastAuthentication = Nothing
+    userTokensIssuedAfter = Nothing
     userIdent = "dummy@example.invalid"
     userEmail = "dummy@example.invalid"
     userDisplayName = "Dummy Example"

From 5e71e8c9e6fa8deb00efcc4781f9df7c1687ee7d Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Thu, 4 Apr 2019 22:57:53 +0200
Subject: [PATCH 011/238] rework show-hide js utility

---
 static/css/utils/asidenav.scss               |  19 +--
 static/css/utils/showHide.scss               |  24 +--
 static/js/utils/modal.js                     |  16 +-
 static/js/utils/registry.js                  |   9 +-
 static/js/utils/showHide.js                  | 145 ++++++++++---------
 templates/adminTest.hamlet                   |   2 +-
 templates/table/layout-filter-default.hamlet |   2 +-
 templates/table/layout-filter-default.lucius |   4 +
 templates/widgets/asidenav/asidenav.hamlet   |   6 +-
 9 files changed, 125 insertions(+), 102 deletions(-)

diff --git a/static/css/utils/asidenav.scss b/static/css/utils/asidenav.scss
index 1ac580d58..101bf5506 100644
--- a/static/css/utils/asidenav.scss
+++ b/static/css/utils/asidenav.scss
@@ -55,10 +55,6 @@
     .asidenav__box-title {
       font-size: 18px;
       padding-left: 10px;
-
-      &.js-show-hide__toggle::before {
-        z-index: 1;
-      }
     }
   }
 }
@@ -94,18 +90,9 @@
   margin-top: 30px;
   background-color: transparent;
   transition: all .2s ease;
-  padding: 30px 13px 10px;
+  padding: 10px 13px;
   margin: 0;
   border-bottom: 1px solid var(--color-grey);
-
-  &.js-show-hide__toggle {
-
-    &::before {
-      left: auto;
-      right: 20px;
-      color: var(--color-font);
-    }
-  }
 }
 
 /* LOGO */
@@ -361,9 +348,5 @@
         background-color: var(--color-lightwhite);
       }
     }
-
-    .js-show-hide__toggle::before {
-      content: none;
-    }
   }
 }
diff --git a/static/css/utils/showHide.scss b/static/css/utils/showHide.scss
index ab82286b8..1f85fbf36 100644
--- a/static/css/utils/showHide.scss
+++ b/static/css/utils/showHide.scss
@@ -1,10 +1,9 @@
 $show-hide-toggle-size: 6px;
 
-.js-show-hide__toggle {
+.show-hide__toggle {
 
   position: relative;
   cursor: pointer;
-  padding: 3px 7px;
 
   &:hover {
     background-color: var(--color-grey-lighter);
@@ -12,32 +11,33 @@ $show-hide-toggle-size: 6px;
   }
 }
 
-.js-show-hide__toggle::before {
+.show-hide__toggle::before {
   content: '';
   position: absolute;
   width: $show-hide-toggle-size;
   height: $show-hide-toggle-size;
   left: -15px;
-  top: 12px - $show-hide-toggle-size / 2;
+  top: 50%;
   color: var(--color-primary);
   border-right: 2px solid currentColor;
   border-top: 2px solid currentColor;
   transition: transform .2s ease;
-  transform-origin: ($show-hide-toggle-size / 2);
-  transform: translateY($show-hide-toggle-size) rotate(-45deg);
+  transform: translateY(-50%) rotate(-45deg);
 }
 
-.js-show-hide__target {
-  transition: all .2s ease;
+.show-hide__toggle--right::before {
+  left: auto;
+  right: 20px;
+  color: var(--color-font);
 }
 
-.js-show-hide--collapsed {
+.show-hide--collapsed {
 
-  .js-show-hide__toggle::before {
-    transform: translateY($show-hide-toggle-size / 3) rotate(135deg);
+  .show-hide__toggle::before {
+    transform: translateY(-50%) rotate(135deg);
   }
 
-  .js-show-hide__target {
+  :not(.show-hide__toggle) {
     display: block;
     height: 0;
     margin: 0;
diff --git a/static/js/utils/modal.js b/static/js/utils/modal.js
index a5971edf7..50307f3db 100644
--- a/static/js/utils/modal.js
+++ b/static/js/utils/modal.js
@@ -2,6 +2,20 @@
   'use strict';
 
   window.utils = window.utils || {};
+  // ########################
+  // TODO: make use of selector
+  // or think of a different way to dynamically initialize widgets
+  // with selectors with specific ids like #modal-hident69
+  //
+  // Idee:
+  // Alles wegschmeißen zu dynamischen IDs. Util init rein über Selector '[uw-...]'
+  // bedarf Änderung in Templates.
+  // Ausserdem müssen sich Utils bei Event 'util-setup-ready' registrieren als Util
+  // utils.setup wird dann überflüssig, bzw. wird zu einer Registry / Controller
+  // der die utils bei DomCOntentLoaded intialisiert.
+  //
+  // ########################
+  var SELECTOR = '[uw-modal]';
 
   var JS_INITIALIZED_CLASS = 'js-modal-initialized';
   var MODAL_OPEN_CLASS = 'modal--open';
@@ -17,7 +31,7 @@
   var OVERLAY_OPEN_CLASS = 'modal__overlay--open';
   var CLOSER_CLASS = 'modal__closer';
 
-  window.utils.modal = function(modalElement, options) {
+  window.utils.modal = function(scope, options) {
 
     if (!modalElement || modalElement.classList.contains(JS_INITIALIZED_CLASS)) {
       return;
diff --git a/static/js/utils/registry.js b/static/js/utils/registry.js
index 775b58fe4..9acff588d 100644
--- a/static/js/utils/registry.js
+++ b/static/js/utils/registry.js
@@ -55,7 +55,14 @@
         const elements = _findUtilElements(util, scope);
 
         elements.forEach(function(element) {
-          var utilInstance = util.setup(element);
+          var utilInstance = null;
+
+          try {
+            utilInstance = util.setup(element);
+          } catch(err) {
+            console.warn('Error while trying to initialize a utility!', { util , element, err });
+          }
+
           if (utilInstance) {
             activeUtilInstances.push(utilInstance);
           }
diff --git a/static/js/utils/showHide.js b/static/js/utils/showHide.js
index 6689b83bd..cd3a6e4ac 100644
--- a/static/js/utils/showHide.js
+++ b/static/js/utils/showHide.js
@@ -1,98 +1,113 @@
 (function() {
   'use strict';
 
-  var UTIL_NAME = 'showHide';
-  var UTIL_SELECTOR = '[uw-show-hide]';
+  var SHOW_HIDE_UTIL_NAME = 'showHide';
+  var SHOW_HIDE_UTIL_SELECTOR = '[uw-show-hide]';
 
-  var JS_INITIALIZED_CLASS = 'js-show-hide-initialized';
-  var LOCAL_STORAGE_SHOW_HIDE = 'SHOW_HIDE';
-  var SHOW_HIDE_COLLAPSED_CLASS = 'js-show-hide--collapsed';
-  var SHOW_HIDE_TARGET_CLASS = 'js-show-hide__target';
+  var SHOW_HIDE_LOCAL_STORAGE_KEY = 'SHOW_HIDE';
+  var SHOW_HIDE_INITIALIZED_CLASS = 'show-hide--initialized';
+  var SHOW_HIDE_COLLAPSED_CLASS = 'show-hide--collapsed';
+  var SHOW_HIDE_TOGGLE_CLASS = 'show-hide__toggle';
+  var SHOW_HIDE_TOGGLE_RIGHT_CLASS = 'show-hide__toggle--right';
 
   /**
+   *
+   * ShowHide Utility
+   *
+   * Attribute: uw-show-hide
+   *
+   * Params: (all optional)
+   *  data-show-hide-id: string
+   *    If this param is given the state of the utility will be persisted in the clients local storage.
+   *  data-show-hide-collapsed: boolean property
+   *    If this param is present the ShowHide utility will be collapsed. This value will be overruled by any value stored in the LocalStorage.
+   *  data-show-hide-align: 'right'
+   *    Where to put the arrow that marks the element as a ShowHide toggle. Left of toggle by default.
+   *
+   * Example usage:
    * <div>
-   *   <div uw-show-hide>
-   *     [toggle here]
-   *   <div>
-   *     [content here]
+   *   <div uw-show-hide>Click me
+   *   <div>This will be toggled
+   *   <div>This will be toggled as well
    */
-  var util = function(element) {
+  var showHideUtil = function(element) {
 
-    function _init() {
+    var showHideId;
+
+    function init() {
       if (!element) {
         throw new Error('ShowHide utility cannot be setup without an element!');
       }
 
-      if (element.classList.contains(JS_INITIALIZED_CLASS)) {
-        return false;
+      if (element.classList.contains(SHOW_HIDE_INITIALIZED_CLASS)) {
+        throw new Error('ShowHide utility already initialized!');
       }
 
-      _addEventHandler();
+      // register click listener
+      addClickListener();
+
+      // param showHideId
+      if (element.dataset.showHideId) {
+        showHideId = element.dataset.showHideId;
+      }
+
+      // param showHideCollapsed
+      var collapsed = false;
+      if (element.dataset.showHideCollapsed !== undefined) {
+        collapsed = true;
+      }
+      if (showHideId) {
+        var localStorageCollapsed = getLocalStorage()[showHideId];
+        if (typeof localStorageCollapsed !== 'undefined') {
+          collapsed = localStorageCollapsed;
+        }
+      }
+      element.parentElement.classList.toggle(SHOW_HIDE_COLLAPSED_CLASS, collapsed);
+
+      // param showHideAlign
+      var alignment = element.dataset.showHideAlign;
+      if (alignment === 'right') {
+        element.classList.add(SHOW_HIDE_TOGGLE_RIGHT_CLASS);
+      }
+
+      // mark as initialized
+      element.classList.add(SHOW_HIDE_INITIALIZED_CLASS, SHOW_HIDE_TOGGLE_CLASS);
+
+      return {
+        name: SHOW_HIDE_UTIL_NAME,
+        element: element,
+        destroy: function() {},
+      };
     }
 
-    function _addEventHandler() {
+    function addClickListener() {
       element.addEventListener('click', function clickListener() {
-        console.log('showhide clicked');
         var newState = element.parentElement.classList.toggle(SHOW_HIDE_COLLAPSED_CLASS);
-        _updateLSState(element.dataset.shIndex || null, newState);
+
+        if (showHideId) {
+          setLocalStorage(showHideId, newState);
+        }
       });
     }
 
-    function _updateLSState(index, state) {
-      if (!index) {
-        return false;
-      }
-      var lsData = _getLocalStorageData();
-      lsData[index] = state;
-      window.localStorage.setItem(LOCAL_STORAGE_SHOW_HIDE, JSON.stringify(lsData));
+    function setLocalStorage(id, state) {
+      var lsData = getLocalStorage();
+      lsData[id] = state;
+      window.localStorage.setItem(SHOW_HIDE_LOCAL_STORAGE_KEY, JSON.stringify(lsData));
     }
 
-    // function _getCollapsedLSState(index) {
-    //   var lsState = _getLocalStorageData();
-    //   return lsState[index];
-    // }
-
-    function _getLocalStorageData() {
-      return JSON.parse(window.localStorage.getItem(LOCAL_STORAGE_SHOW_HIDE)) || {};
+    function getLocalStorage() {
+      return JSON.parse(window.localStorage.getItem(SHOW_HIDE_LOCAL_STORAGE_KEY)) || {};
     }
 
-    // var showHides = Array.from(scope.querySelectorAll(UTIL_SELECTOR));
-    // showHides.forEach(function(el) {
-    //   if (el.classList.contains(JS_INITIALIZED_CLASS)) {
-    //     return false;
-    //   }
-
-    //   var index = el.dataset.shIndex || null;
-    //   var isCollapsed = el.dataset.collapsed === 'true';
-    //   var lsCollapsedState = _getCollapsedLSState(index);
-    //   if (typeof lsCollapsedState !== 'undefined') {
-    //     isCollapsed = lsCollapsedState;
-    //   }
-    //   el.parentElement.classList.toggle(SHOW_HIDE_COLLAPSED_CLASS, isCollapsed);
-
-    //   Array.from(el.parentElement.children).forEach(function(el) {
-    //     if (!el.matches(UTIL_SELECTOR)) {
-    //       el.classList.add(SHOW_HIDE_TARGET_CLASS);
-    //     }
-    //   });
-    //   el.classList.add(JS_INITIALIZED_CLASS);
-    //   _addEventHandler(el);
-    // });
-
-    _init();
-
-    return {
-      name: UTIL_NAME,
-      element: element,
-      destroy: function() {},
-    };
+    return init();
   };
 
   if (UtilRegistry) {
     UtilRegistry.register({
-      name: UTIL_NAME,
-      selector: UTIL_SELECTOR,
-      setup: util
+      name: SHOW_HIDE_UTIL_NAME,
+      selector: SHOW_HIDE_UTIL_SELECTOR,
+      setup: showHideUtil
     });
   }
 
diff --git a/templates/adminTest.hamlet b/templates/adminTest.hamlet
index 7e59d9599..b595fe813 100644
--- a/templates/adminTest.hamlet
+++ b/templates/adminTest.hamlet
@@ -6,7 +6,7 @@
     Der Handler sollte jeweils aktuelle Beispiele für alle möglichen Funktionalitäten enthalten, so dass man immer weiß, wo man nachschlagen kann.
 
 <section>
-  <h2 .js-show-hide__toggle>Teilweise funktionierende Abschnitte
+  <h2 uw-show-hide>Teilweise funktionierende Abschnitte
 
   <ul>
     <li .list-group-item>
diff --git a/templates/table/layout-filter-default.hamlet b/templates/table/layout-filter-default.hamlet
index 2cd414694..7a87d28a1 100644
--- a/templates/table/layout-filter-default.hamlet
+++ b/templates/table/layout-filter-default.hamlet
@@ -1,6 +1,6 @@
 $newline never
 <div .table-filter>
-  <h3 .js-show-hide__toggle data-sh-index=table-filter data-collapsed=true>Filter
+  <h3 .table-filter__toggle uw-show-hide data-show-hide-id=table-filter data-show-hide-collapsed>Filter
   <div>
     ^{filterForm}
 ^{scrolltable}
diff --git a/templates/table/layout-filter-default.lucius b/templates/table/layout-filter-default.lucius
index e2baee73a..7c1d3ab14 100644
--- a/templates/table/layout-filter-default.lucius
+++ b/templates/table/layout-filter-default.lucius
@@ -1,3 +1,7 @@
 .table-filter {
   margin-bottom: 13px;
 }
+
+.table-filter__toggle {
+  padding: 3px 7px;
+}
diff --git a/templates/widgets/asidenav/asidenav.hamlet b/templates/widgets/asidenav/asidenav.hamlet
index 8090926d1..6bbcb159c 100644
--- a/templates/widgets/asidenav/asidenav.hamlet
+++ b/templates/widgets/asidenav/asidenav.hamlet
@@ -7,10 +7,10 @@ $newline never
 
   <div .asidenav>
     $forall tid <- favouriteTerms
-      <div .asidenav__box.js-show-hide>
-        <h3 .asidenav__box-title.js-show-hide__toggle data-sh-index="#{termToText tid}">
+      <div .asidenav__box>
+        <h3 .asidenav__box-title uw-show-hide data-show-hide-id="#{termToText tid}" data-show-hide-align=right>
           _{ShortTermIdentifier tid}
-        <ul .asidenav__list.js-show-hide__target.list--iconless>
+        <ul .asidenav__list.list--iconless>
           $forall (Course{courseShorthand, courseName}, courseRoute, pageActions) <- favouriteTerm tid
             <li .asidenav__list-item :highlight courseRoute:.asidenav__list-item--active>
               <a .asidenav__link-wrapper href=@{courseRoute}>

From 4161af4742746fc4a13310c163f6220bb25d6186 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Fri, 5 Apr 2019 21:34:38 +0200
Subject: [PATCH 012/238] split js utilities in utils and services

---
 src/Foundation.hs                                         | 5 +++--
 static/js/{utils => services}/httpClient.js               | 4 +---
 static/js/{utils/registry.js => services/utilRegistry.js} | 0
 3 files changed, 4 insertions(+), 5 deletions(-)
 rename static/js/{utils => services}/httpClient.js (89%)
 rename static/js/{utils/registry.js => services/utilRegistry.js} (100%)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 365a64ccf..75921e36f 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1064,8 +1064,9 @@ siteLayout' headingOverride widget = do
       -- polyfills
       addScript $ StaticR js_polyfills_fetchPolyfill_js
       addScript $ StaticR js_polyfills_urlPolyfill_js
-      -- JavaScript utils
-      addScript $ StaticR js_utils_registry_js
+      -- JavaScript services
+      addScript $ StaticR js_services_utilRegistry_js
+      addScript $ StaticR js_services_httpClient_js
       -- addScript $ StaticR js_utils_alerts_js
       -- addScript $ StaticR js_utils_asidenav_js
       -- addScript $ StaticR js_utils_asyncForm_js
diff --git a/static/js/utils/httpClient.js b/static/js/services/httpClient.js
similarity index 89%
rename from static/js/utils/httpClient.js
rename to static/js/services/httpClient.js
index 18d82fbb2..32935cb07 100644
--- a/static/js/utils/httpClient.js
+++ b/static/js/services/httpClient.js
@@ -1,9 +1,7 @@
 (function collonadeClosure() {
   'use strict';
 
-  window.utils = window.utils || {};
-
-  window.utils.httpClient = (function() {
+  window.HttpClient = (function() {
 
     function _fetch(url, method, additionalHeaders, body) {
       var requestOptions = {
diff --git a/static/js/utils/registry.js b/static/js/services/utilRegistry.js
similarity index 100%
rename from static/js/utils/registry.js
rename to static/js/services/utilRegistry.js

From 15fa8d11302cb7d34e971210b9572c339c281b62 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 5 Apr 2019 22:45:03 +0200
Subject: [PATCH 013/238] =?UTF-8?q?(Get|Post)Token=20=E2=86=92=20(Get|Post?=
 =?UTF-8?q?)Bearer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Handler/Profile.hs                     | 4 ++--
 src/Jobs/Handler/SendNotification/Utils.hs | 2 +-
 src/Model/Token.hs                         | 4 ++--
 src/Utils/Parameters.hs                    | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs
index f01f34281..71e718da9 100644
--- a/src/Handler/Profile.hs
+++ b/src/Handler/Profile.hs
@@ -599,11 +599,11 @@ postUserNotificationR cID = do
         = [whamlet|
             $newline never
             $maybe jwt <- mJwt
-              <input type=hidden name=#{toPathPiece PostToken} value=#{toPathPiece jwt}>
+              <input type=hidden name=#{toPathPiece PostBearer} value=#{toPathPiece jwt}>
             ^{nsInnerWdgt}
           |]
 
-  formResultModal nsRes (UserNotificationR cID, [ (toPathPiece GetToken, toPathPiece jwt) | Just jwt <- pure mJwt ]) $ \ns -> do
+  formResultModal nsRes (UserNotificationR cID, [ (toPathPiece GetBearer, toPathPiece jwt) | Just jwt <- pure mJwt ]) $ \ns -> do
     lift . runDB $ update uid [ UserNotificationSettings =. ns ]
     tell . pure =<< messageI Success MsgNotificationSettingsUpdate
 
diff --git a/src/Jobs/Handler/SendNotification/Utils.hs b/src/Jobs/Handler/SendNotification/Utils.hs
index d7ca82a76..c91199db9 100644
--- a/src/Jobs/Handler/SendNotification/Utils.hs
+++ b/src/Jobs/Handler/SendNotification/Utils.hs
@@ -15,6 +15,6 @@ mkEditNotifications uid = liftHandlerT $ do
   jwt <- encodeToken =<< bearerToken uid (Just . HashSet.singleton $ UserNotificationR cID) Nothing Nothing Nothing
   let
     editNotificationsUrl :: SomeRoute UniWorX
-    editNotificationsUrl = SomeRoute (UserNotificationR cID, [(toPathPiece GetToken, toPathPiece jwt)])
+    editNotificationsUrl = SomeRoute (UserNotificationR cID, [(toPathPiece GetBearer, toPathPiece jwt)])
   editNotificationsUrl' <- toTextUrl editNotificationsUrl
   return ($(ihamletFile "templates/mail/editNotifications.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX))
diff --git a/src/Model/Token.hs b/src/Model/Token.hs
index cfaaacb55..f84fc970a 100644
--- a/src/Model/Token.hs
+++ b/src/Model/Token.hs
@@ -215,6 +215,6 @@ askJwt :: forall m.
 -- | Retrieve current `Jwt` from HTTP-Header, POST-Parameter, or GET-Parameter
 askJwt = runMaybeT $ asum
   [ MaybeT lookupBearerAuth >>= hoistMaybe . fromPathPiece
-  , MaybeT $ lookupGlobalPostParam PostToken
-  , MaybeT $ lookupGlobalGetParam GetToken
+  , MaybeT $ lookupGlobalPostParam PostBearer
+  , MaybeT $ lookupGlobalGetParam GetBearer
   ]
diff --git a/src/Utils/Parameters.hs b/src/Utils/Parameters.hs
index f7922adcb..bc3735620 100644
--- a/src/Utils/Parameters.hs
+++ b/src/Utils/Parameters.hs
@@ -20,7 +20,7 @@ import Data.Universe
 import Control.Monad.Trans.Maybe (MaybeT(..))
 
 
-data GlobalGetParam = GetReferer | GetToken
+data GlobalGetParam = GetReferer | GetBearer
   deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic)
 
 instance Universe GlobalGetParam
@@ -51,7 +51,7 @@ globalGetParamField ident Field{fieldParse} = runMaybeT $ do
 data GlobalPostParam = PostFormIdentifier
                      | PostDeleteTarget
                      | PostMassInputShape
-                     | PostToken
+                     | PostBearer
   deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic)
 
 instance Universe GlobalPostParam

From ffef0b94bcebacf23652bcc5b33f918163b07bf4 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Fri, 5 Apr 2019 21:35:33 +0200
Subject: [PATCH 014/238] refactor JS modal utility to work with new util
 registry

---
 src/Foundation.hs                             |   3 +-
 static/css/utils/modal.scss                   |   6 +-
 static/js/utils/modal.js                      | 233 ++++++++++--------
 templates/adminTest.hamlet                    |  10 +-
 templates/default-layout-wrapper.hamlet       |   2 +-
 templates/default-layout.lucius               |  20 +-
 templates/widgets/modal/modal.hamlet          |   2 +-
 .../widgets/pageaction/pageaction.hamlet      |   4 +-
 8 files changed, 149 insertions(+), 131 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 75921e36f..fe0df0b26 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1076,7 +1076,8 @@ siteLayout' headingOverride widget = do
       -- addScript $ StaticR js_utils_httpClient_js
       -- addScript $ StaticR js_utils_form_js
       -- addScript $ StaticR js_utils_inputs_js
-      -- addScript $ StaticR js_utils_modal_js
+      -- JavaScript utils
+      addScript $ StaticR js_utils_modal_js
       addScript $ StaticR js_utils_poc_js
       addScript $ StaticR js_utils_showHide_js
       -- addScript $ StaticR js_utils_tabber_js
diff --git a/static/css/utils/modal.scss b/static/css/utils/modal.scss
index 2f5d0e168..d47b8c727 100644
--- a/static/css/utils/modal.scss
+++ b/static/css/utils/modal.scss
@@ -14,9 +14,6 @@
   padding: 0 65px 0 20px;
   overflow: auto;
   overscroll-behavior: contain;
-  transition:
-    opacity .2s .1s ease-in-out,
-    transform .3s ease-in-out;
   pointer-events: none;
   opacity: 0;
 
@@ -25,6 +22,9 @@
     pointer-events: auto;
     z-index: 200;
     transform: translate(-50%, -50%) scale(1, 1);
+    transition:
+      opacity .2s .1s ease-in-out,
+      transform .3s ease-in-out;
   }
 }
 
diff --git a/static/js/utils/modal.js b/static/js/utils/modal.js
index 50307f3db..3f46300a6 100644
--- a/static/js/utils/modal.js
+++ b/static/js/utils/modal.js
@@ -1,169 +1,192 @@
 (function() {
   'use strict';
 
-  window.utils = window.utils || {};
-  // ########################
-  // TODO: make use of selector
-  // or think of a different way to dynamically initialize widgets
-  // with selectors with specific ids like #modal-hident69
-  //
-  // Idee:
-  // Alles wegschmeißen zu dynamischen IDs. Util init rein über Selector '[uw-...]'
-  // bedarf Änderung in Templates.
-  // Ausserdem müssen sich Utils bei Event 'util-setup-ready' registrieren als Util
-  // utils.setup wird dann überflüssig, bzw. wird zu einer Registry / Controller
-  // der die utils bei DomCOntentLoaded intialisiert.
-  //
-  // ########################
-  var SELECTOR = '[uw-modal]';
+  /**
+   *
+   * Modal Utility
+   *
+   * Attribute: uw-modal
+   *
+   * Params:
+   *  data-modal-trigger: string
+   *    Selector for the element that toggles the modal.
+   *    If trigger element has "href" attribute the modal will be dynamically loaded from the referenced page
+   *  data-modal-closeable: boolean property
+   *    If the param is present the modal will have a close-icon and can also be closed by clicking anywhere on the overlay
+   *
+   * Example usage:
+   * <div uw-modal data-modal-trigger='#trigger' data-modal-closeable>This is the modal content
+   * <div id='trigger'>Click me to open the modal
+   */
+
+  var MODAL_UTIL_NAME = 'modal';
+  var MODAL_UTIL_SELECTOR = '[uw-modal]';
 
-  var JS_INITIALIZED_CLASS = 'js-modal-initialized';
-  var MODAL_OPEN_CLASS = 'modal--open';
-  var MODAL_TRIGGER_CLASS = 'modal__trigger';
-  var MODAL_CONTENT_CLASS = 'modal__content';
-  var MAIN_CONTENT_CLASS = 'main__content-body'
-  var MODAL_CLOSABLE_FLAG = 'closeable';
-  var MODAL_DYNAMIC_FLAG = 'dynamic';
   var MODAL_HEADERS = {
     'Is-Modal': 'True',
   };
-  var OVERLAY_CLASS = 'modal__overlay';
-  var OVERLAY_OPEN_CLASS = 'modal__overlay--open';
-  var CLOSER_CLASS = 'modal__closer';
 
-  window.utils.modal = function(scope, options) {
+  var MODAL_INITIALIZED_CLASS = 'modal--initialized';
+  var MODAL_CLASS = 'modal';
+  var MODAL_OPEN_CLASS = 'modal--open';
+  var MODAL_TRIGGER_CLASS = 'modal__trigger';
+  var MODAL_CONTENT_CLASS = 'modal__content';
+  var MODAL_OVERLAY_CLASS = 'modal__overlay';
+  var MODAL_OVERLAY_OPEN_CLASS = 'modal__overlay--open';
+  var MODAL_CLOSER_CLASS = 'modal__closer';
 
-    if (!modalElement || modalElement.classList.contains(JS_INITIALIZED_CLASS)) {
-      return;
-    }
+  var MAIN_CONTENT_CLASS = 'main__content-body'
 
-    var utilInstances = [];
+  var modalUtil = function(element) {
 
     var overlayElement = document.createElement('div');
-    var closerElement = document.createElement('div');
-    var triggerElement = document.querySelector('#' + modalElement.dataset.trigger);
+    var modalUrl;
 
-    function setup() {
-      document.body.insertBefore(modalElement, null);
+    function _init() {
+      if (!element) {
+        throw new Error('Modal utility cannot be setup without an element!');
+      }
 
-      setupForm();
-      setupCloser();
+      if (element.classList.contains(MODAL_INITIALIZED_CLASS)) {
+        throw new Error('Modal utility already initialized!');
+      }
 
-      triggerElement.classList.add(MODAL_TRIGGER_CLASS);
-      triggerElement.addEventListener('click', openHandler, false);
+      // param modalTrigger
+      if (!element.dataset.modalTrigger) {
+        throw new Error('Modal utility cannot be setup without a trigger element!');
+      } else {
+        setupTrigger();
+      }
 
-      modalElement.classList.add(JS_INITIALIZED_CLASS);
+      // param modalCloseable
+      if (element.dataset.modalCloseable !== undefined) {
+        setupCloser();
+      }
+
+      // setupForm();
+
+      // mark as initialized and add modal class for styling
+      element.classList.add(MODAL_INITIALIZED_CLASS, MODAL_CLASS);
+
+      return {
+        name: MODAL_UTIL_NAME,
+        element: element,
+        destroy: function() {}
+      };
     }
 
-    function openHandler(event) {
+    function setupTrigger() {
+      var triggerElement = document.querySelector(element.dataset.modalTrigger);
+
+      if (!triggerElement) {
+        throw new Error('Trigger element for Modal not found: "', + element.dataset.modalTrigger + '"');
+      }
+
+      triggerElement.classList.add(MODAL_TRIGGER_CLASS);
+      triggerElement.addEventListener('click', onTriggerClicked, false);
+      modalUrl = triggerElement.getAttribute('href');
+    }
+
+    function setupCloser() {
+      var closerElement = document.createElement('div');
+      element.insertBefore(closerElement, null);
+      closerElement.classList.add(MODAL_CLOSER_CLASS);
+      closerElement.addEventListener('click', onCloseClicked, false);
+      overlayElement.addEventListener('click', onCloseClicked, false);
+    }
+
+    function onTriggerClicked(event) {
       event.preventDefault();
       open();
     }
 
-    function open() {
-      modalElement.classList.add(MODAL_OPEN_CLASS);
-      overlayElement.classList.add(OVERLAY_CLASS);
-      document.body.insertBefore(overlayElement, modalElement);
-      overlayElement.classList.add(OVERLAY_OPEN_CLASS);
-
-      var modalUrl = triggerElement.getAttribute('href');
-      if (modalUrl && MODAL_DYNAMIC_FLAG in modalElement.dataset) {
-        fillModal(modalUrl);
-      }
-
-      document.addEventListener('keyup', keyupHandler);
-    }
-
-    function closeHandler(event) {
+    function onCloseClicked(event) {
       event.preventDefault();
       close();
     }
 
-    function close() {
-      overlayElement.classList.remove(OVERLAY_OPEN_CLASS);
-      modalElement.classList.remove(MODAL_OPEN_CLASS);
+    function onKeyUp(event) {
+      if (event.key === 'Escape') {
+        close();
+      }
+    }
 
-      document.removeEventListener('keyup', keyupHandler);
+    function open() {
+      document.body.insertBefore(element, null);
+      element.classList.add(MODAL_OPEN_CLASS);
+      overlayElement.classList.add(MODAL_OVERLAY_CLASS);
+      document.body.insertBefore(overlayElement, element);
+      overlayElement.classList.add(MODAL_OVERLAY_OPEN_CLASS);
+
+      if (modalUrl) {
+        fillModal(modalUrl);
+      }
+
+      document.addEventListener('keyup', onKeyUp);
+    }
+
+    function close() {
+      overlayElement.classList.remove(MODAL_OVERLAY_OPEN_CLASS);
+      element.classList.remove(MODAL_OPEN_CLASS);
+
+      document.removeEventListener('keyup', onKeyUp);
     };
 
-    function setupForm() {
-      var form = modalElement.querySelector('form');
-      if (form) {
-        utilInstances.push(window.utils.setup('form', form, { headers: MODAL_HEADERS, force: true }));
-      }
-    }
-
-    function setupCloser() {
-      if (MODAL_CLOSABLE_FLAG in modalElement.dataset) {
-        modalElement.insertBefore(closerElement, null);
-        closerElement.classList.add(CLOSER_CLASS);
-        closerElement.addEventListener('click', closeHandler, false);
-        overlayElement.addEventListener('click', closeHandler, false);
-      }
-    }
-
     function fillModal(url) {
-      if (!window.utils.httpClient) {
-        throw new Error('httpClient not found! Can\' fetch modal content from ' + url);
+      if (!HttpClient) {
+        throw new Error('HttpClient not found! Can\'t fetch modal content from ' + url);
       }
 
-      window.utils.httpClient.get(url, MODAL_HEADERS)
+      HttpClient.get(url, MODAL_HEADERS)
         .then(function(response) {
           response.text().then(processResponse);
         });
     }
 
-    function processResponse(reponseBody) {
+    function processResponse(responseBody) {
+      var responseElement = document.createElement('div');
+      responseElement.innerHTML = responseBody;
+
       var modalContent = document.createElement('div');
       modalContent.classList.add(MODAL_CONTENT_CLASS);
-      modalContent.innerHTML = reponseBody;
 
-      var contentBody = modalContent.querySelector('.' + MAIN_CONTENT_CLASS);
+      var contentBody = responseElement.querySelector('.' + MAIN_CONTENT_CLASS);
 
       if (contentBody) {
         modalContent.innerHTML = contentBody.innerHTML;
       }
 
-      var previousModalContent = modalElement.querySelector('.' + MODAL_CONTENT_CLASS);
+      var previousModalContent = element.querySelector('.' + MODAL_CONTENT_CLASS);
       if (previousModalContent) {
         previousModalContent.remove();
       }
 
       modalContent = withPrefixedInputIDs(modalContent);
-      modalElement.insertBefore(modalContent, null);
-      setupForm();
+      element.insertBefore(modalContent, null);
+
+      // setup any newly arrived utils
+      UtilRegistry.setupAll();
     }
 
     function withPrefixedInputIDs(modalContent) {
       var idAttrs = ['id', 'for', 'data-conditional-id'];
       idAttrs.forEach(function(attr) {
         modalContent.querySelectorAll('[' + attr + ']').forEach(function(input) {
-          var value = modalElement.id + '__' + input.getAttribute(attr);
+          var value = element.id + '__' + input.getAttribute(attr);
           input.setAttribute(attr, value);
         });
       });
       return modalContent;
     }
 
-    function keyupHandler(event) {
-      if (event.key === 'Escape') {
-        close();
-      }
-    }
-
-    setup();
-
-    function destroyUtils() {
-      utilInstances.filter(function(utilInstance) {
-        return !!utilInstance;
-      }).forEach(function(utilInstance) {
-        utilInstance.destroy();
-      });
-    }
-
-    return {
-      scope: modalElement,
-      destroy: destroyUtils,
-    };
+    return _init();
   };
+
+  if (UtilRegistry) {
+    UtilRegistry.register({
+      name: MODAL_UTIL_NAME,
+      selector: MODAL_UTIL_SELECTOR,
+      setup: modalUtil
+    });
+  }
 })();
diff --git a/templates/adminTest.hamlet b/templates/adminTest.hamlet
index b595fe813..9c90a8994 100644
--- a/templates/adminTest.hamlet
+++ b/templates/adminTest.hamlet
@@ -26,11 +26,11 @@
     <li>
       Knopf-Test:
         ^{btnForm}
-    <li><br>
-      Modals:
-      ^{modal "Klick mich für Ajax-Test" (Left $ SomeRoute UsersR)}
-      ^{modal "Klick mich für Content-Test" (Right "Test Inhalt für Modal")}
     <li>
-      ^{modal "Email-Test" (Right emailWidget')}
+      Modals:
+      <ul>
+        <li>^{modal "Klick mich für Ajax-Test" (Left $ SomeRoute UsersR)}
+        <li>^{modal "Klick mich für Content-Test" (Right "Test Inhalt für Modal")}
+        <li>^{modal "Email-Test" (Right emailWidget')}
     <li>
       Some icons: ^{isVisible False} ^{hasComment True}
diff --git a/templates/default-layout-wrapper.hamlet b/templates/default-layout-wrapper.hamlet
index c293b607a..014edc30f 100644
--- a/templates/default-layout-wrapper.hamlet
+++ b/templates/default-layout-wrapper.hamlet
@@ -12,7 +12,7 @@ $newline never
 
     ^{pageHead pc}
 
-  <body .no-js .theme--#{toPathPiece currentTheme} :isAuth:.logged-in :isModal:.modal>
+  <body .no-js .theme--#{toPathPiece currentTheme} :isAuth:.logged-in>
     <!-- removes no-js class from body if client supports javascript -->
     <script>
       document.body.classList.remove('no-js');
diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius
index 8a78a21fc..2dc1141d9 100644
--- a/templates/default-layout.lucius
+++ b/templates/default-layout.lucius
@@ -189,27 +189,21 @@ h4 {
 }
 
 @media (min-width: 426px) {
-  :not(.modal) {
-    .main__content {
-      margin-left: var(--asidenav-width-md, 50px);
-    }
+  .main__content {
+    margin-left: var(--asidenav-width-md, 50px);
   }
 }
 
 @media (min-width: 769px) {
-  :not(.modal) {
-    .main__content {
-      margin-left: var(--asidenav-width-lg, 20%);
-      margin-top: var(--header-height);
-    }
+  .main__content {
+    margin-left: var(--asidenav-width-lg, 20%);
+    margin-top: var(--header-height);
   }
 }
 
 @media (min-width: 1200px) {
-  :not(.modal) {
-    .main__content {
-      margin-left: var(--asidenav-width-xl, 250px);
-    }
+  .main__content {
+    margin-left: var(--asidenav-width-xl, 250px);
   }
 }
 
diff --git a/templates/widgets/modal/modal.hamlet b/templates/widgets/modal/modal.hamlet
index 6381305e7..c87dd4232 100644
--- a/templates/widgets/modal/modal.hamlet
+++ b/templates/widgets/modal/modal.hamlet
@@ -1,5 +1,5 @@
 $newline never
-<div .modal.js-modal #modal-#{modalId'} data-trigger=#{triggerId'} data-closeable :isDynamic:data-dynamic>
+<div uw-modal data-modal-trigger=##{triggerId'} data-modal-closeable :isDynamic:.not-used>
   $case modalContent
     $of Right content
       <div .modal__content>
diff --git a/templates/widgets/pageaction/pageaction.hamlet b/templates/widgets/pageaction/pageaction.hamlet
index b7dcfc86e..094c701b3 100644
--- a/templates/widgets/pageaction/pageaction.hamlet
+++ b/templates/widgets/pageaction/pageaction.hamlet
@@ -7,7 +7,7 @@ $newline never
           $of PageActionPrime
             <div .pagenav__list-item>
               $if menuItemModal
-                <div .modal.js-modal #modal-#{menuIdent} data-trigger=#{menuIdent} data-closeable data-dynamic>
+                <div uw-modal data-modal-trigger=#{menuIdent} data-modal-closeable>
               <a .pagenav__link-wrapper href=#{route} ##{menuIdent}>_{SomeMessage menuItemLabel}
           $of _
   $if hasSecondaryPageActions
@@ -18,6 +18,6 @@ $newline never
             $of PageActionSecondary
               <div .pagenav__list-item.pagenav__list-item--secondary>
                 $if menuItemModal
-                  <div .modal.js-modal #modal-#{menuIdent} data-trigger=#{menuIdent} data-closeable data-dynamic>
+                  <div uw-modal data-modal-trigger=#{menuIdent} data-modal-closeable>
                 <a .pagenav__link-wrapper.pagenav__link-wrapper--secondary href=#{route} ##{menuIdent}>_{SomeMessage menuItemLabel}
             $of _

From c2d01e9489f6ac41443cc2244e86e831a682f29a Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 6 Apr 2019 14:45:01 +0200
Subject: [PATCH 015/238] add i18n registry for JS utils

---
 src/Foundation.hs               |  1 +
 static/js/services/i18n.js      | 31 +++++++++++++++++++++++++++++++
 templates/default-layout.julius | 17 ++++++++++-------
 3 files changed, 42 insertions(+), 7 deletions(-)
 create mode 100644 static/js/services/i18n.js

diff --git a/src/Foundation.hs b/src/Foundation.hs
index fe0df0b26..cc5e85bcf 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1067,6 +1067,7 @@ siteLayout' headingOverride widget = do
       -- JavaScript services
       addScript $ StaticR js_services_utilRegistry_js
       addScript $ StaticR js_services_httpClient_js
+      addScript $ StaticR js_services_i18n_js
       -- addScript $ StaticR js_utils_alerts_js
       -- addScript $ StaticR js_utils_asidenav_js
       -- addScript $ StaticR js_utils_asyncForm_js
diff --git a/static/js/services/i18n.js b/static/js/services/i18n.js
new file mode 100644
index 000000000..440b1aca5
--- /dev/null
+++ b/static/js/services/i18n.js
@@ -0,0 +1,31 @@
+(function() {
+  'use strict';
+
+  // Global I18n registry that stores and serves translations.
+  // Each translation must have a unique ID.
+  window.I18n = (function() {
+
+    var translations = {};
+
+    function addTranslation(id, translation) {
+      translations[id] = translation;
+    }
+
+    function addManyTranslations(manyTranslations) {
+      Object.keys(manyTranslations).forEach(function(key) {
+        addTranslation(key, manyTranslations[key]);
+      });
+    }
+
+    function getTranslation(id) {
+      return translations[id];
+    }
+
+    // public API
+    return {
+      add: addTranslation,
+      addMany: addManyTranslations,
+      get: getTranslation,
+    };
+  })();
+})();
diff --git a/templates/default-layout.julius b/templates/default-layout.julius
index d83daccd0..78e911914 100644
--- a/templates/default-layout.julius
+++ b/templates/default-layout.julius
@@ -35,13 +35,16 @@ function setupDatepicker(wrapper) {
   });
 }
 
-// this global I18N object will be picked up automatically by the setup util
-window.I18N = {
-  filesSelected: 'Dateien ausgewählt', // TODO: interpolate these to be translated
-  selectFile: 'Datei auswählen',
-  selectFiles: 'Datei(en) auswählen',
-  asyncFormFailure: 'Da ist etwas schief gelaufen, das tut uns Leid.<br>Falls das erneut passiert schicke uns gerne eine kurze Beschreibung dieses Ereignisses über das Hilfe-Widget rechts oben.<br><br>Vielen Dank für deine Hilfe',
-};
+if (I18n) {
+  I18n.addMany({
+    filesSelected: 'Dateien ausgewählt',
+    selectFile: 'Datei auswählen',
+    selectFiles: 'Datei(en) auswählen',
+    asyncFormFailure: 'Da ist etwas schief gelaufen, das tut uns Leid.<br>Falls das erneut passiert schicke uns gerne eine kurze Beschreibung dieses Ereignisses über das Hilfe-Widget rechts oben.<br><br>Vielen Dank für deine Hilfe',
+  });
+} else {
+  throw new Error('I18n JavaScript service is missing!');
+}
 
 document.addEventListener('DOMContentLoaded', function() {
   window.utils.setup('flatpickr', document.body, { setupFunction: setupDatepicker });

From 4973fd0b08ca1b95edadfc3c5ce9e10ad0c296bc Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 6 Apr 2019 14:51:16 +0200
Subject: [PATCH 016/238] refactor file upload JS utility

---
 src/Foundation.hs               |   2 +-
 static/css/utils/inputs.scss    |  19 +++-
 static/js/utils/inputs.js       | 163 ++++++++++++++++++--------------
 templates/multiFileField.hamlet |   2 +-
 templates/multiFileField.lucius |  13 ---
 5 files changed, 112 insertions(+), 87 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index cc5e85bcf..047a69955 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1076,8 +1076,8 @@ siteLayout' headingOverride widget = do
       -- addScript $ StaticR js_utils_checkAll_js
       -- addScript $ StaticR js_utils_httpClient_js
       -- addScript $ StaticR js_utils_form_js
-      -- addScript $ StaticR js_utils_inputs_js
       -- JavaScript utils
+      addScript $ StaticR js_utils_inputs_js
       addScript $ StaticR js_utils_modal_js
       addScript $ StaticR js_utils_poc_js
       addScript $ StaticR js_utils_showHide_js
diff --git a/static/css/utils/inputs.scss b/static/css/utils/inputs.scss
index db16a94d3..f2b479979 100644
--- a/static/css/utils/inputs.scss
+++ b/static/css/utils/inputs.scss
@@ -196,7 +196,11 @@ option {
   }
 }
 
-/* CUSTOM FILE INPUT */
+/* FILE INPUT */
+.file-input {
+  display: none;
+}
+
 .file-input__label {
   cursor: pointer;
   display: inline-block;
@@ -206,6 +210,15 @@ option {
   border-radius: 3px;
 }
 
-.file-input__input--hidden {
-  display: none;
+.file-input__multi-info {
+  font-size: .9rem;
+  font-style: italic;
+  margin-top: 10px;
+  color: var(--color-fontsec);
+}
+
+.file-input__list {
+  margin-left: 15px;
+  margin-top: 10px;
+  font-weight: 600;
 }
diff --git a/static/js/utils/inputs.js b/static/js/utils/inputs.js
index 3a9f7ebc4..b544e2272 100644
--- a/static/js/utils/inputs.js
+++ b/static/js/utils/inputs.js
@@ -1,8 +1,6 @@
 (function() {
   'use strict';
 
-  window.utils = window.utils || {};
-
   var JS_INITIALIZED_CLASS = 'js-inputs-initialized';
 
   window.utils.inputs = function(wrapper, options) {
@@ -53,95 +51,127 @@
     };
   };
 
-  // (multiple) dynamic file uploads
-  // expects i18n object with following strings:
-  // »filesSelected«: label of multi-upload button after selection
-  //    example: "Dateien ausgewählt" (will be prepended by number of selected files)
-  // »selectFile«: label of single-upload button before selection
-  //    example: "Datei auswählen"
-  // »selectFiles«: label of multi-upload button before selection
-  //    example: "Datei(en) auswählen"
+  /**
+   *
+   * FileUpload Utility
+   *
+   * Attribute: uw-file-upload
+   *  (element must be an input of type='file')
+   *
+   * Example usage:
+   * <input type='file' uw-file-upload>
+   *
+   * Internationalization:
+   *  This utility expects the following translations to be available:
+   *    »filesSelected«: label of multi-upload button after selection
+   *      example: "Dateien ausgewählt" (will be prepended by number of selected files)
+   *    »selectFile«: label of single-upload button before selection
+   *      example: "Datei auswählen"
+   *    »selectFiles«: label of multi-upload button before selection
+   *      example: "Datei(en) auswählen"
+   *
+   */
 
-  var FILE_UPLOAD_INPUT_LIST_CLASS = 'file-input__list';
-  var FILE_UPLOAD_INPUT_UNPACK_CHECKBOX_CLASS = 'file-input__unpack';
-  var FILE_UPLOAD_INPUT_LABEL_CLASS = 'file-input__label';
-  var FILE_UPLOAD_INPUT_HIDDEN_CLASS = 'file-input__input--hidden';
+  var FILE_UPLOAD_UTIL_NAME = 'fileUpload';
+  var FILE_UPLOAD_UTIL_SELECTOR = 'input[type="file"][uw-file-upload]';
 
-  window.utils.fileUpload = function(input, options) {
-    var isMulti = input.hasAttribute('multiple');
-    var fileList = isMulti ? addFileList() : null;
-    var label = addFileLabel();
-    var i18n = options.i18n;
+  var FILE_UPLOAD_CLASS = 'file-input';
+  var FILE_UPLOAD_INITIALIZED_CLASS = 'file-input--initialized';
+  var FILE_UPLOAD_LIST_CLASS = 'file-input__list';
+  var FILE_UPLOAD_UNPACK_CHECKBOX_CLASS = 'file-input__unpack';
+  var FILE_UPLOAD_LABEL_CLASS = 'file-input__label';
 
-    if (!i18n) {
-      throw new Error('window.utils.fileUpload(input, options) needs to be passed i18n object via options');
+  var fileUploadUtil = function(element) {
+    var isMultiFileUpload = false;
+    var fileList;
+    var label;
+
+    function init() {
+      if (!element) {
+        throw new Error('FileUpload utility cannot be setup without an element!');
+      }
+
+      if (element.classList.contains(FILE_UPLOAD_INITIALIZED_CLASS)) {
+        throw new Error('FileUpload utility already initialized!');
+      }
+
+      // check if is multi-file upload
+      isMultiFileUpload = element.hasAttribute('multiple');
+      if (isMultiFileUpload) {
+        fileList = createFileList();
+      }
+
+      label = createFileLabel();
+      updateLabel();
+
+      // add change listener
+      element.addEventListener('change', function() {
+        updateLabel();
+        renderFileList();
+      });
+
+      // add util class for styling and mark as initialized
+      element.classList.add(FILE_UPLOAD_CLASS, FILE_UPLOAD_INITIALIZED_CLASS);
+
+      return {
+        name: FILE_UPLOAD_UTIL_NAME,
+        element: element,
+        destroy: function() {},
+      };
     }
 
-    function renderFileList(files) {
+    function renderFileList() {
+      if (!fileList) {
+        return;
+      }
+
+      var files = element.files;
       fileList.innerHTML = '';
-      Array.from(files).forEach(function(file, index) {
+      Array.from(files).forEach(function(file) {
         var fileDisplayEl = document.createElement('li');
         fileDisplayEl.innerHTML = file.name;
         fileList.appendChild(fileDisplayEl);
       });
     }
 
-    function updateLabel(files) {
-      if (files.length) {
-        if (isMulti) {
-          label.innerText = files.length + ' ' + i18n.filesSelected;
-        } else {
-          label.innerHTML = files[0].name;
-        }
-      } else {
-        resetFileLabel();
-      }
-    }
-
-    function addFileList() {
+    function createFileList() {
       var list = document.createElement('ol');
-      list.classList.add(FILE_UPLOAD_INPUT_LIST_CLASS);
-      var unpackEl = input.parentElement.querySelector('.' + FILE_UPLOAD_INPUT_UNPACK_CHECKBOX_CLASS);
+      list.classList.add(FILE_UPLOAD_LIST_CLASS);
+      var unpackEl = element.parentElement.querySelector('.' + FILE_UPLOAD_UNPACK_CHECKBOX_CLASS);
       if (unpackEl) {
-        input.parentElement.insertBefore(list, unpackEl);
+        element.parentElement.insertBefore(list, unpackEl);
       } else {
-        input.parentElement.appendChild(list);
+        element.parentElement.appendChild(list);
       }
       return list;
     }
 
-    function addFileLabel() {
+    function createFileLabel() {
       var label = document.createElement('label');
-      label.classList.add(FILE_UPLOAD_INPUT_LABEL_CLASS);
-      label.setAttribute('for', input.id);
-      input.parentElement.insertBefore(label, input);
+      label.classList.add(FILE_UPLOAD_LABEL_CLASS);
+      label.setAttribute('for', element.id);
+      element.parentElement.insertBefore(label, element);
       return label;
     }
 
-    function resetFileLabel() {
-      if (isMulti) {
-        label.innerText = i18n.selectFiles;
+    function updateLabel() {
+      var files = element.files;
+      if (files && files.length) {
+        label.innerText = isMultiFileUpload ? files.length + ' ' + I18n.get('filesSelected') : files[0].name;
       } else {
-        label.innerText = i18n.selectFile;
+        label.innerText = isMultiFileUpload ? I18n.get('selectFiles') : I18n.get('selectFile');
       }
     }
 
-    // initial setup
-    resetFileLabel();
-    input.classList.add(FILE_UPLOAD_INPUT_HIDDEN_CLASS);
-    input.addEventListener('change', function() {
-      input.dispatchEvent(new Event('input'));
-      if (isMulti) {
-        renderFileList(input.files);
-      }
+    return init();
+  }
 
-      updateLabel(input.files);
+  if (UtilRegistry) {
+    UtilRegistry.register({
+      name: FILE_UPLOAD_UTIL_NAME,
+      selector: FILE_UPLOAD_UTIL_SELECTOR,
+      setup: fileUploadUtil,
     });
-
-    return {
-      scope: input,
-      destroy: function() {},
-    };
   }
 
   // to remove previously uploaded files
@@ -158,7 +188,7 @@
     }
 
     // initial setup
-    function setup() {
+    function init() {
       var cont = input.parentNode;
       while (cont !== document.body) {
         if (cont.matches('.' + FILE_UPLOAD_CONTAINER_CLASS)) {
@@ -169,12 +199,7 @@
       addListener(cont);
     }
 
-    setup();
-
-    return {
-      scope: input,
-      destroy: function() {},
-    };
+    return init();
   }
 
   // turns native checkboxes into custom ones
diff --git a/templates/multiFileField.hamlet b/templates/multiFileField.hamlet
index 7fbcc896d..0ac0dc594 100644
--- a/templates/multiFileField.hamlet
+++ b/templates/multiFileField.hamlet
@@ -7,7 +7,7 @@ $forall FileUploadInfo{..} <- fileInfos
       <label for=#{fuiHtmlId}>
 
 $# new files
-<input type="file" name=#{fieldName} id=#{fieldId} multiple :req:required="required">
+<input type="file" uw-file-upload name=#{fieldName} id=#{fieldId} multiple :req:required="required">
 
 <div .file-input__multi-info>
     _{MsgMultiFileUploadInfo}
diff --git a/templates/multiFileField.lucius b/templates/multiFileField.lucius
index 21712010e..8d0bf62d2 100644
--- a/templates/multiFileField.lucius
+++ b/templates/multiFileField.lucius
@@ -10,19 +10,6 @@
   }
 }
 
-.file-input__multi-info {
-  font-size: .9rem;
-  font-style: italic;
-  margin-top: 10px;
-  color: var(--color-fontsec);
-}
-
-.file-input__list {
-  margin-left: 15px;
-  margin-top: 10px;
-  font-weight: 600;
-}
-
 .file-container {
   display: flex;
   align-items: center;

From 98fb84f0fc09bef9521f09ab9f7def8caeb59124 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 6 Apr 2019 14:53:37 +0200
Subject: [PATCH 017/238] add fallback for missing translations in JS I18n
 registry

---
 static/js/services/i18n.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/static/js/services/i18n.js b/static/js/services/i18n.js
index 440b1aca5..1e314cab4 100644
--- a/static/js/services/i18n.js
+++ b/static/js/services/i18n.js
@@ -18,6 +18,9 @@
     }
 
     function getTranslation(id) {
+      if (!translations[id]) {
+        return '(translation missing for »' + id + '«)';
+      }
       return translations[id];
     }
 

From c42ec9163ccf7241b17d9bdfe2f6aa8311bcc007 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 6 Apr 2019 15:55:27 +0200
Subject: [PATCH 018/238] remove previously uploaded files JS utility

---
 messages/uniworx/de.msg         |  5 ++++-
 static/css/utils/inputs.scss    | 22 +++++++++++++++++++---
 static/js/utils/inputs.js       | 28 ----------------------------
 templates/multiFileField.hamlet | 21 ++++++++++++++-------
 templates/multiFileField.lucius | 31 -------------------------------
 5 files changed, 37 insertions(+), 70 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 7d51240f3..8ccff193a 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -288,7 +288,10 @@ Settings: Individuelle Benutzereinstellungen
 SettingsUpdate: Einstellungen wurden gespeichert.
 Never: Nie
 
+PreviouslyUploadedInfo: Bereits hochgeladene Dateien:
+PreviouslyUploadedDeletionInfo: (Nicht ausgewählte Dateien werden gelöscht)
 MultiFileUploadInfo: (Mehrere Dateien mit Shift oder Strg auswählen)
+AddMoreFiles: Weitere Dateien hinzufügen:
 
 NrColumn: Nr
 SelectColumn: Auswahl
@@ -723,4 +726,4 @@ DBTIRowsMissing n@Int: #{pluralDE n "Eine Zeile ist" "Einige Zeile sind"} aus de
 MassInputAddDimension: Hinzufügen
 MassInputDeleteCell: Entfernen
 
-NavigationFavourites: Favoriten
\ No newline at end of file
+NavigationFavourites: Favoriten
diff --git a/static/css/utils/inputs.scss b/static/css/utils/inputs.scss
index f2b479979..08cc8fe63 100644
--- a/static/css/utils/inputs.scss
+++ b/static/css/utils/inputs.scss
@@ -210,15 +210,31 @@ option {
   border-radius: 3px;
 }
 
-.file-input__multi-info {
+.file-input__info {
   font-size: .9rem;
   font-style: italic;
-  margin-top: 10px;
+  margin: 10px 0;
   color: var(--color-fontsec);
 }
 
 .file-input__list {
-  margin-left: 15px;
+  margin-left: 40px;
   margin-top: 10px;
   font-weight: 600;
 }
+
+/* PREVIOUSLY UPLOADED FILES */
+
+.file-uploads-label {
+  margin-bottom: 10px;
+}
+
+.file-container {
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+
+.file-container__label + .checkbox {
+  margin-left: 12px;
+}
diff --git a/static/js/utils/inputs.js b/static/js/utils/inputs.js
index b544e2272..5e9d73fff 100644
--- a/static/js/utils/inputs.js
+++ b/static/js/utils/inputs.js
@@ -174,34 +174,6 @@
     });
   }
 
-  // to remove previously uploaded files
-
-  var FILE_UPLOAD_CONTAINER_CLASS = 'file-container';
-  var FILE_UPLOAD_CONTAINER_CHECKED_CLASS = 'file-container--checked';
-
-  window.utils.fileCheckbox = function(input) {
-    // adds eventlistener(s)
-    function addListener(container) {
-      input.addEventListener('change', function(event) {
-        container.classList.toggle(FILE_UPLOAD_CONTAINER_CHECKED_CLASS, this.checked);
-      });
-    }
-
-    // initial setup
-    function init() {
-      var cont = input.parentNode;
-      while (cont !== document.body) {
-        if (cont.matches('.' + FILE_UPLOAD_CONTAINER_CLASS)) {
-          break;
-        }
-        cont = cont.parentNode;
-      }
-      addListener(cont);
-    }
-
-    return init();
-  }
-
   // turns native checkboxes into custom ones
   window.utils.checkbox = function(input) {
 
diff --git a/templates/multiFileField.hamlet b/templates/multiFileField.hamlet
index 0ac0dc594..7e91e00b2 100644
--- a/templates/multiFileField.hamlet
+++ b/templates/multiFileField.hamlet
@@ -1,15 +1,22 @@
 $newline never
-$forall FileUploadInfo{..} <- fileInfos
-  <div .file-container :fuiChecked:.file-container--checked>
-    <label .file-container__label.btn for=#{fuiHtmlId}>#{fuiTitle}
-    <div .checkbox>
-      <input .file-container__checkbox.file-checkbox id=#{fuiHtmlId} name=#{fieldName} :fuiChecked:checked value=#{toPathPiece fuiId} type="checkbox">
-      <label for=#{fuiHtmlId}>
+<!-- TODO: add $if to check if there were files uploaded already -->
+  <div .file-uploads-label>_{MsgPreviouslyUploadedInfo}
+  <ol .file-input__list>
+    $forall FileUploadInfo{..} <- fileInfos
+      <li>
+        <div .file-container>
+          <label for=#{fuiHtmlId}>#{fuiTitle}
+          <input type="checkbox" uw-checkbox id=#{fuiHtmlId} name=#{fieldName} :fuiChecked:checked value=#{toPathPiece fuiId}>
+
+  <div .file-input__info>
+    _{MsgPreviouslyUploadedDeletionInfo}
+
+  <div .file-uploads-label>_{MsgAddMoreFiles}
 
 $# new files
 <input type="file" uw-file-upload name=#{fieldName} id=#{fieldId} multiple :req:required="required">
 
-<div .file-input__multi-info>
+<div .file-input__info>
     _{MsgMultiFileUploadInfo}
 
 <div .file-input__unpack>
diff --git a/templates/multiFileField.lucius b/templates/multiFileField.lucius
index 8d0bf62d2..7c2d489a5 100644
--- a/templates/multiFileField.lucius
+++ b/templates/multiFileField.lucius
@@ -9,34 +9,3 @@
     margin-left: 7px;
   }
 }
-
-.file-container {
-  display: flex;
-  align-items: center;
-  margin-bottom: 20px;
-
-  &.file-container--checked {
-
-    &::after {
-      content: none;
-    }
-
-    .file-container__label {
-      opacity: 1;
-    }
-  }
-
-  &::after {
-    /* TODO: get this from .msg-file */
-    content: '(wird entfernt)';
-    margin-left: 12px;
-  }
-
-  .checkbox {
-    margin-left: 12px;
-  }
-}
-
-.file-container__label {
-  opacity: 0.4;
-}

From 8472a517877948a551dbfaa23b78a185a377452d Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 6 Apr 2019 18:39:28 +0200
Subject: [PATCH 019/238] rename fileUpload utility to fileInput utility

---
 static/js/utils/inputs.js       | 77 ++++++++++++++++++---------------
 templates/multiFileField.hamlet |  2 +-
 2 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/static/js/utils/inputs.js b/static/js/utils/inputs.js
index 5e9d73fff..294fbae05 100644
--- a/static/js/utils/inputs.js
+++ b/static/js/utils/inputs.js
@@ -1,6 +1,8 @@
 (function() {
   'use strict';
 
+  var inputUtilities = [];
+
   var JS_INITIALIZED_CLASS = 'js-inputs-initialized';
 
   window.utils.inputs = function(wrapper, options) {
@@ -53,51 +55,52 @@
 
   /**
    *
-   * FileUpload Utility
+   * FileInput Utility
+   *  wraps native file input
    *
-   * Attribute: uw-file-upload
+   * Attribute: uw-file-input
    *  (element must be an input of type='file')
    *
    * Example usage:
-   * <input type='file' uw-file-upload>
+   * <input type='file' uw-file-input>
    *
    * Internationalization:
    *  This utility expects the following translations to be available:
-   *    »filesSelected«: label of multi-upload button after selection
+   *    »filesSelected«: label of multi-input button after selection
    *      example: "Dateien ausgewählt" (will be prepended by number of selected files)
-   *    »selectFile«: label of single-upload button before selection
+   *    »selectFile«: label of single-input button before selection
    *      example: "Datei auswählen"
-   *    »selectFiles«: label of multi-upload button before selection
+   *    »selectFiles«: label of multi-input button before selection
    *      example: "Datei(en) auswählen"
    *
    */
 
-  var FILE_UPLOAD_UTIL_NAME = 'fileUpload';
-  var FILE_UPLOAD_UTIL_SELECTOR = 'input[type="file"][uw-file-upload]';
+  var FILE_INPUT_UTIL_NAME = 'fileInput';
+  var FILE_INPUT_UTIL_SELECTOR = 'input[type="file"][uw-file-input]';
 
-  var FILE_UPLOAD_CLASS = 'file-input';
-  var FILE_UPLOAD_INITIALIZED_CLASS = 'file-input--initialized';
-  var FILE_UPLOAD_LIST_CLASS = 'file-input__list';
-  var FILE_UPLOAD_UNPACK_CHECKBOX_CLASS = 'file-input__unpack';
-  var FILE_UPLOAD_LABEL_CLASS = 'file-input__label';
+  var FILE_INPUT_CLASS = 'file-input';
+  var FILE_INPUT_INITIALIZED_CLASS = 'file-input--initialized';
+  var FILE_INPUT_LIST_CLASS = 'file-input__list';
+  var FILE_INPUT_UNPACK_CHECKBOX_CLASS = 'file-input__unpack';
+  var FILE_INPUT_LABEL_CLASS = 'file-input__label';
 
-  var fileUploadUtil = function(element) {
-    var isMultiFileUpload = false;
+  var fileInputUtil = function(element) {
+    var isMultiFileInput = false;
     var fileList;
     var label;
 
     function init() {
       if (!element) {
-        throw new Error('FileUpload utility cannot be setup without an element!');
+        throw new Error('FileInput utility cannot be setup without an element!');
       }
 
-      if (element.classList.contains(FILE_UPLOAD_INITIALIZED_CLASS)) {
-        throw new Error('FileUpload utility already initialized!');
+      if (element.classList.contains(FILE_INPUT_INITIALIZED_CLASS)) {
+        throw new Error('FileInput utility already initialized!');
       }
 
-      // check if is multi-file upload
-      isMultiFileUpload = element.hasAttribute('multiple');
-      if (isMultiFileUpload) {
+      // check if is multi-file input
+      isMultiFileInput = element.hasAttribute('multiple');
+      if (isMultiFileInput) {
         fileList = createFileList();
       }
 
@@ -111,10 +114,10 @@
       });
 
       // add util class for styling and mark as initialized
-      element.classList.add(FILE_UPLOAD_CLASS, FILE_UPLOAD_INITIALIZED_CLASS);
+      element.classList.add(FILE_INPUT_CLASS, FILE_INPUT_INITIALIZED_CLASS);
 
       return {
-        name: FILE_UPLOAD_UTIL_NAME,
+        name: FILE_INPUT_UTIL_NAME,
         element: element,
         destroy: function() {},
       };
@@ -136,8 +139,8 @@
 
     function createFileList() {
       var list = document.createElement('ol');
-      list.classList.add(FILE_UPLOAD_LIST_CLASS);
-      var unpackEl = element.parentElement.querySelector('.' + FILE_UPLOAD_UNPACK_CHECKBOX_CLASS);
+      list.classList.add(FILE_INPUT_LIST_CLASS);
+      var unpackEl = element.parentElement.querySelector('.' + FILE_INPUT_UNPACK_CHECKBOX_CLASS);
       if (unpackEl) {
         element.parentElement.insertBefore(list, unpackEl);
       } else {
@@ -148,7 +151,7 @@
 
     function createFileLabel() {
       var label = document.createElement('label');
-      label.classList.add(FILE_UPLOAD_LABEL_CLASS);
+      label.classList.add(FILE_INPUT_LABEL_CLASS);
       label.setAttribute('for', element.id);
       element.parentElement.insertBefore(label, element);
       return label;
@@ -157,22 +160,21 @@
     function updateLabel() {
       var files = element.files;
       if (files && files.length) {
-        label.innerText = isMultiFileUpload ? files.length + ' ' + I18n.get('filesSelected') : files[0].name;
+        label.innerText = isMultiFileInput ? files.length + ' ' + I18n.get('filesSelected') : files[0].name;
       } else {
-        label.innerText = isMultiFileUpload ? I18n.get('selectFiles') : I18n.get('selectFile');
+        label.innerText = isMultiFileInput ? I18n.get('selectFiles') : I18n.get('selectFile');
       }
     }
 
     return init();
   }
 
-  if (UtilRegistry) {
-    UtilRegistry.register({
-      name: FILE_UPLOAD_UTIL_NAME,
-      selector: FILE_UPLOAD_UTIL_SELECTOR,
-      setup: fileUploadUtil,
-    });
-  }
+  inputUtilities.push({
+    name: FILE_INPUT_UTIL_NAME,
+    selector: FILE_INPUT_UTIL_SELECTOR,
+    setup: fileInputUtil,
+  })
+
 
   // turns native checkboxes into custom ones
   window.utils.checkbox = function(input) {
@@ -247,4 +249,9 @@
       },
     };
   }
+
+  // register input utilities
+  if (UtilRegistry) {
+    inputUtilities.forEach(UtilRegistry.register);
+  }
 })();
diff --git a/templates/multiFileField.hamlet b/templates/multiFileField.hamlet
index 7e91e00b2..17c46197a 100644
--- a/templates/multiFileField.hamlet
+++ b/templates/multiFileField.hamlet
@@ -14,7 +14,7 @@ $newline never
   <div .file-uploads-label>_{MsgAddMoreFiles}
 
 $# new files
-<input type="file" uw-file-upload name=#{fieldName} id=#{fieldId} multiple :req:required="required">
+<input type="file" uw-file-input name=#{fieldName} id=#{fieldId} multiple :req:required="required">
 
 <div .file-input__info>
     _{MsgMultiFileUploadInfo}

From 39338c9b0d0b9f6a2b63c7cfb94f41774d87ed65 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 6 Apr 2019 18:50:39 +0200
Subject: [PATCH 020/238] refactor checkbox JS utility

---
 static/css/utils/inputs.scss    |  6 +--
 static/js/utils/inputs.js       | 73 +++++++++++++++++++++++++--------
 templates/multiFileField.hamlet |  4 +-
 3 files changed, 61 insertions(+), 22 deletions(-)

diff --git a/static/css/utils/inputs.scss b/static/css/utils/inputs.scss
index 08cc8fe63..8169ec170 100644
--- a/static/css/utils/inputs.scss
+++ b/static/css/utils/inputs.scss
@@ -233,8 +233,8 @@ option {
   display: flex;
   align-items: center;
   margin-bottom: 10px;
-}
 
-.file-container__label + .checkbox {
-  margin-left: 12px;
+  .checkbox {
+    margin-left: 12px;
+  }
 }
diff --git a/static/js/utils/inputs.js b/static/js/utils/inputs.js
index 294fbae05..eca09c94a 100644
--- a/static/js/utils/inputs.js
+++ b/static/js/utils/inputs.js
@@ -175,33 +175,72 @@
     setup: fileInputUtil,
   })
 
+  /**
+   *
+   * Checkbox Utility
+   *  wraps native checkbox
+   *
+   * Attribute: uw-checkbox
+   *  (element must be an input of type='checkbox')
+   *
+   * Example usage:
+   * <input type='checkbox' uw-checkbox>
+   *
+   */
 
-  // turns native checkboxes into custom ones
-  window.utils.checkbox = function(input) {
+  var CHECKBOX_UTIL_NAME = 'checkbox';
+  var CHECKBOX_UTIL_SELECTOR = 'input[type="checkbox"][uw-checkbox]';
+
+  var CHECKBOX_CLASS = 'checkbox';
+  var CHECKBOX_INITIALIZED_CLASS = 'checkbox--initialized';
+
+  var checkboxUtil = function(element) {
+
+    function init() {
+      if (!element) {
+        throw new Error('Checkbox utility cannot be setup without an element!');
+      }
+
+      if (element.classList.contains(CHECKBOX_INITIALIZED_CLASS)) {
+        throw new Error('Checkbox utility already initialized!');
+      }
+
+      if (element.parentElement.classList.contains(CHECKBOX_CLASS)) {
+        throw new Error('Checkbox element\'s wrapper already has class "' + CHECKBOX_CLASS + '"!');
+      }
+
+      var siblingEl = element.nextElementSibling;
+      var parentEl = element.parentElement;
 
-    if (!input.parentElement.classList.contains('checkbox')) {
-      var parentEl = input.parentElement;
-      var siblingEl = input.nextElementSibling;
       var wrapperEl = document.createElement('div');
+      wrapperEl.classList.add(CHECKBOX_CLASS);
+
       var labelEl = document.createElement('label');
-      wrapperEl.classList.add('checkbox');
-      labelEl.setAttribute('for', input.id);
-      wrapperEl.appendChild(input);
+      labelEl.setAttribute('for', element.id);
+
+      wrapperEl.appendChild(element);
       wrapperEl.appendChild(labelEl);
 
-      if (siblingEl) {
-        parentEl.insertBefore(wrapperEl, siblingEl);
-      } else {
-        parentEl.appendChild(wrapperEl);
-      }
+      parentEl.insertBefore(wrapperEl, siblingEl);
+
+      element.classList.add(CHECKBOX_INITIALIZED_CLASS);
+
+      return {
+        name: CHECKBOX_UTIL_NAME,
+        element: element,
+        destroy: function() {},
+      };
     }
 
-    return {
-      scope: input,
-      destroy: function() {},
-    };
+    return init();
   }
 
+  inputUtilities.push({
+    name: CHECKBOX_UTIL_NAME,
+    selector: CHECKBOX_UTIL_SELECTOR,
+    setup: checkboxUtil,
+  });
+
   // turns native radio buttons into custom ones
   window.utils.radio = function(input) {
 
diff --git a/templates/multiFileField.hamlet b/templates/multiFileField.hamlet
index 17c46197a..c64686d47 100644
--- a/templates/multiFileField.hamlet
+++ b/templates/multiFileField.hamlet
@@ -6,7 +6,7 @@ $newline never
       <li>
         <div .file-container>
           <label for=#{fuiHtmlId}>#{fuiTitle}
-          <input type="checkbox" uw-checkbox id=#{fuiHtmlId} name=#{fieldName} :fuiChecked:checked value=#{toPathPiece fuiId}>
+          <input type=checkbox uw-checkbox id=#{fuiHtmlId} name=#{fieldName} :fuiChecked:checked value=#{toPathPiece fuiId}>
 
   <div .file-input__info>
     _{MsgPreviouslyUploadedDeletionInfo}
@@ -21,7 +21,7 @@ $# new files
 
 <div .file-input__unpack>
   <label for=#{fieldId}_zip>ZIPs automatisch entpacken
-  <input type=checkbox id=#{fieldId}_zip name=#{fieldName} value=#{unpackZips}>
+  <input type=checkbox uw-checkbox id=#{fieldId}_zip name=#{fieldName} value=#{unpackZips}>
   <div class="tooltip">
     <div class="tooltip__handle">
     <div class="tooltip__content">Entpackt hochgeladene Zip-Dateien (*.zip) automatisch und fügt den Inhalt dem Stamm-Verzeichnis der Abgabe hinzu.

From a581640f7ee297b2bbd05af11f4a9d5066831ac5 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 6 Apr 2019 19:16:48 +0200
Subject: [PATCH 021/238] remove radio button js utility

---
 static/css/utils/radio.scss |  4 ----
 static/js/utils/inputs.js   | 23 -----------------------
 2 files changed, 27 deletions(-)

diff --git a/static/css/utils/radio.scss b/static/css/utils/radio.scss
index a832de842..1b26ae1ae 100644
--- a/static/css/utils/radio.scss
+++ b/static/css/utils/radio.scss
@@ -5,10 +5,6 @@
   display: flex;
 }
 
-.radio-group__option {
-  min-width: 30px;
-}
-
 .radio {
   position: relative;
   display: inline-block;
diff --git a/static/js/utils/inputs.js b/static/js/utils/inputs.js
index eca09c94a..e46bd48e5 100644
--- a/static/js/utils/inputs.js
+++ b/static/js/utils/inputs.js
@@ -241,29 +241,6 @@
     setup: checkboxUtil,
   });
 
-  // turns native radio buttons into custom ones
-  window.utils.radio = function(input) {
-
-    if (!input.parentElement.classList.contains('radio')) {
-      var parentEl = input.parentElement;
-      var siblingEl = input.nextElementSibling;
-      var wrapperEl = document.createElement('div');
-      wrapperEl.classList.add('radio');
-      wrapperEl.appendChild(input);
-
-      if (siblingEl && siblingEl.matches('label')) {
-        wrapperEl.appendChild(siblingEl);
-      }
-
-      parentEl.appendChild(wrapperEl);
-    }
-
-    return {
-      scope: input,
-      destroy: function() {},
-    };
-  }
-
   // Override implicit submit (pressing enter) behaviour to trigger a specified submit button instead of the default
   window.utils.implicitSubmit = function(input, options) {
     var submit = options.submit;

From 8a33c7df34e1dfbfcb651c09fef1c962455a0115 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 7 Apr 2019 12:54:32 +0200
Subject: [PATCH 022/238] remove obsolete manual inputs JS setup code

---
 src/Handler/Utils/Table.hs |  3 +-
 static/js/utils/inputs.js  | 62 +++++---------------------------------
 2 files changed, 9 insertions(+), 56 deletions(-)

diff --git a/src/Handler/Utils/Table.hs b/src/Handler/Utils/Table.hs
index 811da9e2f..06a49d7b6 100644
--- a/src/Handler/Utils/Table.hs
+++ b/src/Handler/Utils/Table.hs
@@ -63,9 +63,10 @@ headedRowSelector toExternal fromExternal attrs colonnade tdata = do
                 -> return Nothing
 
         view _ name attributes val _ =
+          -- TODO: move this to a *.hamlet file
           [whamlet|
             <label style="display: block">
-              <input type=checkbox name=#{name} value=#{toPathPiece extId} *{attributes} :isRight val:checked>
+              <input type=checkbox uw-checkbox name=#{name} value=#{toPathPiece extId} *{attributes} :isRight val:checked>
           |]
 
   selectionIdent <- newFormIdent
diff --git a/static/js/utils/inputs.js b/static/js/utils/inputs.js
index e46bd48e5..90c9a4caa 100644
--- a/static/js/utils/inputs.js
+++ b/static/js/utils/inputs.js
@@ -3,56 +3,6 @@
 
   var inputUtilities = [];
 
-  var JS_INITIALIZED_CLASS = 'js-inputs-initialized';
-
-  window.utils.inputs = function(wrapper, options) {
-    options = options || {};
-    var utilInstances = [];
-
-    if (wrapper.classList.contains(JS_INITIALIZED_CLASS) && !options.force) {
-      return false;
-    }
-
-    // checkboxes
-    var checkboxes = Array.from(wrapper.querySelectorAll('input[type="checkbox"]'));
-    checkboxes.forEach(function(checkbox) {
-      utilInstances.push(window.utils.setup('checkbox', checkbox));
-    });
-
-    // radios
-    var radios = Array.from(wrapper.querySelectorAll('input[type="radio"]'));
-    radios.forEach(function(radio) {
-      utilInstances.push(window.utils.setup('radio', radio));
-    });
-
-    // file-uploads
-    var fileUploads = Array.from(wrapper.querySelectorAll('input[type="file"]'));
-    fileUploads.forEach(function(input) {
-      utilInstances.push(window.utils.setup('fileUpload', input, options));
-    });
-
-    // file-checkboxes
-    var fileCheckboxes = Array.from(wrapper.querySelectorAll('.file-checkbox'));
-    fileCheckboxes.forEach(function(input) {
-      utilInstances.push(window.utils.setup('fileCheckbox', input, options));
-    });
-
-    function destroyUtils() {
-      utilInstances.filter(function(utilInstance) {
-        return !!utilInstance;
-      }).forEach(function(utilInstance) {
-        utilInstance.destroy();
-      });
-    }
-
-    wrapper.classList.add(JS_INITIALIZED_CLASS);
-
-    return {
-      scope: wrapper,
-      destroy: destroyUtils,
-    };
-  };
-
   /**
    *
    * FileInput Utility
@@ -241,6 +191,13 @@
     setup: checkboxUtil,
   });
 
+  // register the collected input utilities
+  if (UtilRegistry) {
+    inputUtilities.forEach(UtilRegistry.register);
+  }
+
+  // FH: leaving this as it is to be able to understand whats going on
+
   // Override implicit submit (pressing enter) behaviour to trigger a specified submit button instead of the default
   window.utils.implicitSubmit = function(input, options) {
     var submit = options.submit;
@@ -265,9 +222,4 @@
       },
     };
   }
-
-  // register input utilities
-  if (UtilRegistry) {
-    inputUtilities.forEach(UtilRegistry.register);
-  }
 })();

From 2c04f6f67013afd94d93efb48423e972a25c4df6 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 7 Apr 2019 13:48:58 +0200
Subject: [PATCH 023/238] refactor reactive submit button JS utility

---
 src/Foundation.hs       |   2 +-
 static/js/utils/form.js | 151 ++++++++++++++++++++++++++++------------
 2 files changed, 109 insertions(+), 44 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 047a69955..3692aa39c 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1075,8 +1075,8 @@ siteLayout' headingOverride widget = do
       -- addScript $ StaticR js_utils_asyncTableFilter_js
       -- addScript $ StaticR js_utils_checkAll_js
       -- addScript $ StaticR js_utils_httpClient_js
-      -- addScript $ StaticR js_utils_form_js
       -- JavaScript utils
+      addScript $ StaticR js_utils_form_js
       addScript $ StaticR js_utils_inputs_js
       addScript $ StaticR js_utils_modal_js
       addScript $ StaticR js_utils_poc_js
diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index 77437a3e1..ffb6e5f5c 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -3,25 +3,15 @@
 
   window.utils = window.utils || {};
 
+  var formUtilities = [];
+
   var JS_INITIALIZED = 'js-form-initialized';
-  var SUBMIT_BUTTON_SELECTOR = '[type="submit"]:not([formnovalidate])';
   var AUTOSUBMIT_BUTTON_SELECTOR = '[type="submit"][data-autosubmit]';
   var AJAX_SUBMIT_FLAG = 'ajaxSubmit';
 
   var FORM_GROUP_CLASS = 'form-group';
   var FORM_GROUP_WITH_ERRORS_CLASS = 'form-group--has-error';
 
-  function formValidator(inputs) {
-    var done = true;
-    inputs.forEach(function(inp) {
-      var len = inp.value.trim().length;
-      if (done && len === 0) {
-        done = false;
-      }
-    });
-    return done;
-  }
-
   window.utils.form = function(form, options) {
     options = options || {};
 
@@ -77,50 +67,119 @@
     };
   };
 
-  // registers input-listener for each element in <inputs> (array) and
-  // enables <button> if <formValidator> for these inputs returns true
-  window.utils.reactiveButton = function(form, options) {
-    var button = form.querySelector(SUBMIT_BUTTON_SELECTOR);
-    var requireds = Array.from(form.querySelectorAll('[required]'));
+  /**
+   *
+   * Reactive Submit Button Utility
+   *  disables a forms LAST sumit button as long as the required inputs are invalid
+   *  (only checks if the value of the inputs are not empty)
+   *
+   * Attribute: uw-reactive-submit-button
+   *  works only on `form` elements
+   *
+   * Params:
+   *  data-formnorequired: string
+   *    If present the submit button will never get disabled
+   *
+   * Example usage:
+   *  <form uw-reactive-submit-button>
+   *   <input type="text" required>
+   *   <button type="submit">
+   *  </form>
+   */
 
-    if (!button || button.matches(AUTOSUBMIT_BUTTON_SELECTOR)) {
-      return false;
+  var REACTIVE_SUBMIT_BUTTON_UTIL_NAME = 'reactiveSubmitButton';
+  var REACTIVE_SUBMIT_BUTTON_UTIL_SELECTOR = 'form';
+
+  var REACTIVE_SUBMIT_BUTTON_INITIALIZED_CLASS = 'reactive-submit-button--initialized';
+
+  var reactiveButtonUtil = function(element) {
+    var requiredInputs;
+    var submitButton;
+
+    function init() {
+      if (!element) {
+        throw new Error('Reactive Submit Button utility cannot be setup without an element!');
+      }
+
+      if (element.classList.contains(REACTIVE_SUBMIT_BUTTON_INITIALIZED_CLASS)) {
+        throw new Error('Reactive Submit Button utility already initialized!');
+      }
+
+      // abort if form has param data-formnorequired
+      if (element.dataset.formnorequired !== undefined) {
+        throw new Error('Form has formnorequired data attribute. Will skip setup of reactive submit button.');
+      }
+
+      requiredInputs = Array.from(element.querySelectorAll('[required]'));
+      if (!requiredInputs) {
+        // abort if form has no required inputs
+        throw new Error('Submit button has formnorequired data attribute. Will skip setup of reactive submit button.');
+      }
+
+      var submitButtons = Array.from(element.querySelectorAll('[type="submit"]'));
+      if (!submitButtons) {
+        throw new Error('Reactive Submit Button utility couldn\'t find any submit buttons!');
+      }
+      submitButton = submitButtons.reverse()[0];
+      // abort if form has param data-formnorequired
+      if (submitButton.dataset.formnorequired !== undefined) {
+        return false;
+      }
+
+      setupInputs();
+      updateButtonState();
+
+      element.classList.add(REACTIVE_SUBMIT_BUTTON_INITIALIZED_CLASS);
+
+      return {
+        name: REACTIVE_SUBMIT_BUTTON_UTIL_NAME,
+        element: element,
+        destroy: function() {},
+      };
     }
 
-    if (requireds.length == 0) {
-      return false;
-    }
-
-    if (typeof button.dataset.formnorequired !== 'undefined' && button.dataset.formnorequired !== null) {
-      button.addEventListener('click', function() {
-        form.submit();
+    function setupInputs() {
+      requiredInputs.forEach(function(el) {
+        var checkbox = el.getAttribute('type') === 'checkbox';
+        var eventType = checkbox ? 'change' : 'input';
+        el.addEventListener(eventType, function() {
+          updateButtonState();
+        });
       });
-      return false;
     }
-    updateButtonState();
-
-    requireds.forEach(function(el) {
-      var checkbox = el.getAttribute('type') === 'checkbox';
-      var eventType = checkbox ? 'change' : 'input';
-      el.addEventListener(eventType, function() {
-        updateButtonState();
-      });
-    });
 
     function updateButtonState() {
-      if (formValidator(requireds) === true) {
-        button.removeAttribute('disabled');
+      if (inputsValid()) {
+        submitButton.removeAttribute('disabled');
       } else {
-        button.setAttribute('disabled', 'true');
+        console.log('setting disabled', { submitButton });
+        submitButton.setAttribute('disabled', 'true');
       }
     }
 
-    return {
-      scope: form,
-      destroy: function() {},
-    };
+    function inputsValid() {
+      var done = true;
+      requiredInputs.forEach(function(inp) {
+        var len = inp.value.trim().length;
+        if (done && len === 0) {
+          done = false;
+        }
+      });
+      return done;
+    }
+
+    return init();
   };
 
+  formUtilities.push({
+    name: REACTIVE_SUBMIT_BUTTON_UTIL_NAME,
+    selector: REACTIVE_SUBMIT_BUTTON_UTIL_SELECTOR,
+    setup: reactiveButtonUtil,
+  });
+
+
+
+
   window.utils.interactiveFieldset = function(form, options) {
     options = options || {};
     var fieldSets = options.fieldSets;
@@ -199,4 +258,10 @@
       },
     };
   };
+
+  // register the collected form utilities
+  if (UtilRegistry) {
+    formUtilities.forEach(UtilRegistry.register);
+  }
+
 })();

From c32fee8a9b4f6915297a8e5e29d7ac5975915bac Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 7 Apr 2019 13:53:41 +0200
Subject: [PATCH 024/238] add debug switch for console outputs in JS
 utilRegistry

---
 static/js/services/utilRegistry.js | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/static/js/services/utilRegistry.js b/static/js/services/utilRegistry.js
index 9acff588d..74046aded 100644
--- a/static/js/services/utilRegistry.js
+++ b/static/js/services/utilRegistry.js
@@ -4,6 +4,8 @@
   var registeredUtils = [];
   var activeUtilInstances = [];
 
+  var DEBUG_MODE = 2;
+
   // Registry
   // (revealing module pattern)
   window.UtilRegistry = (function() {
@@ -24,7 +26,13 @@
      * @param util Object Utility that should be added to the registry
      */
     function registerUtil(util) {
-      console.log('registering util', util);
+      if (DEBUG_MODE > 0) {
+        console.log('registering util "' + util.name + '"');
+      }
+      if (DEBUG_MODE > 2) {
+        console.log({ util });
+      }
+
       registeredUtils.push(util);
     }
 
@@ -41,14 +49,16 @@
     }
 
     function setupAllUtils() {
-      console.log('setting up all registered utils');
       registeredUtils.forEach(function(util) {
         setupUtil(util);
       });
     }
 
     function setupUtil(util, scope) {
-      console.log('setting up util', { util });
+      if (DEBUG_MODE > 2) {
+        console.log('setting up util', { util });
+      }
+
       scope = scope || document;
 
       if (util && typeof util.setup === 'function') {
@@ -60,7 +70,9 @@
           try {
             utilInstance = util.setup(element);
           } catch(err) {
-            console.warn('Error while trying to initialize a utility!', { util , element, err });
+            if (DEBUG_MODE > 0) {
+              console.warn('Error while trying to initialize a utility!', { util , element, err });
+            }
           }
 
           if (utilInstance) {

From bc76d858f8a6efa41cf148e335b4546b7d6e39c7 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 7 Apr 2019 16:17:10 +0200
Subject: [PATCH 025/238] More standard-conform emails

---
 messages/uniworx/de.msg                       |  2 ++
 src/Foundation.hs                             |  2 +-
 src/Handler/Help.hs                           | 20 +++++++++++--------
 src/Jobs/Handler/HelpRequest.hs               |  8 +++++---
 .../SendNotification/CorrectionsAssigned.hs   |  1 +
 .../CorrectionsNotDistributed.hs              |  1 +
 .../Handler/SendNotification/SheetActive.hs   |  1 +
 .../Handler/SendNotification/SheetInactive.hs |  2 ++
 .../SendNotification/SubmissionRated.hs       |  1 +
 .../SendNotification/UserRightsUpdate.hs      |  1 +
 src/Jobs/Handler/SendTestEmail.hs             |  1 +
 src/Jobs/Types.hs                             |  5 ++++-
 src/Mail.hs                                   | 16 +++++++++++++--
 13 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index e5eed4900..5786e1f13 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -510,6 +510,7 @@ MailLecturerRights n@Int: Als Dozent dürfen Sie Veranstaltungen innerhalb #{plu
 
 MailEditNotifications: Benachrichtigungen ein-/ausschalten
 MailSubjectSupport: Supportanfrage
+MailSubjectSupportCustom customSubject@Text: [Support] #{customSubject}
 
 SheetGrading: Bewertung
 SheetGradingPoints maxPoints@Points: #{tshow maxPoints} Punkte
@@ -584,6 +585,7 @@ HelpAnswer: Antworten an
 HelpUser: Meinen Benutzeraccount
 HelpAnonymous: Keine Antwort (Anonym)
 HelpEmail: E-Mail
+HelpSubject: Betreff
 HelpRequest: Supportanfrage / Verbesserungsvorschlag
 HelpProblemPage: Problematische Seite
 HelpIntroduction: Wenn Ihnen die Benutzung dieser Webseite Schwierigkeiten bereitet oder Sie einen verbesserbaren Umstand entdecken bitten wir Sie uns das zu melden, auch wenn Sie Ihr Problem bereits selbst lösen konnten. Wir passen die Seite ständig an und versuchen sie auch für zukünftige Benutzer so einsichtig wie möglich zu halten.
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 0d8e5d909..0599f7b32 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -2221,7 +2221,7 @@ instance YesodMail UniWorX where
   mailT ctx mail = defMailT ctx $ do
     void setMailObjectId
     setDateCurrent
-    replaceMailHeader "Auto-Submitted" $ Just "auto-generated"
+    replaceMailHeader "Sender" . Just . addressEmail =<< getsYesod (view _appMailFrom)
 
     ret <- mail
 
diff --git a/src/Handler/Help.hs b/src/Handler/Help.hs
index 39c1f5381..a1547b4c1 100644
--- a/src/Handler/Help.hs
+++ b/src/Handler/Help.hs
@@ -16,16 +16,18 @@ nullaryPathPiece ''HelpIdentOptions (camelToPathPiece' 1)
 embedRenderMessage ''UniWorX ''HelpIdentOptions (("Help" <>) . dropPrefix "HI")
 
 data HelpForm = HelpForm
-  { hfReferer:: Maybe (Route UniWorX)
-  , hfUserId :: Either (Maybe Address) UserId
-  , hfRequest:: Text
+  { hfReferer :: Maybe (Route UniWorX)
+  , hfUserId  :: Either (Maybe Address) UserId
+  , hfSubject :: Maybe Text
+  , hfRequest :: Text
   }
 
-helpForm :: Maybe (Route UniWorX) -> Maybe UserId -> AForm _ HelpForm
-helpForm mReferer mUid = HelpForm
+helpForm :: (forall msg. RenderMessage UniWorX msg => msg -> Text) -> Maybe (Route UniWorX) -> Maybe UserId -> AForm _ HelpForm
+helpForm mr mReferer mUid = HelpForm
     <$> aopt routeField (fslI MsgHelpProblemPage & inputReadonly) (Just <$> mReferer)
     <*> multiActionA (fslI MsgHelpAnswer) identActions (HIUser <$ mUid)
-    <*> (unTextarea <$> areq textareaField (fslI MsgHelpRequest) Nothing)
+    <*> aopt textField (fslpI MsgHelpSubject $ mr MsgHelpSubject) Nothing
+    <*> (unTextarea <$> areq textareaField (fslpI MsgHelpRequest $ mr MsgHelpRequest) Nothing)
   where
     identActions :: Map _ (AForm _ (Either (Maybe Address) UserId))
     identActions = Map.fromList $ case mUid of
@@ -33,7 +35,7 @@ helpForm mReferer mUid = HelpForm
       Nothing    -> defaultActions
 
     defaultActions =
-      [ (HIEmail, Left . Just <$> (Address <$> aopt textField (fslI MsgName) Nothing <*> apreq emailField (fslI MsgEMail) Nothing))
+      [ (HIEmail, Left . Just <$> (Address <$> aopt textField (fslpI MsgName $ mr MsgName) Nothing <*> apreq emailField (fslpI MsgEMail $ mr MsgEMail) Nothing))
       , (HIAnonymous, pure $ Left Nothing)
       ]
 
@@ -43,8 +45,9 @@ postHelpR = do
   mUid <- maybeAuthId
   mReferer <- flip formResultMaybe return <=< runInputGetResult $ iopt routeField (toPathPiece GetReferer)
   isModal <- hasCustomHeader HeaderIsModal
+  MsgRenderer mr <- getMsgRenderer
 
-  ((res,formWidget),formEnctype) <- runFormPost $ renderAForm FormStandard $ helpForm mReferer mUid
+  ((res,formWidget),formEnctype) <- runFormPost $ renderAForm FormStandard $ helpForm mr mReferer mUid
   let form = wrapForm formWidget def
         { formAction = Just $ SomeRoute HelpR
         , formEncoding = formEnctype
@@ -56,6 +59,7 @@ postHelpR = do
     hfReferer' <- traverse toTextUrl hfReferer
     queueJob' JobHelpRequest
       { jSender      = hfUserId
+      , jHelpSubject = hfSubject
       , jHelpRequest = hfRequest
       , jRequestTime = now
       , jReferer     = hfReferer'
diff --git a/src/Jobs/Handler/HelpRequest.hs b/src/Jobs/Handler/HelpRequest.hs
index 1ec904e2b..2b92c0e2b 100644
--- a/src/Jobs/Handler/HelpRequest.hs
+++ b/src/Jobs/Handler/HelpRequest.hs
@@ -16,10 +16,11 @@ import Data.Bitraversable
 
 dispatchJobHelpRequest :: Either (Maybe Address) UserId
                        -> UTCTime
+                       -> Maybe Text -- ^ Help Subject
                        -> Text -- ^ Help Request
                        -> Maybe Text -- ^ Referer
                        -> Handler ()
-dispatchJobHelpRequest jSender jRequestTime jHelpRequest jReferer = do
+dispatchJobHelpRequest jSender jRequestTime jHelpSubject jHelpRequest jReferer = do
   supportAddress <- getsYesod $ appMailSupport . appSettings
   userInfo <- bitraverse return (runDB . getEntity) jSender
   let userAddress = either
@@ -28,8 +29,9 @@ dispatchJobHelpRequest jSender jRequestTime jHelpRequest jReferer = do
         userInfo
   mailT def $ do
     _mailTo .= [supportAddress]
-    whenIsJust userAddress $ addMailHeader "Reply-To" . renderAddress
-    setSubjectI MsgMailSubjectSupport
+    whenIsJust userAddress (_mailFrom .=)
+    replaceMailHeader "Auto-Submitted" $ Just "no"
+    setSubjectI $ maybe MsgMailSubjectSupport MsgMailSubjectSupportCustom jHelpSubject
     setDate jRequestTime
     rtime <- formatTimeMail SelFormatDateTime jRequestTime
     addPart ($(ihamletFile "templates/mail/support.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX))
diff --git a/src/Jobs/Handler/SendNotification/CorrectionsAssigned.hs b/src/Jobs/Handler/SendNotification/CorrectionsAssigned.hs
index 51ec02f77..6a9e6ace9 100644
--- a/src/Jobs/Handler/SendNotification/CorrectionsAssigned.hs
+++ b/src/Jobs/Handler/SendNotification/CorrectionsAssigned.hs
@@ -22,6 +22,7 @@ dispatchNotificationCorrectionsAssigned  nUser nSheet jRecipient = do
                      ]
     return (course, sheet, nbrSubs)
   when (nbrSubs > 0) . userMailT jRecipient $ do 
+    replaceMailHeader "Auto-Submitted" $ Just "auto-generated"
     setSubjectI $ MsgMailSubjectCorrectionsAssigned courseShorthand sheetName
 
     MsgRenderer mr <- getMailMsgRenderer
diff --git a/src/Jobs/Handler/SendNotification/CorrectionsNotDistributed.hs b/src/Jobs/Handler/SendNotification/CorrectionsNotDistributed.hs
index cb24f7e04..959cedad0 100644
--- a/src/Jobs/Handler/SendNotification/CorrectionsNotDistributed.hs
+++ b/src/Jobs/Handler/SendNotification/CorrectionsNotDistributed.hs
@@ -19,6 +19,7 @@ dispatchNotificationCorrectionsNotDistributed nSheet jRecipient = do
                      ]
     return (course, sheet, nbrSubs)
   when (nbrSubs > 0) . userMailT jRecipient $ do 
+    replaceMailHeader "Auto-Submitted" $ Just "auto-generated"
     setSubjectI $ MsgMailSubjectSubmissionsUnassigned courseShorthand sheetName
     MsgRenderer mr <- getMailMsgRenderer
     let termDesc = mr . ShortTermIdentifier $ unTermKey courseTerm
diff --git a/src/Jobs/Handler/SendNotification/SheetActive.hs b/src/Jobs/Handler/SendNotification/SheetActive.hs
index 91a8fc716..fc2c5a185 100644
--- a/src/Jobs/Handler/SendNotification/SheetActive.hs
+++ b/src/Jobs/Handler/SendNotification/SheetActive.hs
@@ -17,6 +17,7 @@ dispatchNotificationSheetActive nSheet jRecipient = userMailT jRecipient $ do
     sheet <- getJust nSheet
     course <- belongsToJust sheetCourse sheet
     return (course, sheet)
+  replaceMailHeader "Auto-Submitted" $ Just "auto-generated"
   setSubjectI $ MsgMailSubjectSheetActive courseShorthand sheetName
 
   MsgRenderer mr <- getMailMsgRenderer
diff --git a/src/Jobs/Handler/SendNotification/SheetInactive.hs b/src/Jobs/Handler/SendNotification/SheetInactive.hs
index 7112e5c39..ed76be1b3 100644
--- a/src/Jobs/Handler/SendNotification/SheetInactive.hs
+++ b/src/Jobs/Handler/SendNotification/SheetInactive.hs
@@ -20,6 +20,7 @@ dispatchNotificationSheetSoonInactive nSheet jRecipient = userMailT jRecipient $
     sheet <- getJust nSheet
     course <- belongsToJust sheetCourse sheet
     return (course, sheet)
+  replaceMailHeader "Auto-Submitted" $ Just "auto-generated"
   setSubjectI $ MsgMailSubjectSheetSoonInactive courseShorthand sheetName
 
   MsgRenderer mr <- getMailMsgRenderer
@@ -45,6 +46,7 @@ dispatchNotificationSheetInactive nSheet jRecipient = userMailT jRecipient $ do
         -- E.distinctOn [E.don (subUser E.^. SubmissionUserUser)] -- Not necessary due to UniqueSubmisionUser
         return (E.countRows :: E.SqlExpr (E.Value Int64))
     return (course, sheet, nrSubs, nrSubmitters)
+  replaceMailHeader "Auto-Submitted" $ Just "auto-generated"
   setSubjectI $ MsgMailSubjectSheetInactive courseShorthand sheetName
 
   MsgRenderer mr <- getMailMsgRenderer
diff --git a/src/Jobs/Handler/SendNotification/SubmissionRated.hs b/src/Jobs/Handler/SendNotification/SubmissionRated.hs
index 78083d83f..1cb3e1d50 100644
--- a/src/Jobs/Handler/SendNotification/SubmissionRated.hs
+++ b/src/Jobs/Handler/SendNotification/SubmissionRated.hs
@@ -22,6 +22,7 @@ dispatchNotificationSubmissionRated nSubmission jRecipient = userMailT jRecipien
     course <- belongsToJust sheetCourse sheet
     corrector <- traverse getJust submissionRatingBy
     return (course, sheet, submission, corrector)
+  replaceMailHeader "Auto-Submitted" $ Just "auto-generated"
   setSubjectI $ MsgMailSubjectSubmissionRated courseShorthand
 
   csid <- encrypt nSubmission
diff --git a/src/Jobs/Handler/SendNotification/UserRightsUpdate.hs b/src/Jobs/Handler/SendNotification/UserRightsUpdate.hs
index aaf50ac72..3e9d2c4a8 100644
--- a/src/Jobs/Handler/SendNotification/UserRightsUpdate.hs
+++ b/src/Jobs/Handler/SendNotification/UserRightsUpdate.hs
@@ -19,6 +19,7 @@ dispatchNotificationUserRightsUpdate  nUser _originalRights jRecipient = userMai
       adminSchools    <- getSchoolsOf nUser UserAdminSchool    UserAdminUser
       lecturerSchools <- getSchoolsOf nUser UserLecturerSchool UserLecturerUser
       return (user,adminSchools,lecturerSchools)
+    replaceMailHeader "Auto-Submitted" $ Just "auto-generated"
     setSubjectI $ MsgMailSubjectUserRightsUpdate userDisplayName
     -- MsgRenderer mr <- getMailMsgRenderer
     addAlternatives $ do
diff --git a/src/Jobs/Handler/SendTestEmail.hs b/src/Jobs/Handler/SendTestEmail.hs
index 5c5cd0900..979ec218d 100644
--- a/src/Jobs/Handler/SendTestEmail.hs
+++ b/src/Jobs/Handler/SendTestEmail.hs
@@ -13,6 +13,7 @@ import Utils.Lens
 dispatchJobSendTestEmail :: Email -> MailContext -> Handler ()
 dispatchJobSendTestEmail jEmail jMailContext = mailT jMailContext $ do
   _mailTo .= [Address Nothing jEmail]
+  replaceMailHeader "Auto-Submitted" $ Just "auto-generated"
   setSubjectI MsgMailTestSubject
   now <- liftIO getCurrentTime
   nDT <- formatTimeMail SelFormatDateTime now
diff --git a/src/Jobs/Types.hs b/src/Jobs/Types.hs
index 151d0e404..dc29a9e7a 100644
--- a/src/Jobs/Types.hs
+++ b/src/Jobs/Types.hs
@@ -17,7 +17,10 @@ data Job = JobSendNotification { jRecipient :: UserId, jNotification :: Notifica
          | JobQueueNotification { jNotification :: Notification }
          | JobHelpRequest { jSender :: Either (Maybe Address) UserId
                           , jRequestTime :: UTCTime
-                          , jHelpRequest :: Text, jReferer :: Maybe Text }
+                          , jHelpSubject :: Maybe Text
+                          , jHelpRequest :: Text
+                          , jReferer :: Maybe Text
+                          }
          | JobSetLogSettings { jInstance :: InstanceId, jLogSettings :: LogSettings }
          | JobDistributeCorrections { jSheet :: SheetId }
   deriving (Eq, Ord, Show, Read, Generic, Typeable)
diff --git a/src/Mail.hs b/src/Mail.hs
index c125bf88d..008af9987 100644
--- a/src/Mail.hs
+++ b/src/Mail.hs
@@ -27,7 +27,7 @@ module Mail
   , setSubjectI, setMailObjectId, setMailObjectId'
   , setDate, setDateCurrent
   , setMailSmtpData
-  , _mailFrom, _mailTo, _mailCc, _mailBcc, _mailHeaders, _mailParts
+  , _mailFrom, _mailTo, _mailCc, _mailBcc, _mailHeaders, _mailHeader, _mailParts
   , _partType, _partEncoding, _partFilename, _partHeaders, _partContent
   ) where
 
@@ -99,9 +99,18 @@ import Data.Universe.Instances.Reverse.Hashable ()
 
 import GHC.Exts (IsList)
 
+import Control.Monad.Trans.Maybe (MaybeT(..))
+
+import Data.CaseInsensitive (CI)
+import qualified Data.CaseInsensitive as CI
+  
+
 makeLenses_ ''Mail
 makeLenses_ ''Part
 
+_mailHeader :: CI ByteString -> Traversal' Mail Text
+_mailHeader hdrName = _mailHeaders . traverse . filtered (views _1 $ (== hdrName) . CI.mk) . _2
+
 
 newtype MailT m a = MailT { _unMailT :: RWST MailContext MailSmtpData Mail m a }
   deriving newtype ( MonadTrans, Monad, Functor, MonadFail, Applicative, Alternative, MonadPlus
@@ -443,7 +452,10 @@ setDate time = do
 
 setMailSmtpData :: (MonadHandler m, YesodMail (HandlerSite m)) => MailT m ()
 setMailSmtpData = do
-  Address _ from <- use _mailFrom
+  Just (Address _ from) <- runMaybeT $ asum
+    [ MaybeT . preuses (_mailHeader "Sender") $ fromString . unpack
+    , use _mailFrom
+    ]
   recps <- Set.fromList . map addressEmail . concat <$> forM [_mailTo, _mailCc, _mailBcc] use
 
   tell $ mempty { smtpRecipients = recps }

From f158735dd68d9dc51e774a3c13bdc64262f06d0a Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 7 Apr 2019 16:38:26 +0200
Subject: [PATCH 026/238] Fix build & minor cleanup

---
 src/Foundation.hs     |  7 ++-----
 src/Handler/Help.hs   | 11 +++++------
 templates/help.hamlet |  2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 0599f7b32..e689643da 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -2221,12 +2221,9 @@ instance YesodMail UniWorX where
   mailT ctx mail = defMailT ctx $ do
     void setMailObjectId
     setDateCurrent
-    replaceMailHeader "Sender" . Just . addressEmail =<< getsYesod (view _appMailFrom)
+    replaceMailHeader "Sender" . Just . addressEmail =<< getsYesod (appMailFrom . appSettings)
 
-    ret <- mail
-
-    setMailSmtpData
-    return ret
+    mail <* setMailSmtpData
 
 
 instance (MonadThrow m, MonadHandler m, HandlerSite m ~ UniWorX) => MonadCrypto m where
diff --git a/src/Handler/Help.hs b/src/Handler/Help.hs
index a1547b4c1..d29b7f214 100644
--- a/src/Handler/Help.hs
+++ b/src/Handler/Help.hs
@@ -48,11 +48,6 @@ postHelpR = do
   MsgRenderer mr <- getMsgRenderer
 
   ((res,formWidget),formEnctype) <- runFormPost $ renderAForm FormStandard $ helpForm mr mReferer mUid
-  let form = wrapForm formWidget def
-        { formAction = Just $ SomeRoute HelpR
-        , formEncoding = formEnctype
-        , formAttrs = [ ("data-ajax-submit", "") | isModal ]
-        }
 
   formResultModal res HelpR $ \HelpForm{..} -> do
     now <- liftIO getCurrentTime
@@ -68,4 +63,8 @@ postHelpR = do
 
   defaultLayout $ do
     setTitleI MsgHelpTitle
-    $(widgetFile "help")
+    wrapForm $(widgetFile "help") def
+      { formAction = Just $ SomeRoute HelpR
+      , formEncoding = formEnctype
+      , formAttrs = [ ("data-ajax-submit", "") | isModal ]
+      }
diff --git a/templates/help.hamlet b/templates/help.hamlet
index 4e1beb4cd..073bac477 100644
--- a/templates/help.hamlet
+++ b/templates/help.hamlet
@@ -1,3 +1,3 @@
 <p>
   _{MsgHelpIntroduction}
-^{form}
+^{formWidget}

From 0fcafcb61893eaa5e3f4d7a63d267b0f877cd3b9 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 7 Apr 2019 21:12:27 +0200
Subject: [PATCH 027/238] minor docs fix for reactive submit button js utility

---
 static/js/utils/form.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index ffb6e5f5c..31b94d1bb 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -73,8 +73,8 @@
    *  disables a forms LAST sumit button as long as the required inputs are invalid
    *  (only checks if the value of the inputs are not empty)
    *
-   * Attribute: uw-reactive-submit-button
-   *  works only on `form` elements
+   * Attribute: [none]
+   *  (automatically setup on all form tags)
    *
    * Params:
    *  data-formnorequired: string

From 4ef7d5f93a521f18cd909206e1ca2c5c29ffc222 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 7 Apr 2019 21:13:02 +0200
Subject: [PATCH 028/238] refactor Interactive Fieldset JS utility

---
 static/js/utils/form.js                       | 100 +++++++++++++-----
 .../widgets/multi-action/multi-action.hamlet  |   2 +-
 2 files changed, 73 insertions(+), 29 deletions(-)

diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index 31b94d1bb..afd0c72e8 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -177,51 +177,95 @@
     setup: reactiveButtonUtil,
   });
 
+  /**
+   *
+   * Interactive Fieldset Utility
+   *  shows/hides inputs based on value of particular input
+   *
+   * Attribute: uw-interactive-fieldset
+   *
+   * Params:
+   *  data-conditional-input: string
+   *    Selector for the input that this fieldset watches for changes
+   *  data-conditional-value: string
+   *    The value the conditional input needs to be set to for this fieldset to be shown
+   *
+   * Example usage:
+   *  <input id="input-0" type="text">
+   *  <fieldset uw-interactive-fieldset data-conditional-input="#input-0" data-conditional-value="yes">...</fieldset>
+   *  <fieldset uw-interactive-fieldset data-conditional-input="#input-0" data-conditional-value="no">...</fieldset>
+   * ## example with <select>
+   *  <select id="select-0">
+   *    <option value="0">Zero
+   *    <option value="1">One
+   *  <fieldset uw-interactive-fieldset data-conditional-input="#select-0" data-conditional-value="0">...</fieldset>
+   *  <fieldset uw-interactive-fieldset data-conditional-input="#select-0" data-conditional-value="1">...</fieldset>
+   */
 
+  var INTERACTIVE_FIELDSET_UTIL_NAME = 'interactiveFieldset';
+  var INTERACTIVE_FIELDSET_UTIL_SELECTOR = '[uw-interactive-fieldset]';
 
+  var INTERACTIVE_FIELDSET_INITIALIZED_CLASS = 'interactive-fieldset--initialized';
 
-  window.utils.interactiveFieldset = function(form, options) {
-    options = options || {};
-    var fieldSets = options.fieldSets;
+  var interactiveFieldsetUtil = function(element) {
+    var conditionalInput;
+    var conditionalValue;
 
-    if (!fieldSets) {
-      throw new Error('interactiveFieldset must be passed fieldSets via options');
+    function init() {
+      if (!element) {
+        throw new Error('Interactive Fieldset utility cannot be setup without an element!');
     }
 
-    var fields = fieldSets.map(function(fs) {
-      return {
-        fieldSet: fs,
-        condId: fs.dataset.conditionalId,
-        condValue: fs.dataset.conditionalValue,
-        condEl: form.querySelector('#' + fs.dataset.conditionalId),
-      };
-    }).filter(function(field) {
-      return !!field.condEl;
-    });
+      if (element.classList.contains(INTERACTIVE_FIELDSET_INITIALIZED_CLASS)) {
+        throw new Error('Interactive Fieldset utility already initialized!');
+      }
 
-    function updateFields() {
-      fields.forEach(function(field) {
-        field.fieldSet.classList.toggle('hidden', field.condEl.value !== field.condValue);
-      });
+      // param conditionalInput
+      if (!element.dataset.conditionalInput) {
+        throw new Error('Interactive Fieldset needs a selector for a conditional input!');
+      }
+      conditionalInput = document.querySelector(element.dataset.conditionalInput);
+      if (!conditionalInput) {
+        // abort if form has no required inputs
+        throw new Error('Couldn\'t find the conditional input. Aborting setup for interactive fieldset.');
     }
 
-    function addEventListeners() {
-      fields.forEach(function(field) {
-        field.condEl.addEventListener('input', updateFields)
-      });
+      // param conditionalValue
+      if (!element.dataset.conditionalValue) {
+        throw new Error('Interactive Fieldset needs a conditional value!');
     }
+      conditionalValue = element.dataset.conditionalValue;
 
-    if (fieldSets.length) {
-      addEventListeners();
-      updateFields();
-    }
+      // add event listener
+      conditionalInput.addEventListener('input', updateVisibility);
+
+      // initial visibility update
+      updateVisibility();
+
+      // mark as initialized
+      element.classList.add(INTERACTIVE_FIELDSET_INITIALIZED_CLASS);
 
     return {
-      scope: form,
+        name: INTERACTIVE_FIELDSET_UTIL_NAME,
+        element: element,
       destroy: function() {},
     };
+    }
+
+    function updateVisibility() {
+      element.classList.toggle('hidden', conditionalInput.value !== conditionalValue);
+    }
+
+    return init();
   };
 
+  formUtilities.push({
+    name: INTERACTIVE_FIELDSET_UTIL_NAME,
+    selector: INTERACTIVE_FIELDSET_UTIL_SELECTOR,
+    setup: interactiveFieldsetUtil,
+  });
+
+
   window.utils.autoSubmit = function(form, options) {
     var button = form.querySelector(AUTOSUBMIT_BUTTON_SELECTOR);
     if (button) {
diff --git a/templates/widgets/multi-action/multi-action.hamlet b/templates/widgets/multi-action/multi-action.hamlet
index 71e3acf14..f65a39dec 100644
--- a/templates/widgets/multi-action/multi-action.hamlet
+++ b/templates/widgets/multi-action/multi-action.hamlet
@@ -1,4 +1,4 @@
-<fieldset data-conditional-id="#{fvId actionView}" data-conditional-value="#{toPathPiece act}">
+<fieldset uw-interactive-fieldset data-conditional-input="##{fvId actionView}" data-conditional-value="#{toPathPiece act}">
   <legend>
     _{act}
   ^{w}

From 16f1acd6c6d0d8eb5b6278e22d11d2da846e5265 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 7 Apr 2019 21:24:36 +0200
Subject: [PATCH 029/238] refactor auto submit button js utility

---
 static/css/utils/form.scss         |  2 +-
 static/js/utils/form.js            | 37 ++++++++++++++++++++++++++----
 templates/widgets/form/form.hamlet |  2 +-
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/static/css/utils/form.scss b/static/css/utils/form.scss
index 2c2a56aa2..b1d6b22c3 100644
--- a/static/css/utils/form.scss
+++ b/static/css/utils/form.scss
@@ -17,7 +17,7 @@ fieldset {
   }
 }
 
-[data-autosubmit][type="submit"] {
+[uw-auto-submit-button][type="submit"] {
   animation: fade-in 500ms ease-in-out backwards;
   animation-delay: 500ms;
 }
diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index afd0c72e8..85e2f163b 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -265,19 +265,46 @@
     setup: interactiveFieldsetUtil,
   });
 
+  /**
+   *
+   * Auto Submit Button Utility
+   *  Hides submit buttons in forms that are submitted programmatically
+   *  We hide the button using JavaScript so no-js users will still be able to submit the form
+   *
+   * Attribute: uw-auto-submit-button
+   *
+   * Example usage:
+   *  <button type="submit" uw-auto-submit-button>Submit
+   */
 
-  window.utils.autoSubmit = function(form, options) {
-    var button = form.querySelector(AUTOSUBMIT_BUTTON_SELECTOR);
-    if (button) {
-      button.classList.add('hidden');
+  var AUTO_SUBMIT_BUTTON_UTIL_NAME = 'autoSubmitButton';
+  var AUTO_SUBMIT_BUTTON_UTIL_SELECTOR = '[uw-auto-submit-button]';
+
+  var AUTO_SUBMIT_BUTTON_INITIALIZED_CLASS = 'auto-submit-button--initialized';
+  var AUTO_SUBMIT_BUTTON_HIDDEN_CLASS = 'hidden';
+
+  var autoSubmitButtonUtil = function(element) {
+    if (!element) {
+      throw new Error('Auto Submit Button utility needs to be passed an element!');
     }
 
+    // hide and mark initialized
+    element.classList.add(AUTO_SUBMIT_BUTTON_HIDDEN_CLASS, AUTO_SUBMIT_BUTTON_INITIALIZED_CLASS);
+
     return {
-      scope: form,
+      name: AUTO_SUBMIT_BUTTON_UTIL_NAME,
+      element: element,
       destroy: function() {},
     };
   };
 
+  formUtilities.push({
+    name: AUTO_SUBMIT_BUTTON_UTIL_NAME,
+    selector: AUTO_SUBMIT_BUTTON_UTIL_SELECTOR,
+    setup: autoSubmitButtonUtil,
+  });
+
+
   // listens for focus events and removes any errors on an input
   window.utils.errorRemover = function(formGroup, options) {
 
diff --git a/templates/widgets/form/form.hamlet b/templates/widgets/form/form.hamlet
index ed15e2aea..45a25b820 100644
--- a/templates/widgets/form/form.hamlet
+++ b/templates/widgets/form/form.hamlet
@@ -15,5 +15,5 @@ $# Wrapper for all kinds of forms
         ^{submitButtonView}
       $of FormAutoSubmit
         ^{formWidget}
-        <button type=submit data-autosubmit>
+        <button type=submit uw-auto-submit-button>
           ^{btnLabel BtnSubmit}

From 4f6e788870f26b5cf1f3ea0523b65abe490f8fa1 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 7 Apr 2019 21:40:03 +0200
Subject: [PATCH 030/238] refactor form error remover js utility

---
 static/js/utils/form.js | 70 +++++++++++++++++++++++++++++++----------
 1 file changed, 54 insertions(+), 16 deletions(-)

diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index 85e2f163b..f04e2ee4d 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -9,7 +9,7 @@
   var AUTOSUBMIT_BUTTON_SELECTOR = '[type="submit"][data-autosubmit]';
   var AJAX_SUBMIT_FLAG = 'ajaxSubmit';
 
-  var FORM_GROUP_CLASS = 'form-group';
+  var FORM_GROUP_SELECTOR = '.form-group';
   var FORM_GROUP_WITH_ERRORS_CLASS = 'form-group--has-error';
 
   window.utils.form = function(form, options) {
@@ -152,7 +152,6 @@
       if (inputsValid()) {
         submitButton.removeAttribute('disabled');
       } else {
-        console.log('setting disabled', { submitButton });
         submitButton.setAttribute('disabled', 'true');
       }
     }
@@ -304,32 +303,71 @@
     setup: autoSubmitButtonUtil,
   });
 
+  /**
+   *
+   * Form Error Remover Utility
+   *  Removes errors from inputs when they are focused
+   *
+   * Attribute: [none]
+   *  (automatically setup on all form tags)
+   *
+   * Example usage:
+   *  (any regular form that can show input errors)
+   */
 
-  // listens for focus events and removes any errors on an input
-  window.utils.errorRemover = function(formGroup, options) {
+  var FORM_ERROR_REMOVER_UTIL_NAME = 'formErrorRemover';
+  var FORM_ERROR_REMOVER_UTIL_SELECTOR = 'form';
 
-    var inputElement = formGroup.querySelector('input:not([type="hidden"]), textarea, select');
-    if (!inputElement) {
-      return false;
+  var FORM_ERROR_REMOVER_INITIALIZED_CLASS = 'form-error-remover--initialized';
+  var FORM_ERROR_REMOVER_INPUTS_SELECTOR = 'input:not([type="hidden"]), textarea, select';
+
+  var formErrorRemoverUtil = function(element) {
+    var formGroups;
+
+    function init() {
+      if (!element) {
+        throw new Error('Form Error Remover utility needs to be passed an element!');
     }
 
-    inputElement.addEventListener('focus', focusListener);
+      // find form groups
+      formGroups = Array.from(element.querySelectorAll(FORM_GROUP_SELECTOR));
 
-    function focusListener() {
-      var hasError = formGroup.classList.contains(FORM_GROUP_WITH_ERRORS_CLASS);
-      if (hasError) {
-        formGroup.classList.remove(FORM_GROUP_WITH_ERRORS_CLASS);
+      formGroups.forEach(function(formGroup) {
+        if (!formGroup.classList.contains(FORM_GROUP_WITH_ERRORS_CLASS)) {
+          return;
       }
+
+        var inputElements = Array.from(formGroup.querySelectorAll(FORM_ERROR_REMOVER_INPUTS_SELECTOR));
+        if (!inputElements) {
+          return false;
     }
 
+        inputElements.forEach(function(inputElement) {
+          inputElement.addEventListener('input', function() {
+            formGroup.classList.remove(FORM_GROUP_WITH_ERRORS_CLASS);
+          });
+        });
+      });
+
+      // mark initialized
+      element.classList.add(FORM_ERROR_REMOVER_INITIALIZED_CLASS);
+
     return {
-      scope: formGroup,
-      destroy: function() {
-        inputElement.removeEventListener('focus', focusListener);
-      },
+        name: FORM_ERROR_REMOVER_UTIL_NAME,
+        element: element,
+        destroy: function() {},
     };
+    }
+
+    return init();
   };
 
+  formUtilities.push({
+    name: FORM_ERROR_REMOVER_UTIL_NAME,
+    selector: FORM_ERROR_REMOVER_UTIL_SELECTOR,
+    setup: formErrorRemoverUtil,
+  });
+
   // register the collected form utilities
   if (UtilRegistry) {
     formUtilities.forEach(UtilRegistry.register);

From e71cf031a040a57bc15c1ff9b8edd93bc12cad0a Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 7 Apr 2019 21:41:57 +0200
Subject: [PATCH 031/238] remove obsolete js utility code for forms

---
 static/js/utils/form.js | 89 +++++++----------------------------------
 1 file changed, 14 insertions(+), 75 deletions(-)

diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index f04e2ee4d..7beea537e 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -1,72 +1,8 @@
 (function() {
   'use strict';
 
-  window.utils = window.utils || {};
-
   var formUtilities = [];
 
-  var JS_INITIALIZED = 'js-form-initialized';
-  var AUTOSUBMIT_BUTTON_SELECTOR = '[type="submit"][data-autosubmit]';
-  var AJAX_SUBMIT_FLAG = 'ajaxSubmit';
-
-  var FORM_GROUP_SELECTOR = '.form-group';
-  var FORM_GROUP_WITH_ERRORS_CLASS = 'form-group--has-error';
-
-  window.utils.form = function(form, options) {
-    options = options || {};
-
-    // dont initialize form if it is in a modal and is not forced
-    if (form.closest('.modal') && !options.force) {
-      return false;
-    }
-
-    // dont initialize form if already initialized and should not be force-initialized
-    if (form.classList.contains(JS_INITIALIZED) && !options.force) {
-      return false;
-    }
-
-    var utilInstances = [];
-
-    // reactive buttons
-    utilInstances.push(window.utils.setup('reactiveButton', form));
-
-    // conditonal fieldsets
-    var fieldSets = Array.from(form.querySelectorAll('fieldset[data-conditional-id][data-conditional-value]'));
-    utilInstances.push(window.utils.setup('interactiveFieldset', form, { fieldSets }));
-
-    // hide autoSubmit submit button
-    utilInstances.push(window.utils.setup('autoSubmit', form, options));
-
-    // async form
-    if (AJAX_SUBMIT_FLAG in form.dataset) {
-      utilInstances.push(window.utils.setup('asyncForm', form, options));
-    }
-
-    // inputs
-    utilInstances.push(window.utils.setup('inputs', form, options));
-
-    // form group errors
-    var formGroups = Array.from(form.querySelectorAll('.' + FORM_GROUP_CLASS));
-    formGroups.forEach(function(formGroup) {
-      utilInstances.push(window.utils.setup('errorRemover', formGroup, options));
-    });
-
-    form.classList.add(JS_INITIALIZED);
-
-    function destroyUtils() {
-      utilInstances.filter(function(utilInstance) {
-        return !!utilInstance;
-      }).forEach(function(utilInstance) {
-        utilInstance.destroy();
-      });
-    }
-
-    return {
-      scope: form,
-      destroy: destroyUtils,
-    };
-  };
-
   /**
    *
    * Reactive Submit Button Utility
@@ -213,7 +149,7 @@
     function init() {
       if (!element) {
         throw new Error('Interactive Fieldset utility cannot be setup without an element!');
-    }
+      }
 
       if (element.classList.contains(INTERACTIVE_FIELDSET_INITIALIZED_CLASS)) {
         throw new Error('Interactive Fieldset utility already initialized!');
@@ -227,12 +163,12 @@
       if (!conditionalInput) {
         // abort if form has no required inputs
         throw new Error('Couldn\'t find the conditional input. Aborting setup for interactive fieldset.');
-    }
+      }
 
       // param conditionalValue
       if (!element.dataset.conditionalValue) {
         throw new Error('Interactive Fieldset needs a conditional value!');
-    }
+      }
       conditionalValue = element.dataset.conditionalValue;
 
       // add event listener
@@ -244,11 +180,11 @@
       // mark as initialized
       element.classList.add(INTERACTIVE_FIELDSET_INITIALIZED_CLASS);
 
-    return {
+      return {
         name: INTERACTIVE_FIELDSET_UTIL_NAME,
         element: element,
-      destroy: function() {},
-    };
+        destroy: function() {},
+      };
     }
 
     function updateVisibility() {
@@ -321,13 +257,16 @@
   var FORM_ERROR_REMOVER_INITIALIZED_CLASS = 'form-error-remover--initialized';
   var FORM_ERROR_REMOVER_INPUTS_SELECTOR = 'input:not([type="hidden"]), textarea, select';
 
+  var FORM_GROUP_SELECTOR = '.form-group';
+  var FORM_GROUP_WITH_ERRORS_CLASS = 'form-group--has-error';
+
   var formErrorRemoverUtil = function(element) {
     var formGroups;
 
     function init() {
       if (!element) {
         throw new Error('Form Error Remover utility needs to be passed an element!');
-    }
+      }
 
       // find form groups
       formGroups = Array.from(element.querySelectorAll(FORM_GROUP_SELECTOR));
@@ -335,12 +274,12 @@
       formGroups.forEach(function(formGroup) {
         if (!formGroup.classList.contains(FORM_GROUP_WITH_ERRORS_CLASS)) {
           return;
-      }
+        }
 
         var inputElements = Array.from(formGroup.querySelectorAll(FORM_ERROR_REMOVER_INPUTS_SELECTOR));
         if (!inputElements) {
           return false;
-    }
+        }
 
         inputElements.forEach(function(inputElement) {
           inputElement.addEventListener('input', function() {
@@ -352,11 +291,11 @@
       // mark initialized
       element.classList.add(FORM_ERROR_REMOVER_INITIALIZED_CLASS);
 
-    return {
+      return {
         name: FORM_ERROR_REMOVER_UTIL_NAME,
         element: element,
         destroy: function() {},
-    };
+      };
     }
 
     return init();

From 0b62845a8d2724ea54baf6cc4ba064c51e80ffec Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 7 Apr 2019 21:56:27 +0200
Subject: [PATCH 032/238] minor fix for modal js utility

---
 static/js/utils/modal.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/static/js/utils/modal.js b/static/js/utils/modal.js
index 3f46300a6..7a5c49543 100644
--- a/static/js/utils/modal.js
+++ b/static/js/utils/modal.js
@@ -76,10 +76,14 @@
     }
 
     function setupTrigger() {
-      var triggerElement = document.querySelector(element.dataset.modalTrigger);
+      var triggerSelector = element.dataset.modalTrigger;
+      if (!triggerSelector.startsWith('#')) {
+        triggerSelector = '#' + triggerSelector;
+      }
+      var triggerElement = document.querySelector(triggerSelector);
 
       if (!triggerElement) {
-        throw new Error('Trigger element for Modal not found: "', + element.dataset.modalTrigger + '"');
+        throw new Error('Trigger element for Modal not found: "' + triggerSelector + '"');
       }
 
       triggerElement.classList.add(MODAL_TRIGGER_CLASS);

From c3b0ffe582f5a0bf42ef7c5deeb65ef28842952b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 7 Apr 2019 22:08:39 +0200
Subject: [PATCH 033/238] Collect coverage during tests

---
 test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test.sh b/test.sh
index 09d4b3a53..7db64f3c6 100755
--- a/test.sh
+++ b/test.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-exec -- stack build --test --fast --flag uniworx:dev --flag uniworx:library-only ${@}
+exec -- stack build --test --coverage --fast --flag uniworx:dev --flag uniworx:library-only ${@}

From d48b335cb296d17d1265eefc058f9d0cea3e5e39 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 7 Apr 2019 22:17:38 +0200
Subject: [PATCH 034/238] automatically setup checkboxes via js utility

---
 src/Handler/Utils/Table.hs         | 2 +-
 static/js/services/utilRegistry.js | 4 ++++
 static/js/utils/inputs.js          | 8 ++++----
 templates/multiFileField.hamlet    | 4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/Handler/Utils/Table.hs b/src/Handler/Utils/Table.hs
index 06a49d7b6..2acaf2a6a 100644
--- a/src/Handler/Utils/Table.hs
+++ b/src/Handler/Utils/Table.hs
@@ -66,7 +66,7 @@ headedRowSelector toExternal fromExternal attrs colonnade tdata = do
           -- TODO: move this to a *.hamlet file
           [whamlet|
             <label style="display: block">
-              <input type=checkbox uw-checkbox name=#{name} value=#{toPathPiece extId} *{attributes} :isRight val:checked>
+              <input type=checkbox name=#{name} value=#{toPathPiece extId} *{attributes} :isRight val:checked>
           |]
 
   selectionIdent <- newFormIdent
diff --git a/static/js/services/utilRegistry.js b/static/js/services/utilRegistry.js
index 74046aded..519a444bf 100644
--- a/static/js/services/utilRegistry.js
+++ b/static/js/services/utilRegistry.js
@@ -76,6 +76,10 @@
           }
 
           if (utilInstance) {
+            if (DEBUG_MODE > 2) {
+              console.info('Got utility instance for utility "' + util.name + '"', { utilInstance });
+            }
+
             activeUtilInstances.push(utilInstance);
           }
         });
diff --git a/static/js/utils/inputs.js b/static/js/utils/inputs.js
index 90c9a4caa..0081b3000 100644
--- a/static/js/utils/inputs.js
+++ b/static/js/utils/inputs.js
@@ -130,16 +130,16 @@
    * Checkbox Utility
    *  wraps native checkbox
    *
-   * Attribute: uw-checkbox
-   *  (element must be an input of type='checkbox')
+   * Attribute: (none)
+   *  (element must be an input of type="checkbox")
    *
    * Example usage:
-   * <input type='checkbox' uw-checkbox>
+   * <input type="checkbox">
    *
    */
 
   var CHECKBOX_UTIL_NAME = 'checkbox';
-  var CHECKBOX_UTIL_SELECTOR = 'input[type="checkbox"][uw-checkbox]';
+  var CHECKBOX_UTIL_SELECTOR = 'input[type="checkbox"]';
 
   var CHECKBOX_CLASS = 'checkbox';
   var CHECKBOX_INITIALIZED_CLASS = 'checkbox--initialized';
diff --git a/templates/multiFileField.hamlet b/templates/multiFileField.hamlet
index c64686d47..973cd762e 100644
--- a/templates/multiFileField.hamlet
+++ b/templates/multiFileField.hamlet
@@ -6,7 +6,7 @@ $newline never
       <li>
         <div .file-container>
           <label for=#{fuiHtmlId}>#{fuiTitle}
-          <input type=checkbox uw-checkbox id=#{fuiHtmlId} name=#{fieldName} :fuiChecked:checked value=#{toPathPiece fuiId}>
+          <input type=checkbox id=#{fuiHtmlId} name=#{fieldName} :fuiChecked:checked value=#{toPathPiece fuiId}>
 
   <div .file-input__info>
     _{MsgPreviouslyUploadedDeletionInfo}
@@ -21,7 +21,7 @@ $# new files
 
 <div .file-input__unpack>
   <label for=#{fieldId}_zip>ZIPs automatisch entpacken
-  <input type=checkbox uw-checkbox id=#{fieldId}_zip name=#{fieldName} value=#{unpackZips}>
+  <input type=checkbox id=#{fieldId}_zip name=#{fieldName} value=#{unpackZips}>
   <div class="tooltip">
     <div class="tooltip__handle">
     <div class="tooltip__content">Entpackt hochgeladene Zip-Dateien (*.zip) automatisch und fügt den Inhalt dem Stamm-Verzeichnis der Abgabe hinzu.

From c6a175ae5a956ce03616aa3d277edcef5efbb76e Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 7 Apr 2019 22:28:04 +0200
Subject: [PATCH 035/238] fail silently when checkbox js util is already setup

---
 static/js/utils/inputs.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/static/js/utils/inputs.js b/static/js/utils/inputs.js
index 0081b3000..d332daaa1 100644
--- a/static/js/utils/inputs.js
+++ b/static/js/utils/inputs.js
@@ -152,11 +152,13 @@
       }
 
       if (element.classList.contains(CHECKBOX_INITIALIZED_CLASS)) {
-        throw new Error('Checkbox utility already initialized!');
+        // throw new Error('Checkbox utility already initialized!');
+        return false;
       }
 
       if (element.parentElement.classList.contains(CHECKBOX_CLASS)) {
-        throw new Error('Checkbox element\'s wrapper already has class "' + CHECKBOX_CLASS + '"!');
+        // throw new Error('Checkbox element\'s wrapper already has class "' + CHECKBOX_CLASS + '"!');
+        return false;
       }
 
       var siblingEl = element.nextElementSibling;

From d43fbca0c3d2cda406889e3d96295e903b14f555 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 7 Apr 2019 22:31:27 +0200
Subject: [PATCH 036/238] refactor check all checkbox js utility

---
 src/Foundation.hs              |   2 +-
 static/css/utils/checkbox.scss |  12 ++--
 static/js/utils/checkAll.js    | 100 +++++++++++++++++++--------------
 3 files changed, 67 insertions(+), 47 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 3692aa39c..04ed0139d 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1073,9 +1073,9 @@ siteLayout' headingOverride widget = do
       -- addScript $ StaticR js_utils_asyncForm_js
       -- addScript $ StaticR js_utils_asyncTable_js
       -- addScript $ StaticR js_utils_asyncTableFilter_js
-      -- addScript $ StaticR js_utils_checkAll_js
       -- addScript $ StaticR js_utils_httpClient_js
       -- JavaScript utils
+      addScript $ StaticR js_utils_checkAll_js
       addScript $ StaticR js_utils_form_js
       addScript $ StaticR js_utils_inputs_js
       addScript $ StaticR js_utils_modal_js
diff --git a/static/css/utils/checkbox.scss b/static/css/utils/checkbox.scss
index 4cab1568e..9a73b01e7 100644
--- a/static/css/utils/checkbox.scss
+++ b/static/css/utils/checkbox.scss
@@ -16,8 +16,8 @@
 
   label {
     display: block;
-    height: 24px;
-    width: 24px;
+    height: 20px;
+    width: 20px;
     background-color: #f3f3f3;
     box-shadow: inset 0 1px 2px 1px rgba(50, 50, 50, 0.05);
     border: 2px solid var(--color-primary);
@@ -55,14 +55,16 @@
   :checked + label::before {
     background-color: white;
     transform: rotate(45deg);
-    left: 4px;
+    left: 2px;
+    top: 11px;
   }
 
   :checked + label::after {
     background-color: white;
     transform: rotate(-45deg);
-    top: 11px;
-    width: 13px;
+    top: 9px;
+    width: 12px;
+    left: 7px;
   }
 
   [disabled] + label {
diff --git a/static/js/utils/checkAll.js b/static/js/utils/checkAll.js
index b37a89454..3045d2bee 100644
--- a/static/js/utils/checkAll.js
+++ b/static/js/utils/checkAll.js
@@ -3,38 +3,54 @@
 
   window.utils = window.utils || {};
 
-  var ASYNC_TABLE_CONTENT_CHANGED_CLASS = 'async-table--changed';
-  var JS_INITIALIZED_CLASS = 'js-check-all-initialized';
+  /**
+   *
+   * Check All Checkbox Utility
+   *  adds a Check All Checkbox above columns with only checkboxes
+   *
+   * Attribute: [none]
+   *   (will be set up automatically on tables)
+   *
+   * Example usage:
+  *   (table with one column thats only checkboxes)
+   */
+
+  var CHECK_ALL_UTIL_NAME = 'checkAll';
+  var CHECK_ALL_UTIL_SELECTOR = 'table';
+
   var CHECKBOX_SELECTOR    = '[type="checkbox"]';
 
-  function getCheckboxId() {
-    return 'check-all-checkbox-' + Math.floor(Math.random() * 100000);
-  }
-
-  window.utils.checkAll = function(wrapper, options) {
-
-    if ((!wrapper || wrapper.classList.contains(JS_INITIALIZED_CLASS)) && !wrapper.classList.contains(ASYNC_TABLE_CONTENT_CHANGED_CLASS)) {
-      return false;
-    }
-    options = options || {};
+  var CHECK_ALL_INITIALIZED_CLASS = 'check-all--initialized';
 
+  var checkAllUtil = function(element) {
     var columns = [];
     var checkboxColumn = [];
     var checkAllCheckbox = null;
 
-    var utilInstances = [];
-
     function init() {
+      if (!element) {
+        throw new Error('Check All utility cannot be setup without an element!');
+      }
 
-      columns = gatherColumns(wrapper);
+      gatherColumns();
+      setupCheckAllCheckbox();
 
-      setupCheckAllCheckbox(findCheckboxColumn(columns));
+      // mark initialized
+      element.classList.add(CHECK_ALL_INITIALIZED_CLASS);
 
-      wrapper.classList.add(JS_INITIALIZED_CLASS);
+      return {
+        name: CHECK_ALL_UTIL_NAME,
+        element: element,
+        destroy: function() {},
+      };
     }
 
-    function gatherColumns(table) {
-      var rows = Array.from(table.querySelectorAll('tr'));
+    function getCheckboxId() {
+      return 'check-all-checkbox-' + Math.floor(Math.random() * 100000);
+    }
+
+    function gatherColumns(tble) {
+      var rows = Array.from(element.querySelectorAll('tr'));
       var cols = [];
       rows.forEach(function(tr) {
         var cells = Array.from(tr.querySelectorAll('td'));
@@ -45,7 +61,7 @@
           cols[cellIndex].push(cell);
         });
       });
-      return cols;
+      columns = cols;
     }
 
     function findCheckboxColumn(columns) {
@@ -68,21 +84,25 @@
       return onlyCheckboxes;
     }
 
-    function setupCheckAllCheckbox(columnId) {
-      if (columnId === null) {
+    function setupCheckAllCheckbox() {
+      var checkboxColumnId = findCheckboxColumn(columns);
+      if (checkboxColumnId === null) {
         return;
       }
 
-      checkboxColumn = columns[columnId];
-      var firstRow = wrapper.querySelector('tr');
-      var th = Array.from(firstRow.querySelectorAll('th, td'))[columnId];
+      checkboxColumn = columns[checkboxColumnId];
+      var firstRow = element.querySelector('tr');
+      var th = Array.from(firstRow.querySelectorAll('th, td'))[checkboxColumnId];
       th.innerHTML = 'test';
       checkAllCheckbox = document.createElement('input');
       checkAllCheckbox.setAttribute('type', 'checkbox');
       checkAllCheckbox.setAttribute('id', getCheckboxId());
       th.innerHTML = '';
       th.insertBefore(checkAllCheckbox, null);
-      utilInstances.push(window.utils.setup('checkbox', checkAllCheckbox));
+
+      if (UtilRegistry) {
+        UtilRegistry.setup(UtilRegistry.find('checkbox'));
+      }
 
       checkAllCheckbox.addEventListener('input', onCheckAllCheckboxInput);
       setupCheckboxListeners();
@@ -103,9 +123,9 @@
     }
 
     function updateCheckAllCheckboxState() {
-      var allChecked = checkboxColumn.reduce(function(acc, cell) {
-        return acc && cell.querySelector(CHECKBOX_SELECTOR).checked;
-      }, true);
+      var allChecked = checkboxColumn.every(function(cell) {
+        return cell.querySelector(CHECKBOX_SELECTOR).checked;
+      })
       checkAllCheckbox.checked = allChecked;
     }
 
@@ -115,17 +135,15 @@
       });
     }
 
-    function destroy() {
-      utilInstances.forEach(function(util) {
-        util.destroy();
-      });
-    }
-
-    init();
-
-    return {
-      scope: wrapper,
-      destroy: destroy,
-    };
+    return init();
   };
+
+  // register check all checkbox util
+  if (UtilRegistry) {
+    UtilRegistry.register({
+      name: CHECK_ALL_UTIL_NAME,
+      selector: CHECK_ALL_UTIL_SELECTOR,
+      setup: checkAllUtil
+    });
+  }
 })();

From 32bc5f4852253cc6cc2f6f2a5c791891174068e1 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 7 Apr 2019 22:32:14 +0200
Subject: [PATCH 037/238] safer logging in JS utilRegistry

---
 static/js/services/utilRegistry.js | 11 +++++++----
 static/js/utils/checkAll.js        |  2 --
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/static/js/services/utilRegistry.js b/static/js/services/utilRegistry.js
index 519a444bf..a73b914bf 100644
--- a/static/js/services/utilRegistry.js
+++ b/static/js/services/utilRegistry.js
@@ -4,7 +4,7 @@
   var registeredUtils = [];
   var activeUtilInstances = [];
 
-  var DEBUG_MODE = 2;
+  var DEBUG_MODE = /localhost/.test(window.location.href) && 2;
 
   // Registry
   // (revealing module pattern)
@@ -26,10 +26,8 @@
      * @param util Object Utility that should be added to the registry
      */
     function registerUtil(util) {
-      if (DEBUG_MODE > 0) {
-        console.log('registering util "' + util.name + '"');
-      }
       if (DEBUG_MODE > 2) {
+        console.log('registering util "' + util.name + '"');
         console.log({ util });
       }
 
@@ -49,6 +47,11 @@
     }
 
     function setupAllUtils() {
+      if (DEBUG_MODE > 1) {
+        console.info('registered js utilities:');
+        console.table(registeredUtils);
+      }
+
       registeredUtils.forEach(function(util) {
         setupUtil(util);
       });
diff --git a/static/js/utils/checkAll.js b/static/js/utils/checkAll.js
index 3045d2bee..7aeb65ccb 100644
--- a/static/js/utils/checkAll.js
+++ b/static/js/utils/checkAll.js
@@ -1,8 +1,6 @@
 (function() {
   'use strict';
 
-  window.utils = window.utils || {};
-
   /**
    *
    * Check All Checkbox Utility

From 957f911f33d6bef65915b0df358803d3d48318cf Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 7 Apr 2019 22:47:42 +0200
Subject: [PATCH 038/238] don't build uniworxdb when library-only

---
 package.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package.yaml b/package.yaml
index 339ecff3e..c2a1ebf61 100644
--- a/package.yaml
+++ b/package.yaml
@@ -218,6 +218,9 @@ executables:
     dependencies:
       - uniworx
     other-modules: []
+    when:
+      - condition: flag(library-only)
+        buildable: false
 
 # Test suite
 tests:

From 6a29a7d081f22799d5b015ea555c9879aace5603 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 7 Apr 2019 23:31:04 +0200
Subject: [PATCH 039/238] started refactoring async table js utility

---
 src/Foundation.hs                |   2 +-
 static/js/utils/asyncTable.js    | 270 +++++++++++++++++++------------
 static/js/utils/checkAll.js      |   1 +
 templates/table/colonnade.hamlet |   2 +-
 templates/table/layout.julius    |  10 --
 5 files changed, 172 insertions(+), 113 deletions(-)
 delete mode 100644 templates/table/layout.julius

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 04ed0139d..5360390d9 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1071,10 +1071,10 @@ siteLayout' headingOverride widget = do
       -- addScript $ StaticR js_utils_alerts_js
       -- addScript $ StaticR js_utils_asidenav_js
       -- addScript $ StaticR js_utils_asyncForm_js
-      -- addScript $ StaticR js_utils_asyncTable_js
       -- addScript $ StaticR js_utils_asyncTableFilter_js
       -- addScript $ StaticR js_utils_httpClient_js
       -- JavaScript utils
+      addScript $ StaticR js_utils_asyncTable_js
       addScript $ StaticR js_utils_checkAll_js
       addScript $ StaticR js_utils_form_js
       addScript $ StaticR js_utils_inputs_js
diff --git a/static/js/utils/asyncTable.js b/static/js/utils/asyncTable.js
index e4b7d87bc..1f2ba3c36 100644
--- a/static/js/utils/asyncTable.js
+++ b/static/js/utils/asyncTable.js
@@ -1,20 +1,40 @@
 (function collonadeClosure() {
   'use strict';
 
-  window.utils = window.utils || {};
+  /**
+   *
+   * Async Table Utility
+   *  makes table filters, sorting and pagination behave asynchronously via AJAX calls
+   *
+   * Attribute: [none]
+   *   (will be set up automatically on tables)
+   *
+   * Example usage:
+  *   (regular table)
+   */
+
+  var ASYNC_TABLE_UTIL_NAME = 'asyncTable';
+  var ASYNC_TABLE_UTIL_SELECTOR = 'table';
+
+  var ASYNC_TABLE_LOCAL_STORAGE_KEY = 'ASYNC_TABLE';
+
+  var ASYNC_TABLE_INITIALIZED_CLASS = 'async-table--initialized';
+
+
+  var INPUT_DEBOUNCE = 600;
 
   var HEADER_HEIGHT = 80;
   var RESET_OPTIONS = [ 'scrollTo' ];
   var TABLE_FILTER_FORM_CLASS = 'table-filter-form';
-  var ASYNC_TABLE_CONTENT_CHANGED_CLASS = 'async-table--changed';
+
   var ASYNC_TABLE_LOADING_CLASS = 'async-table--loading';
-  var JS_INITIALIZED_CLASS = 'js-async-table-initialized';
+  var ASYNC_TABLE_FILTER_LOADING_CLASS = 'async-table-filter--loading';
 
-  window.utils.asyncTable = function(wrapper, options) {
-
-    options = options || {};
-    var tableIdent = options.dbtIdent;
-    var shortCircuitHeader = options ? options.headerDBTableShortcircuit : null;
+  var asyncTableUtil = function(element) {
+    var asyncTableHeader;
+    var asyncTableId;
+    var lastHorizontalPosition;
+    var currentTableUrl;
 
     var ths = [];
     var pageLinks = [];
@@ -24,21 +44,44 @@
     var utilInstances = [];
 
     function init() {
-      var table = wrapper.querySelector('#' + tableIdent);
-
-      if (!table) {
-        return;
+      if (!element) {
+        throw new Error('Async Table utility cannot be setup without an element!');
       }
 
-      scrollTable = wrapper.querySelector('.scrolltable');
+      // param asyncTableDbHeader
+      if (element.dataset.asyncTableDbHeader !== undefined) {
+        asyncTableHeader = element.dataset.asyncTableDbHeader;
+      }
 
-      // sortable table headers
-      ths = Array.from(table.querySelectorAll('th.sortable')).map(function(th) {
+      asyncTableId = element.id;
+
+      console.log('asyncTable.init()', { asyncTableId });
+
+      setup();
+
+      // mark initialized
+      element.classList.add(ASYNC_TABLE_INITIALIZED_CLASS);
+
+      return {
+        name: ASYNC_TABLE_UTIL_NAME,
+        element: element,
+        destroy: function() {},
+      };
+    }
+
+    function setup() {
+      scrollTable = element.closest('.scrolltable');
+      if (!scrollTable) {
+        return false;
+      }
+
+      // sortable element headers
+      ths = Array.from(element.querySelectorAll('th.sortable')).map(function(th) {
         return { element: th };
       });
 
       // pagination links
-      var pagination = wrapper.querySelector('#' + tableIdent + '-pagination');
+      var pagination = element.querySelector('#' + asyncTableId + '-pagination');
       if (pagination) {
         pageLinks = Array.from(pagination.querySelectorAll('.page-link')).map(function(link) {
           return { element: link };
@@ -46,32 +89,39 @@
       }
 
       // pagesize form
-      pagesizeForm = wrapper.querySelector('#' + tableIdent + '-pagesize-form');
+      pagesizeForm = element.querySelector('#' + asyncTableId + '-pagesize-form');
 
-      // check all
-      utilInstances.push(window.utils.setup('checkAll', wrapper));
+      // // filter
+      // var filterForm = element.querySelector('.' + TABLE_FILTER_FORM_CLASS);
+      // if (filterForm) {
+      //   options.updateTableFrom = updateTableFrom;
+      //   utilInstances.push(window.utils.setup('asyncTableFilter', filterForm, options));
+      // }
 
-      // showhide
-      utilInstances.push(window.utils.setup('showHide', wrapper));
-
-      // filter
-      var filterForm = wrapper.querySelector('.' + TABLE_FILTER_FORM_CLASS);
-      if (filterForm) {
-        options.updateTableFrom = updateTableFrom;
-        utilInstances.push(window.utils.setup('asyncTableFilter', filterForm, options));
-      }
-
-      // take options into account
-      if (options.scrollTo) {
-        window.scrollTo(options.scrollTo);
-      }
-
-      if (options.horizPos && scrollTable) {
-        scrollTable.scrollLeft = options.horizPos;
-      }
+      processLocalStorage();
 
       setupListeners();
-      wrapper.classList.add(JS_INITIALIZED_CLASS);
+      element.classList.add(ASYNC_TABLE_INITIALIZED_CLASS);
+    }
+
+    function reset() {
+      removeListeners();
+
+      element.classList.remove(ASYNC_TABLE_INITIALIZED_CLASS);
+    }
+
+    function processLocalStorage() {
+      var scrollTo = getLocalStorageParameter('scrollTo');
+      if (scrollTo && scrollTable) {
+        window.scrollTo(scrollTo);
+        scrollTo = null;
+      }
+
+      var horizPos = getLocalStorageParameter('horizPos');
+      if (horizPos && scrollTable) {
+        scrollTable.scrollLeft = lastHorizontalPosition;
+        lastHorizontalPosition = null;
+      }
     }
 
     function setupListeners() {
@@ -79,6 +129,7 @@
         th.clickHandler = function(event) {
           var boundClickHandler = clickHandler.bind(this);
           var horizPos = (scrollTable || {}).scrollLeft;
+          lastHorizontalPosition = (scrollTable || {}).scrollLeft;
           boundClickHandler(event, { horizPos });
         };
         th.element.addEventListener('click', th.clickHandler);
@@ -88,13 +139,13 @@
         link.clickHandler = function(event) {
           var boundClickHandler = clickHandler.bind(this);
           var tableBoundingRect = scrollTable.getBoundingClientRect();
-          var tableOptions = {};
           if (tableBoundingRect.top < HEADER_HEIGHT) {
-            tableOptions.scrollTo = {
+            var scrollTo = {
               top: (scrollTable.offsetTop || 0) - HEADER_HEIGHT,
               left: scrollTable.offsetLeft || 0,
               behavior: 'smooth',
             };
+            setLocalStorageParameter('scrollTo', JSON.stringify(scrollTo));
           }
           boundClickHandler(event, tableOptions);
         }
@@ -102,7 +153,7 @@
       });
 
       if (pagesizeForm) {
-        var pagesizeSelect = pagesizeForm.querySelector('[name=' + tableIdent + '-pagesize]');
+        var pagesizeSelect = pagesizeForm.querySelector('[name=' + asyncTableId + '-pagesize]');
         pagesizeSelect.addEventListener('change', changePagesizeHandler);
       }
     }
@@ -117,7 +168,7 @@
       });
 
       if (pagesizeForm) {
-        var pagesizeSelect = pagesizeForm.querySelector('[name=' + tableIdent + '-pagesize]')
+        var pagesizeSelect = pagesizeForm.querySelector('[name=' + asyncTableId + '-pagesize]')
         pagesizeSelect.removeEventListener('change', changePagesizeHandler);
       }
     }
@@ -139,41 +190,42 @@
     }
 
     function changePagesizeHandler(event) {
-      var pagesizeParamKey = tableIdent + '-pagesize';
-      var pageParamKey = tableIdent + '-page';
-      var url = new URL(options.currentUrl || window.location.href);
+      var pagesizeParamKey = asyncTableId + '-pagesize';
+      var pageParamKey = asyncTableId + '-page';
+      var url = new URL(currentTableUrl || window.location.href);
       url.searchParams.set(pagesizeParamKey, event.target.value);
       url.searchParams.set(pageParamKey, 0);
       updateTableFrom(url);
     }
 
-    // fetches new sorted table from url with params and replaces contents of current table
+    // fetches new sorted element from url with params and replaces contents of current element
     function updateTableFrom(url, tableOptions, callback) {
-      if (!window.utils.httpClient) {
-        throw new Error('httpClient not found!');
+      if (!HttpClient) {
+        throw new Error('HttpClient not found!');
       }
 
-      wrapper.classList.add(ASYNC_TABLE_LOADING_CLASS);
+      element.classList.add(ASYNC_TABLE_LOADING_CLASS);
 
       tableOptions = tableOptions || {};
       var headers = {
         'Accept': 'text/html',
-        [shortCircuitHeader]: tableIdent
+        [asyncTableHeader]: asyncTableId
       };
-      window.utils.httpClient.get(url, headers).then(function(response) {
+
+      HttpClient.get(url, headers).then(function(response) {
         if (!response.ok) {
           throw new Error('Looks like there was a problem fetching ' + url.href + '. Status Code: ' + response.status);
         }
         return response.text();
       }).then(function(data) {
-        tableOptions.currentUrl = url.href;
-        removeListeners();
+        currentTableUrl = url.href;
+        reset();
         updateWrapperContents(data, tableOptions);
         if (callback && typeof callback === 'function') {
-          callback(wrapper);
+          callback(element);
         }
 
-        wrapper.classList.remove(ASYNC_TABLE_LOADING_CLASS);
+        element.classList.remove(ASYNC_TABLE_LOADING_CLASS);
       }).catch(function(err) {
         console.error(err);
       });
@@ -181,57 +233,73 @@
 
     function updateWrapperContents(newHtml, tableOptions) {
       tableOptions = tableOptions || {};
-      wrapper.innerHTML = newHtml;
-      wrapper.classList.remove(JS_INITIALIZED_CLASS);
-      wrapper.classList.add(ASYNC_TABLE_CONTENT_CHANGED_CLASS);
+      element.innerHTML = newHtml;
 
-      destroyUtils();
 
-      // merge global options and table specific options
-      var resetOptions = {};
-      Object.keys(options)
-        .filter(function(key) {
-          return !RESET_OPTIONS.includes(key);
-        })
-        .forEach(function(key) {
-          resetOptions[key] = options[key];
-        });
-      var combinedOptions = {};
-      combinedOptions = Object.keys(tableOptions)
-        .filter(function(key) {
-          return tableOptions.hasOwnProperty(key);
-        })
-        .map(function(key) {
-          return { key, value: tableOptions[key] }
-        })
-        .reduce(function(cumulatedOpts, opt) {
-          cumulatedOpts[opt.key] = opt.value;
-          return cumulatedOpts;
-        }, resetOptions);
+      // merge global options and element specific options
+      // var resetOptions = {};
+      // Object.keys(options)
+      //   .filter(function(key) {
+      //     return !RESET_OPTIONS.includes(key);
+      //   })
+      //   .forEach(function(key) {
+      //     resetOptions[key] = options[key];
+      //   });
+      // var combinedOptions = {};
+      // combinedOptions = Object.keys(tableOptions)
+      //   .filter(function(key) {
+      //     return tableOptions.hasOwnProperty(key);
+      //   })
+      //   .map(function(key) {
+      //     return { key, value: tableOptions[key] }
+      //   })
+      //   .reduce(function(cumulatedOpts, opt) {
+      //     cumulatedOpts[opt.key] = opt.value;
+      //     return cumulatedOpts;
+      //   }, resetOptions);
 
-      window.utils.setup('asyncTable', wrapper, combinedOptions);
 
-      Array.from(wrapper.querySelectorAll('form')).forEach(function(form) {
-        utilInstances.push(window.utils.setup('form', form));
-      });
-      Array.from(wrapper.querySelectorAll('.modal')).forEach(function(modal) {
-        utilInstances.push(window.utils.setup('modal', modal));
-      });
+      if (UtilRegistry) {
+        UtilRegistry.setupAll();
+      }
     }
 
-    function destroyUtils() {
-      utilInstances.filter(function(utilInstance) {
-        return !!utilInstance;
-      }).forEach(function(utilInstance) {
-        utilInstance.destroy();
-      });
-    }
-
-    init();
-
-    return {
-      scope: wrapper,
-      destroy: destroyUtils,
-    };
+    return init();
   };
+
+  function setLocalStorageParameter(key, value) {
+    var currentLSState = JSON.parse(window.localStorage.getItem(ASYNC_TABLE_LOCAL_STORAGE_KEY)) || {};
+    currentLSState[key] = value;
+    window.localStorage.setItem(ASYNC_TABLE_LOCAL_STORAGE_KEY, JSON.stringify(currentLSState));
+  }
+
+  function getLocalStorageParameter(key) {
+    var currentLSState = JSON.parse(window.localStorage.getItem(ASYNC_TABLE_LOCAL_STORAGE_KEY)) || {};
+    return currentLSState[key];
+  }
+
+  // debounce function, taken from Underscore.js
+  function debounce(func, wait, immediate) {
+    var timeout;
+    return function() {
+      var context = this, args = arguments;
+      var later = function() {
+        timeout = null;
+        if (!immediate) func.apply(context, args);
+      };
+      var callNow = immediate && !timeout;
+      clearTimeout(timeout);
+      timeout = setTimeout(later, wait);
+      if (callNow) func.apply(context, args);
+    };
+  }
+
+  // register async table utility
+  if (UtilRegistry) {
+    UtilRegistry.register({
+      name: ASYNC_TABLE_UTIL_NAME,
+      selector: ASYNC_TABLE_UTIL_SELECTOR,
+      setup: asyncTableUtil,
+    });
+  }
 })();
diff --git a/static/js/utils/checkAll.js b/static/js/utils/checkAll.js
index 7aeb65ccb..894f5fe0d 100644
--- a/static/js/utils/checkAll.js
+++ b/static/js/utils/checkAll.js
@@ -98,6 +98,7 @@
       th.innerHTML = '';
       th.insertBefore(checkAllCheckbox, null);
 
+      // manually set up newly created checkbox
       if (UtilRegistry) {
         UtilRegistry.setup(UtilRegistry.find('checkbox'));
       }
diff --git a/templates/table/colonnade.hamlet b/templates/table/colonnade.hamlet
index 9ccea4ef8..71938bc4a 100644
--- a/templates/table/colonnade.hamlet
+++ b/templates/table/colonnade.hamlet
@@ -1,6 +1,6 @@
 $newline never
 <div .scrolltable>
-  <table *{dbsAttrs'}>
+  <table *{dbsAttrs'} data-async-table-db-header=#{toPathPiece HeaderDBTableShortcircuit}>
     $maybe wHeaders' <- wHeaders
       <thead>
         <tr .table__row.table__row--head>
diff --git a/templates/table/layout.julius b/templates/table/layout.julius
deleted file mode 100644
index 51dad6a82..000000000
--- a/templates/table/layout.julius
+++ /dev/null
@@ -1,10 +0,0 @@
-document.addEventListener('DOMContentLoaded', function() {
-  var dbtIdent = #{String dbtIdent};
-  var headerDBTableShortcircuit = #{String (toPathPiece HeaderDBTableShortcircuit)};
-  var selector = '#' + dbtIdent + '-table-wrapper';
-  var wrapper = document.querySelector(selector);
-
-  if (wrapper) {
-    window.utils.setup('asyncTable', wrapper, { headerDBTableShortcircuit, dbtIdent });
-  }
-});

From c654f3d6ab257f0d2aee04141fd97ae1fdd95b54 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Mon, 8 Apr 2019 21:04:55 +0200
Subject: [PATCH 040/238] fail silently if already setup JS utilities are setup
 again

---
 static/js/utils/form.js     | 10 +++++-----
 static/js/utils/modal.js    |  2 +-
 static/js/utils/showHide.js |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index 7beea537e..baa0eb9e6 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -28,7 +28,7 @@
 
   var REACTIVE_SUBMIT_BUTTON_INITIALIZED_CLASS = 'reactive-submit-button--initialized';
 
-  var reactiveButtonUtil = function(element) {
+  var reactiveSubmitButtonUtil = function(element) {
     var requiredInputs;
     var submitButton;
 
@@ -38,7 +38,7 @@
       }
 
       if (element.classList.contains(REACTIVE_SUBMIT_BUTTON_INITIALIZED_CLASS)) {
-        throw new Error('Reactive Submit Button utility already initialized!');
+        return false;
       }
 
       // abort if form has param data-formnorequired
@@ -53,7 +53,7 @@
       }
 
       var submitButtons = Array.from(element.querySelectorAll('[type="submit"]'));
-      if (!submitButtons) {
+      if (!submitButtons || !submitButtons.length) {
         throw new Error('Reactive Submit Button utility couldn\'t find any submit buttons!');
       }
       submitButton = submitButtons.reverse()[0];
@@ -109,7 +109,7 @@
   formUtilities.push({
     name: REACTIVE_SUBMIT_BUTTON_UTIL_NAME,
     selector: REACTIVE_SUBMIT_BUTTON_UTIL_SELECTOR,
-    setup: reactiveButtonUtil,
+    setup: reactiveSubmitButtonUtil,
   });
 
   /**
@@ -152,7 +152,7 @@
       }
 
       if (element.classList.contains(INTERACTIVE_FIELDSET_INITIALIZED_CLASS)) {
-        throw new Error('Interactive Fieldset utility already initialized!');
+        return false;
       }
 
       // param conditionalInput
diff --git a/static/js/utils/modal.js b/static/js/utils/modal.js
index 7a5c49543..6b5f0fba1 100644
--- a/static/js/utils/modal.js
+++ b/static/js/utils/modal.js
@@ -48,7 +48,7 @@
       }
 
       if (element.classList.contains(MODAL_INITIALIZED_CLASS)) {
-        throw new Error('Modal utility already initialized!');
+        return false;
       }
 
       // param modalTrigger
diff --git a/static/js/utils/showHide.js b/static/js/utils/showHide.js
index cd3a6e4ac..e2b25e200 100644
--- a/static/js/utils/showHide.js
+++ b/static/js/utils/showHide.js
@@ -40,7 +40,7 @@
       }
 
       if (element.classList.contains(SHOW_HIDE_INITIALIZED_CLASS)) {
-        throw new Error('ShowHide utility already initialized!');
+        return false;
       }
 
       // register click listener

From 8b1fae28561480a1675da11359ff5f18c99ffbbc Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Mon, 8 Apr 2019 21:06:09 +0200
Subject: [PATCH 041/238] async table js utility now with explicit selector

---
 static/js/utils/asyncTable.js         | 187 +++++++++++---------------
 templates/table/layout-wrapper.hamlet |   2 +-
 2 files changed, 82 insertions(+), 107 deletions(-)

diff --git a/static/js/utils/asyncTable.js b/static/js/utils/asyncTable.js
index 1f2ba3c36..cbb48b2b9 100644
--- a/static/js/utils/asyncTable.js
+++ b/static/js/utils/asyncTable.js
@@ -6,15 +6,14 @@
    * Async Table Utility
    *  makes table filters, sorting and pagination behave asynchronously via AJAX calls
    *
-   * Attribute: [none]
-   *   (will be set up automatically on tables)
+   * Attribute: uw-async-table
    *
    * Example usage:
   *   (regular table)
    */
 
   var ASYNC_TABLE_UTIL_NAME = 'asyncTable';
-  var ASYNC_TABLE_UTIL_SELECTOR = 'table';
+  var ASYNC_TABLE_UTIL_SELECTOR = '[uw-async-table]';
 
   var ASYNC_TABLE_LOCAL_STORAGE_KEY = 'ASYNC_TABLE';
 
@@ -33,16 +32,12 @@
   var asyncTableUtil = function(element) {
     var asyncTableHeader;
     var asyncTableId;
-    var lastHorizontalPosition;
-    var currentTableUrl;
 
     var ths = [];
     var pageLinks = [];
     var pagesizeForm;
     var scrollTable;
 
-    var utilInstances = [];
-
     function init() {
       if (!element) {
         throw new Error('Async Table utility cannot be setup without an element!');
@@ -53,11 +48,20 @@
         asyncTableHeader = element.dataset.asyncTableDbHeader;
       }
 
-      asyncTableId = element.id;
+      asyncTableId = element.querySelector('table').id;
 
-      console.log('asyncTable.init()', { asyncTableId });
+      // find scrolltable wrapper
+      scrollTable = element.querySelector('.scrolltable');
+      if (!scrollTable) {
+        throw new Error('Async Table cannot be set up without a .scrolltable element!');
+      }
 
-      setup();
+      setupSortableHeaders();
+      setupPagination();
+      setupPageSizeSelect();
+      setupTableFilter();
+
+      processLocalStorage();
 
       // mark initialized
       element.classList.add(ASYNC_TABLE_INITIALIZED_CLASS);
@@ -69,44 +73,67 @@
       };
     }
 
-    function setup() {
-      scrollTable = element.closest('.scrolltable');
-      if (!scrollTable) {
-        return false;
-      }
-
-      // sortable element headers
-      ths = Array.from(element.querySelectorAll('th.sortable')).map(function(th) {
+    function setupSortableHeaders() {
+      ths = Array.from(scrollTable.querySelectorAll('th.sortable')).map(function(th) {
         return { element: th };
       });
 
-      // pagination links
+      ths.forEach(function(th) {
+        th.clickHandler = function(event) {
+          var horizPos = (scrollTable || {}).scrollLeft;
+          setLocalStorageParameter('horizPos', horizPos);
+          clickHandler(event);
+        };
+        th.element.addEventListener('click', th.clickHandler);
+      });
+    }
+
+    function setupPagination() {
       var pagination = element.querySelector('#' + asyncTableId + '-pagination');
       if (pagination) {
         pageLinks = Array.from(pagination.querySelectorAll('.page-link')).map(function(link) {
           return { element: link };
         });
-      }
 
+        pageLinks.forEach(function(link) {
+          link.clickHandler = function(event) {
+            var tableBoundingRect = scrollTable.getBoundingClientRect();
+            if (tableBoundingRect.top < HEADER_HEIGHT) {
+              var scrollTo = {
+                top: (scrollTable.offsetTop || 0) - HEADER_HEIGHT,
+                left: scrollTable.offsetLeft || 0,
+                behavior: 'smooth',
+              };
+              setLocalStorageParameter('scrollTo', scrollTo);
+            }
+            clickHandler(event);
+          }
+          link.element.addEventListener('click', link.clickHandler);
+        });
+      }
+    }
+
+    function setupPageSizeSelect() {
       // pagesize form
       pagesizeForm = element.querySelector('#' + asyncTableId + '-pagesize-form');
 
+      if (pagesizeForm) {
+        var pagesizeSelect = pagesizeForm.querySelector('[name=' + asyncTableId + '-pagesize]');
+        pagesizeSelect.addEventListener('change', changePagesizeHandler);
+      }
+    }
+
+    function setupTableFilter() {
       // // filter
       // var filterForm = element.querySelector('.' + TABLE_FILTER_FORM_CLASS);
       // if (filterForm) {
       //   options.updateTableFrom = updateTableFrom;
       //   utilInstances.push(window.utils.setup('asyncTableFilter', filterForm, options));
       // }
-
-      processLocalStorage();
-
-      setupListeners();
-      element.classList.add(ASYNC_TABLE_INITIALIZED_CLASS);
     }
 
     function reset() {
       removeListeners();
-
       element.classList.remove(ASYNC_TABLE_INITIALIZED_CLASS);
     }
 
@@ -114,48 +141,14 @@
       var scrollTo = getLocalStorageParameter('scrollTo');
       if (scrollTo && scrollTable) {
         window.scrollTo(scrollTo);
-        scrollTo = null;
       }
+      setLocalStorageParameter('scrollTo', null);
 
       var horizPos = getLocalStorageParameter('horizPos');
       if (horizPos && scrollTable) {
-        scrollTable.scrollLeft = lastHorizontalPosition;
-        lastHorizontalPosition = null;
-      }
-    }
-
-    function setupListeners() {
-      ths.forEach(function(th) {
-        th.clickHandler = function(event) {
-          var boundClickHandler = clickHandler.bind(this);
-          var horizPos = (scrollTable || {}).scrollLeft;
-          lastHorizontalPosition = (scrollTable || {}).scrollLeft;
-          boundClickHandler(event, { horizPos });
-        };
-        th.element.addEventListener('click', th.clickHandler);
-      });
-
-      pageLinks.forEach(function(link) {
-        link.clickHandler = function(event) {
-          var boundClickHandler = clickHandler.bind(this);
-          var tableBoundingRect = scrollTable.getBoundingClientRect();
-          if (tableBoundingRect.top < HEADER_HEIGHT) {
-            var scrollTo = {
-              top: (scrollTable.offsetTop || 0) - HEADER_HEIGHT,
-              left: scrollTable.offsetLeft || 0,
-              behavior: 'smooth',
-            };
-            setLocalStorageParameter('scrollTo', JSON.stringify(scrollTo));
-          }
-          boundClickHandler(event, tableOptions);
-        }
-        link.element.addEventListener('click', link.clickHandler);
-      });
-
-      if (pagesizeForm) {
-        var pagesizeSelect = pagesizeForm.querySelector('[name=' + asyncTableId + '-pagesize]');
-        pagesizeSelect.addEventListener('change', changePagesizeHandler);
+        scrollTable.scrollLeft = horizPos;
       }
+      setLocalStorageParameter('horizPos', null);
     }
 
     function removeListeners() {
@@ -173,40 +166,41 @@
       }
     }
 
-    function clickHandler(event, tableOptions) {
+    function clickHandler(event) {
       event.preventDefault();
-      var url = getClickDestination(this);
+      var url = getClickDestination(event.target);
       if (!url.match(/^http/)) {
-        url = new URL(window.location.origin + window.location.pathname + getClickDestination(this));
+        url = window.location.origin + window.location.pathname + url;
       }
-      updateTableFrom(url, tableOptions);
+      updateTableFrom(url);
     }
 
     function getClickDestination(el) {
-      if (!el.querySelector('a')) {
+      if (!el.matches('a') && !el.querySelector('a')) {
         return '';
       }
-      return el.querySelector('a').getAttribute('href');
+      return el.getAttribute('href') || el.querySelector('a').getAttribute('href');
     }
 
     function changePagesizeHandler(event) {
       var pagesizeParamKey = asyncTableId + '-pagesize';
       var pageParamKey = asyncTableId + '-page';
-      var url = new URL(currentTableUrl || window.location.href);
+      var url = new URL(getLocalStorageParameter('currentTableUrl') || window.location.href);
       url.searchParams.set(pagesizeParamKey, event.target.value);
       url.searchParams.set(pageParamKey, 0);
-      updateTableFrom(url);
+      updateTableFrom(url.href);
     }
 
     // fetches new sorted element from url with params and replaces contents of current element
-    function updateTableFrom(url, tableOptions, callback) {
+    function updateTableFrom(url) {
       if (!HttpClient) {
         throw new Error('HttpClient not found!');
       }
 
+      console.log('updating from ', { url });
+
       element.classList.add(ASYNC_TABLE_LOADING_CLASS);
 
-      tableOptions = tableOptions || {};
       var headers = {
         'Accept': 'text/html',
         [asyncTableHeader]: asyncTableId
@@ -218,12 +212,11 @@
         }
         return response.text();
       }).then(function(data) {
-        currentTableUrl = url.href;
+        setLocalStorageParameter('currentTableUrl', url.href);
+        // reset table
         reset();
-        updateWrapperContents(data, tableOptions);
-        if (callback && typeof callback === 'function') {
-          callback(element);
-        }
+        // update table with new
+        updateWrapperContents(data);
 
         element.classList.remove(ASYNC_TABLE_LOADING_CLASS);
       }).catch(function(err) {
@@ -231,33 +224,11 @@
       });
     }
 
-    function updateWrapperContents(newHtml, tableOptions) {
-      tableOptions = tableOptions || {};
-      element.innerHTML = newHtml;
-
-
-      // merge global options and element specific options
-      // var resetOptions = {};
-      // Object.keys(options)
-      //   .filter(function(key) {
-      //     return !RESET_OPTIONS.includes(key);
-      //   })
-      //   .forEach(function(key) {
-      //     resetOptions[key] = options[key];
-      //   });
-      // var combinedOptions = {};
-      // combinedOptions = Object.keys(tableOptions)
-      //   .filter(function(key) {
-      //     return tableOptions.hasOwnProperty(key);
-      //   })
-      //   .map(function(key) {
-      //     return { key, value: tableOptions[key] }
-      //   })
-      //   .reduce(function(cumulatedOpts, opt) {
-      //     cumulatedOpts[opt.key] = opt.value;
-      //     return cumulatedOpts;
-      //   }, resetOptions);
-
+    function updateWrapperContents(newHtml) {
+      var newPage = document.createElement('div');
+      newPage.innerHTML = newHtml;
+      var newWrapperContents = newPage.querySelector('#' + element.id);
+      element.innerHTML = newWrapperContents.innerHTML;
 
       if (UtilRegistry) {
         UtilRegistry.setupAll();
@@ -269,7 +240,11 @@
 
   function setLocalStorageParameter(key, value) {
     var currentLSState = JSON.parse(window.localStorage.getItem(ASYNC_TABLE_LOCAL_STORAGE_KEY)) || {};
-    currentLSState[key] = value;
+    if (value !== null) {
+      currentLSState[key] = value;
+    } else {
+      delete currentLSState[key];
+    }
     window.localStorage.setItem(ASYNC_TABLE_LOCAL_STORAGE_KEY, JSON.stringify(currentLSState));
   }
 
diff --git a/templates/table/layout-wrapper.hamlet b/templates/table/layout-wrapper.hamlet
index bfa000765..fc144c1ed 100644
--- a/templates/table/layout-wrapper.hamlet
+++ b/templates/table/layout-wrapper.hamlet
@@ -1,3 +1,3 @@
 $newline never
-<div ##{wIdent "table-wrapper"}>
+<div ##{wIdent "table-wrapper"} uw-async-table>
   ^{table}

From cef1695fa7daeb8d0fb773c11566319551bd132d Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Mon, 8 Apr 2019 21:24:23 +0200
Subject: [PATCH 042/238] add table filter to async table js utility

---
 static/js/utils/asyncTable.js | 144 +++++++++++++++++++++++++++++++---
 1 file changed, 134 insertions(+), 10 deletions(-)

diff --git a/static/js/utils/asyncTable.js b/static/js/utils/asyncTable.js
index cbb48b2b9..09596f61e 100644
--- a/static/js/utils/asyncTable.js
+++ b/static/js/utils/asyncTable.js
@@ -23,11 +23,10 @@
   var INPUT_DEBOUNCE = 600;
 
   var HEADER_HEIGHT = 80;
-  var RESET_OPTIONS = [ 'scrollTo' ];
-  var TABLE_FILTER_FORM_CLASS = 'table-filter-form';
+  var TABLE_FILTER_FORM_SELECTOR = '.table-filter-form';
+  var TABLE_FILTER_FORM_ID_SELECTOR = '[name="form-identifier"]';
 
   var ASYNC_TABLE_LOADING_CLASS = 'async-table--loading';
-  var ASYNC_TABLE_FILTER_LOADING_CLASS = 'async-table-filter--loading';
 
   var asyncTableUtil = function(element) {
     var asyncTableHeader;
@@ -38,6 +37,13 @@
     var pagesizeForm;
     var scrollTable;
 
+    var tableFilterInputs = {
+      search: [],
+      input: [],
+      change: [],
+      select: [],
+    }
+
     function init() {
       if (!element) {
         throw new Error('Async Table utility cannot be setup without an element!');
@@ -124,12 +130,126 @@
     }
 
     function setupTableFilter() {
-      // // filter
-      // var filterForm = element.querySelector('.' + TABLE_FILTER_FORM_CLASS);
-      // if (filterForm) {
-      //   options.updateTableFrom = updateTableFrom;
-      //   utilInstances.push(window.utils.setup('asyncTableFilter', filterForm, options));
-      // }
+      var filterForm = element.querySelector(TABLE_FILTER_FORM_SELECTOR);
+
+      if (filterForm) {
+        gatherTableFilterInputs();
+        addTableFilterEventListeners();
+      }
+    }
+
+    function gatherTableFilterInputs() {
+      Array.from(element.querySelectorAll('input[type="search"]')).forEach(function(input) {
+        tableFilterInputs.search.push(input);
+      });
+
+      Array.from(element.querySelectorAll('input[type="text"]')).forEach(function(input) {
+        tableFilterInputs.input.push(input);
+      });
+
+      Array.from(element.querySelectorAll('input:not([type="text"]):not([type="search"])')).forEach(function(input) {
+        tableFilterInputs.change.push(input);
+      });
+
+      Array.from(element.querySelectorAll('select')).forEach(function(input) {
+        tableFilterInputs.select.push(input);
+      });
+    }
+
+    function addTableFilterEventListeners() {
+      tableFilterInputs.search.forEach(function(input) {
+        var debouncedInput = debounce(function() {
+          if (input.value.length === 0 || input.value.length > 2) {
+            updateFromTableFilter();
+          }
+        }, INPUT_DEBOUNCE);
+        input.addEventListener('input', debouncedInput);
+      });
+
+      tableFilterInputs.input.forEach(function(input) {
+        var debouncedInput = debounce(function() {
+          if (input.value.length === 0 || input.value.length > 2) {
+            updateFromTableFilter();
+          }
+        }, INPUT_DEBOUNCE);
+        input.addEventListener('input', debouncedInput);
+      });
+
+      tableFilterInputs.change.forEach(function(input) {
+        input.addEventListener('change', function() {
+          updateFromTableFilter();
+        });
+      });
+
+      tableFilterInputs.select.forEach(function(input) {
+        input.addEventListener('change', function() {
+          updateFromTableFilter();
+        });
+      });
+
+      element.addEventListener('submit', function(event) {
+        event.preventDefault();
+        updateFromTableFilter();
+      });
+    }
+
+    function updateFromTableFilter() {
+      var url = serializeTableFilterToURL();
+      var callback = null;
+
+      var focusedSearch = tableFilterInputs.search.reduce(function(acc, input) {
+        return acc || (input.matches(':focus') && input);
+      }, null);
+      // focus search input
+      if (focusedSearch) {
+        var selectionStart = focusedSearch.selectionStart;
+        callback = function(wrapper) {
+          var search = wrapper.querySelector('input[type="search"]');
+          if (search) {
+            search.focus();
+            search.selectionStart = selectionStart;
+          }
+        };
+      }
+      updateTableFrom(url, callback);
+    }
+
+    function serializeTableFilterToURL() {
+      var url = new URL(getLocalStorageParameter('currentTableUrl') || window.location.href);
+
+      var formIdElement = element.querySelector(TABLE_FILTER_FORM_ID_SELECTOR);
+      if (!formIdElement) {
+        // cannot serialize the filter form without an identifier
+        return;
+      }
+
+      url.searchParams.set('form-identifier', formIdElement.value);
+      url.searchParams.set('_hasdata', 'true');
+      url.searchParams.set(asyncTableId + '-page', '0');
+
+      tableFilterInputs.search.forEach(function(input) {
+        url.searchParams.set(input.name, input.value);
+      });
+
+      tableFilterInputs.input.forEach(function(input) {
+        url.searchParams.set(input.name, input.value);
+      });
+
+      tableFilterInputs.change.forEach(function(input) {
+        if (input.checked) {
+          url.searchParams.set(input.name, input.value);
+        }
+      });
+
+      tableFilterInputs.select.forEach(function(select) {
+        var options = Array.from(select.querySelectorAll('option'));
+        var selected = options.find(function(option) { return option.selected });
+        if (selected) {
+          url.searchParams.set(select.name, selected.value);
+        }
+      });
+
+      return url;
     }
 
     function reset() {
@@ -192,7 +312,7 @@
     }
 
     // fetches new sorted element from url with params and replaces contents of current element
-    function updateTableFrom(url) {
+    function updateTableFrom(url, callback) {
       if (!HttpClient) {
         throw new Error('HttpClient not found!');
       }
@@ -218,6 +338,10 @@
         // update table with new
         updateWrapperContents(data);
 
+        if (callback && typeof callback === 'function') {
+          callback(element);
+        }
+
         element.classList.remove(ASYNC_TABLE_LOADING_CLASS);
       }).catch(function(err) {
         console.error(err);

From 2a311917b33640a7a0ca7390b4769b95283aa27b Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 9 Apr 2019 21:07:27 +0200
Subject: [PATCH 043/238] cleanup async table js utility

---
 static/js/utils/asyncTable.js       |  44 +++----
 static/js/utils/asyncTableFilter.js | 171 ----------------------------
 2 files changed, 18 insertions(+), 197 deletions(-)
 delete mode 100644 static/js/utils/asyncTableFilter.js

diff --git a/static/js/utils/asyncTable.js b/static/js/utils/asyncTable.js
index 09596f61e..528ad1e1e 100644
--- a/static/js/utils/asyncTable.js
+++ b/static/js/utils/asyncTable.js
@@ -12,22 +12,21 @@
   *   (regular table)
    */
 
+  var INPUT_DEBOUNCE = 600;
+  var HEADER_HEIGHT = 80;
+
   var ASYNC_TABLE_UTIL_NAME = 'asyncTable';
   var ASYNC_TABLE_UTIL_SELECTOR = '[uw-async-table]';
 
   var ASYNC_TABLE_LOCAL_STORAGE_KEY = 'ASYNC_TABLE';
-
+  var ASYNC_TABLE_SCROLLTABLE_SELECTOR = '.scrolltable';
   var ASYNC_TABLE_INITIALIZED_CLASS = 'async-table--initialized';
-
-
-  var INPUT_DEBOUNCE = 600;
-
-  var HEADER_HEIGHT = 80;
-  var TABLE_FILTER_FORM_SELECTOR = '.table-filter-form';
-  var TABLE_FILTER_FORM_ID_SELECTOR = '[name="form-identifier"]';
-
   var ASYNC_TABLE_LOADING_CLASS = 'async-table--loading';
 
+  var ASYNC_TABLE_FILTER_FORM_SELECTOR = '.table-filter-form';
+  var ASYNC_TABLE_FILTER_FORM_ID_SELECTOR = '[name="form-identifier"]';
+
+
   var asyncTableUtil = function(element) {
     var asyncTableHeader;
     var asyncTableId;
@@ -57,9 +56,9 @@
       asyncTableId = element.querySelector('table').id;
 
       // find scrolltable wrapper
-      scrollTable = element.querySelector('.scrolltable');
+      scrollTable = element.querySelector(ASYNC_TABLE_SCROLLTABLE_SELECTOR);
       if (!scrollTable) {
-        throw new Error('Async Table cannot be set up without a .scrolltable element!');
+        throw new Error('Async Table cannot be set up without a scrolltable element!');
       }
 
       setupSortableHeaders();
@@ -86,9 +85,8 @@
 
       ths.forEach(function(th) {
         th.clickHandler = function(event) {
-          var horizPos = (scrollTable || {}).scrollLeft;
-          setLocalStorageParameter('horizPos', horizPos);
-          clickHandler(event);
+          setLocalStorageParameter('horizPos', (scrollTable || {}).scrollLeft);
+          linkClickHandler(event);
         };
         th.element.addEventListener('click', th.clickHandler);
       });
@@ -112,7 +110,7 @@
               };
               setLocalStorageParameter('scrollTo', scrollTo);
             }
-            clickHandler(event);
+            linkClickHandler(event);
           }
           link.element.addEventListener('click', link.clickHandler);
         });
@@ -130,7 +128,7 @@
     }
 
     function setupTableFilter() {
-      var filterForm = element.querySelector(TABLE_FILTER_FORM_SELECTOR);
+      var filterForm = element.querySelector(ASYNC_TABLE_FILTER_FORM_SELECTOR);
 
       if (filterForm) {
         gatherTableFilterInputs();
@@ -217,7 +215,7 @@
     function serializeTableFilterToURL() {
       var url = new URL(getLocalStorageParameter('currentTableUrl') || window.location.href);
 
-      var formIdElement = element.querySelector(TABLE_FILTER_FORM_ID_SELECTOR);
+      var formIdElement = element.querySelector(ASYNC_TABLE_FILTER_FORM_ID_SELECTOR);
       if (!formIdElement) {
         // cannot serialize the filter form without an identifier
         return;
@@ -252,11 +250,6 @@
       return url;
     }
 
-    function reset() {
-      removeListeners();
-      element.classList.remove(ASYNC_TABLE_INITIALIZED_CLASS);
-    }
-
     function processLocalStorage() {
       var scrollTo = getLocalStorageParameter('scrollTo');
       if (scrollTo && scrollTable) {
@@ -286,7 +279,7 @@
       }
     }
 
-    function clickHandler(event) {
+    function linkClickHandler(event) {
       event.preventDefault();
       var url = getClickDestination(event.target);
       if (!url.match(/^http/)) {
@@ -317,8 +310,6 @@
         throw new Error('HttpClient not found!');
       }
 
-      console.log('updating from ', { url });
-
       element.classList.add(ASYNC_TABLE_LOADING_CLASS);
 
       var headers = {
@@ -334,7 +325,8 @@
       }).then(function(data) {
         setLocalStorageParameter('currentTableUrl', url.href);
         // reset table
-        reset();
+        removeListeners();
+        element.classList.remove(ASYNC_TABLE_INITIALIZED_CLASS);
         // update table with new
         updateWrapperContents(data);
 
diff --git a/static/js/utils/asyncTableFilter.js b/static/js/utils/asyncTableFilter.js
deleted file mode 100644
index 6030ead66..000000000
--- a/static/js/utils/asyncTableFilter.js
+++ /dev/null
@@ -1,171 +0,0 @@
-(function () {
-  'use strict';
-
-  window.utils = window.utils || {};
-
-  var ASYNC_TABLE_FILTER_LOADING_CLASS = 'async-table-filter--loading';
-  var JS_INITIALIZED_CLASS = 'js-async-table-filter-initialized';
-  var INPUT_DEBOUNCE = 600;
-
-  // debounce function, taken from Underscore.js
-  function debounce(func, wait, immediate) {
-    var timeout;
-    return function() {
-      var context = this, args = arguments;
-      var later = function() {
-        timeout = null;
-        if (!immediate) func.apply(context, args);
-      };
-      var callNow = immediate && !timeout;
-      clearTimeout(timeout);
-      timeout = setTimeout(later, wait);
-      if (callNow) func.apply(context, args);
-    };
-  };
-
-  window.utils.asyncTableFilter = function(formElement, options) {
-    if (!options || !options.updateTableFrom) {
-      return false;
-    }
-
-    if (formElement.matches('.' + JS_INITIALIZED_CLASS)) {
-      return false;
-    }
-
-    var formIdElement = formElement.querySelector('[name="form-identifier"]');
-    if (!formIdElement) {
-      return;
-    }
-
-    options = options || {};
-    var tableIdent = options.dbtIdent;
-    var formId = formIdElement.value;
-    var inputs = {
-      search: [],
-      input: [],
-      change: [],
-      select: [],
-    }
-
-    function setup() {
-      gatherInputs();
-      addEventListeners();
-    }
-
-    function gatherInputs() {
-      Array.from(formElement.querySelectorAll('input[type="search"]')).forEach(function(input) {
-        inputs.search.push(input);
-      });
-
-      Array.from(formElement.querySelectorAll('input[type="text"]')).forEach(function(input) {
-        inputs.input.push(input);
-      });
-
-      Array.from(formElement.querySelectorAll('input:not([type="text"]):not([type="search"])')).forEach(function(input) {
-        inputs.change.push(input);
-      });
-
-      Array.from(formElement.querySelectorAll('select')).forEach(function(input) {
-        inputs.select.push(input);
-      });
-    }
-
-    function addEventListeners() {
-      inputs.search.forEach(function(input) {
-        var debouncedInput = debounce(function() {
-          if (input.value.length === 0 || input.value.length > 2) {
-            updateTable();
-          }
-        }, INPUT_DEBOUNCE);
-        input.addEventListener('input', debouncedInput);
-      });
-
-      inputs.input.forEach(function(input) {
-        var debouncedInput = debounce(function() {
-          if (input.value.length === 0 || input.value.length > 2) {
-            updateTable();
-          }
-        }, INPUT_DEBOUNCE);
-        input.addEventListener('input', debouncedInput);
-      });
-
-      inputs.change.forEach(function(input) {
-        input.addEventListener('change', function() {
-          updateTable();
-        });
-      });
-
-      inputs.select.forEach(function(input) {
-        input.addEventListener('change', function() {
-          updateTable();
-        });
-      });
-
-      formElement.addEventListener('submit', function(event) {
-        event.preventDefault();
-        updateTable();
-      });
-    }
-
-    function updateTable() {
-      var url = serializeFormToURL();
-      var callback = null;
-
-      formElement.classList.add(ASYNC_TABLE_FILTER_LOADING_CLASS);
-
-      var focusedSearch = inputs.search.reduce(function(acc, input) {
-        return acc || (input.matches(':focus') && input);
-      }, null);
-      // focus search input
-      if (focusedSearch) {
-        var selectionStart = focusedSearch.selectionStart;
-        callback = function(wrapper) {
-          var search = wrapper.querySelector('input[type="search"]');
-          if (search) {
-            search.focus();
-            search.selectionStart = selectionStart;
-          }
-        };
-      }
-      options.updateTableFrom(url, options, callback);
-    }
-
-    function serializeFormToURL() {
-      var url = new URL(options.currentUrl || window.location.href);
-      url.searchParams.set('form-identifier', formId);
-      url.searchParams.set('_hasdata', 'true');
-      url.searchParams.set(tableIdent + '-page', '0');
-
-      inputs.search.forEach(function(input) {
-        url.searchParams.set(input.name, input.value);
-      });
-
-      inputs.input.forEach(function(input) {
-        url.searchParams.set(input.name, input.value);
-      });
-
-      inputs.change.forEach(function(input) {
-        if (input.checked) {
-          url.searchParams.set(input.name, input.value);
-        }
-      });
-
-      inputs.select.forEach(function(select) {
-        var options = Array.from(select.querySelectorAll('option'));
-        var selected = options.find(function(option) { return option.selected });
-        if (selected) {
-          url.searchParams.set(select.name, selected.value);
-        }
-      });
-
-      return url;
-    }
-
-    setup();
-
-    return {
-      scope: formElement,
-      destroy: function() {},
-    };
-  }
-})();

From e10f7253039982f3f11750ed503fc1a1d9b17c40 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 9 Apr 2019 21:14:54 +0200
Subject: [PATCH 044/238] fix issue with table filter listening for wrong
 checkboxes

---
 static/js/utils/asyncTable.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/static/js/utils/asyncTable.js b/static/js/utils/asyncTable.js
index 528ad1e1e..86bcd38fa 100644
--- a/static/js/utils/asyncTable.js
+++ b/static/js/utils/asyncTable.js
@@ -128,28 +128,28 @@
     }
 
     function setupTableFilter() {
-      var filterForm = element.querySelector(ASYNC_TABLE_FILTER_FORM_SELECTOR);
+      var tableFilterForm = element.querySelector(ASYNC_TABLE_FILTER_FORM_SELECTOR);
 
-      if (filterForm) {
-        gatherTableFilterInputs();
+      if (tableFilterForm) {
+        gatherTableFilterInputs(tableFilterForm);
         addTableFilterEventListeners();
       }
     }
 
-    function gatherTableFilterInputs() {
-      Array.from(element.querySelectorAll('input[type="search"]')).forEach(function(input) {
+    function gatherTableFilterInputs(tableFilterForm) {
+      Array.from(tableFilterForm.querySelectorAll('input[type="search"]')).forEach(function(input) {
         tableFilterInputs.search.push(input);
       });
 
-      Array.from(element.querySelectorAll('input[type="text"]')).forEach(function(input) {
+      Array.from(tableFilterForm.querySelectorAll('input[type="text"]')).forEach(function(input) {
         tableFilterInputs.input.push(input);
       });
 
-      Array.from(element.querySelectorAll('input:not([type="text"]):not([type="search"])')).forEach(function(input) {
+      Array.from(tableFilterForm.querySelectorAll('input:not([type="text"]):not([type="search"])')).forEach(function(input) {
         tableFilterInputs.change.push(input);
       });
 
-      Array.from(element.querySelectorAll('select')).forEach(function(input) {
+      Array.from(tableFilterForm.querySelectorAll('select')).forEach(function(input) {
         tableFilterInputs.select.push(input);
       });
     }

From 63aef9e3625db7acedaeb0f1b8334628baea1ade Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 9 Apr 2019 21:32:19 +0200
Subject: [PATCH 045/238] remove obsolete julius files

---
 src/Foundation.hs                             |  3 --
 src/Utils/Modal.hs                            |  1 -
 static/js/utils/checkAll.js                   |  2 +-
 templates/widgets/modal/modal.julius          |  6 ----
 templates/widgets/navbar/navbar.julius        | 31 -------------------
 .../widgets/pageaction/pageaction.julius      |  0
 6 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 templates/widgets/modal/modal.julius
 delete mode 100644 templates/widgets/navbar/navbar.julius
 delete mode 100644 templates/widgets/pageaction/pageaction.julius

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 5360390d9..22af31b8f 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1070,9 +1070,6 @@ siteLayout' headingOverride widget = do
       addScript $ StaticR js_services_i18n_js
       -- addScript $ StaticR js_utils_alerts_js
       -- addScript $ StaticR js_utils_asidenav_js
-      -- addScript $ StaticR js_utils_asyncForm_js
-      -- addScript $ StaticR js_utils_asyncTableFilter_js
-      -- addScript $ StaticR js_utils_httpClient_js
       -- JavaScript utils
       addScript $ StaticR js_utils_asyncTable_js
       addScript $ StaticR js_utils_checkAll_js
diff --git a/src/Utils/Modal.hs b/src/Utils/Modal.hs
index 5dd4ccd3e..d62b64607 100644
--- a/src/Utils/Modal.hs
+++ b/src/Utils/Modal.hs
@@ -23,7 +23,6 @@ data Modal site = Modal
 customModal :: Modal site -> WidgetT site IO ()
 customModal Modal{..} = do
   let isDynamic = is _Left modalContent
-  modalId' <- maybe newIdent return modalId
   triggerId' <- maybe newIdent return modalTriggerId
 
   $(widgetFile "widgets/modal/modal")
diff --git a/static/js/utils/checkAll.js b/static/js/utils/checkAll.js
index 894f5fe0d..fcf3f67c3 100644
--- a/static/js/utils/checkAll.js
+++ b/static/js/utils/checkAll.js
@@ -10,7 +10,7 @@
    *   (will be set up automatically on tables)
    *
    * Example usage:
-  *   (table with one column thats only checkboxes)
+   *  (table with one column thats only checkboxes)
    */
 
   var CHECK_ALL_UTIL_NAME = 'checkAll';
diff --git a/templates/widgets/modal/modal.julius b/templates/widgets/modal/modal.julius
deleted file mode 100644
index 9d4ccf539..000000000
--- a/templates/widgets/modal/modal.julius
+++ /dev/null
@@ -1,6 +0,0 @@
-document.addEventListener('DOMContentLoaded', function() {
-  var modal = document.querySelector('#modal-' + #{String modalId'});
-  if (modal) {
-    window.utils.setup('modal', modal);
-  }
-});
diff --git a/templates/widgets/navbar/navbar.julius b/templates/widgets/navbar/navbar.julius
deleted file mode 100644
index 13dbe009a..000000000
--- a/templates/widgets/navbar/navbar.julius
+++ /dev/null
@@ -1,31 +0,0 @@
-(function () {
-  'use strict';
-
-  window.utils = window.utils || {};
-
-  window.utils.stickynav = function (nav) {
-    var ticking = false;
-
-    init();
-    function init() {
-      window.addEventListener('scroll', function (e) {
-        if (!ticking) {
-          window.requestAnimationFrame(update);
-          ticking = true;
-        }
-      }, false);
-      update();
-    }
-
-    function update() {
-      var sticky = window.scrollY > 30;
-      nav.classList.toggle('navbar--sticky', sticky);
-      ticking = false;
-    }
-  }
-
-})();
-
-document.addEventListener('setup', function (e) {
-  // utils.stickynav(e.detail.scope.querySelector('.js-sticky-navbar'));
-});
diff --git a/templates/widgets/pageaction/pageaction.julius b/templates/widgets/pageaction/pageaction.julius
deleted file mode 100644
index e69de29bb..000000000

From 559fb3fb9d91072ebbb095ad2a16f103ccb9b824 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 9 Apr 2019 21:55:58 +0200
Subject: [PATCH 046/238] refactor async form js util

---
 src/Foundation.hs               |  1 +
 src/Handler/Admin.hs            |  2 +-
 src/Handler/Home.hs             |  2 +-
 static/css/utils/asyncForm.scss | 22 +++++-----
 static/js/utils/asyncForm.js    | 78 +++++++++++++++++++++++----------
 5 files changed, 69 insertions(+), 36 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 22af31b8f..70155f9a4 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1071,6 +1071,7 @@ siteLayout' headingOverride widget = do
       -- addScript $ StaticR js_utils_alerts_js
       -- addScript $ StaticR js_utils_asidenav_js
       -- JavaScript utils
+      addScript $ StaticR js_utils_asyncForm_js
       addScript $ StaticR js_utils_asyncTable_js
       addScript $ StaticR js_utils_checkAll_js
       addScript $ StaticR js_utils_form_js
diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs
index 19b84adf3..653f91979 100644
--- a/src/Handler/Admin.hs
+++ b/src/Handler/Admin.hs
@@ -121,7 +121,7 @@ postAdminTestR = do
   let emailWidget' = wrapForm emailWidget def
         { formAction = Just . SomeRoute $ AdminTestR
         , formEncoding = emailEnctype
-        , formAttrs = [("data-ajax-submit", "")]
+        , formAttrs = [("uw-async-form", "")]
         }
 
 
diff --git a/src/Handler/Home.hs b/src/Handler/Home.hs
index 7b60a6da3..81dc1ac66 100644
--- a/src/Handler/Home.hs
+++ b/src/Handler/Home.hs
@@ -261,7 +261,7 @@ postHelpR = do
   let form = wrapForm formWidget def
         { formAction = Just $ SomeRoute HelpR
         , formEncoding = formEnctype
-        , formAttrs = [ ("data-ajax-submit", "") | isModal ]
+        , formAttrs = [ ("uw-async-form", "") | isModal ]
         }
 
   formResultModal res HelpR $ \HelpForm{..} -> do
diff --git a/static/css/utils/asyncForm.scss b/static/css/utils/asyncForm.scss
index a0f9956dd..bd5a97a41 100644
--- a/static/css/utils/asyncForm.scss
+++ b/static/css/utils/asyncForm.scss
@@ -1,4 +1,4 @@
-.async-form-response {
+.async-form__response {
   margin: 20px 0;
   position: relative;
   width: 100%;
@@ -7,15 +7,15 @@
   padding-top: 60px;
 }
 
-.async-form-response::before,
-.async-form-response::after {
+.async-form__response::before,
+.async-form__response::after {
   position: absolute;
   top: 0px;
   left: 50%;
   display: block;
 }
 
-.async-form-response--success::before {
+.async-form__response--success::before {
   content: '';
   width: 17px;
   height: 28px;
@@ -24,7 +24,7 @@
   transform: translateX(-50%) rotate(45deg);
 }
 
-.async-form-response--info::before {
+.async-form__response--info::before {
   content: '';
   width: 5px;
   height: 30px;
@@ -32,7 +32,7 @@
   background-color: #777;
   transform: translateX(-50%);
 }
-.async-form-response--info::after {
+.async-form__response--info::after {
   content: '';
   width: 5px;
   height: 5px;
@@ -40,14 +40,14 @@
   transform: translateX(-50%);
 }
 
-.async-form-response--warning::before {
+.async-form__response--warning::before {
   content: '';
   width: 5px;
   height: 30px;
   background-color: rgb(255, 187, 0);
   transform: translateX(-50%);
 }
-.async-form-response--warning::after {
+.async-form__response--warning::after {
   content: '';
   width: 5px;
   height: 5px;
@@ -56,14 +56,14 @@
   transform: translateX(-50%);
 }
 
-.async-form-response--error::before {
+.async-form__response--error::before {
   content: '';
   width: 5px;
   height: 40px;
   background-color: #940d0d;
   transform: translateX(-50%) rotate(-45deg);
 }
-.async-form-response--error::after {
+.async-form__response--error::after {
   content: '';
   width: 5px;
   height: 40px;
@@ -71,7 +71,7 @@
   transform: translateX(-50%) rotate(45deg);
 }
 
-.async-form-loading {
+.async-form--loading {
   opacity: 0.1;
   transition: opacity 800ms ease-out;
   pointer-events: none;
diff --git a/static/js/utils/asyncForm.js b/static/js/utils/asyncForm.js
index aa57ed2a0..c7fde55c5 100644
--- a/static/js/utils/asyncForm.js
+++ b/static/js/utils/asyncForm.js
@@ -1,33 +1,62 @@
 (function collonadeClosure() {
   'use strict';
 
-  window.utils = window.utils || {};
+  /**
+   *
+   * Async Form Utility
+   *  prevents form submissions from reloading the page but instead firing an AJAX request
+   *
+   * Attribute: uw-async-form
+   *   (works only on <form> elements)
+   *
+   * Example usage:
+   *   <form uw-async-form method='POST' action='...'>
+   *     ...
+   */
 
-  var ASYNC_FORM_RESPONSE_CLASS = 'async-form-response';
-  var ASYNC_FORM_LOADING_CLASS = 'async-form-loading';
+  var ASYNC_FORM_UTIL_NAME = 'asyncForm';
+  var ASYNC_FORM_UTIL_SELECTOR = 'form[uw-async-form]';
+
+  var ASYNC_FORM_INITIALIZED_CLASS = 'check-all--initialized';
+  var ASYNC_FORM_RESPONSE_CLASS = 'async-form__response';
+  var ASYNC_FORM_LOADING_CLASS = 'async-form--loading';
   var ASYNC_FORM_MIN_DELAY = 600;
-  var DEFAULT_FAILURE_MESSAGE = 'The response we received from the server did not match what we expected. Please let us know this happened via the help widget in the top navigation.';
+  var ASYNC_FORM_DEFAULT_FAILURE_MESSAGE = 'The response we received from the server did not match what we expected. Please let us know this happened via the help widget in the top navigation.';
 
-  window.utils.asyncForm = function(formElement, options) {
-
-    options = options || {};
+  var asyncFormUtil = function(element) {
 
     var lastRequestTimestamp = 0;
 
-    function setup() {
-      formElement.addEventListener('submit', submitHandler);
+    function init() {
+      if (!element) {
+        throw new Error('Async Form Utility cannot be setup without an element!');
+      }
+
+      if (element.classList.contains(ASYNC_FORM_INITIALIZED_CLASS)) {
+        return false;
+      }
+
+      element.addEventListener('submit', submitHandler);
+
+      element.classList.add(ASYNC_FORM_INITIALIZED_CLASS);
+
+      return {
+        name: ASYNC_FORM_UTIL_NAME,
+        element: element,
+        destroy: function() {},
+      };
     }
 
     function processResponse(response) {
       var responseElement = makeResponseElement(response.content, response.status);
-      var parentElement = formElement.parentElement;
+      var parentElement = element.parentElement;
 
       // make sure there is a delay between click and response
       var delay = Math.max(0, ASYNC_FORM_MIN_DELAY + lastRequestTimestamp - Date.now());
 
       setTimeout(function() {
-        parentElement.insertBefore(responseElement, formElement);
-        formElement.remove();
+        parentElement.insertBefore(responseElement, element);
+        element.remove();
       }, delay);
     }
 
@@ -43,12 +72,12 @@
     function submitHandler(event) {
       event.preventDefault();
 
-      formElement.classList.add(ASYNC_FORM_LOADING_CLASS)
+      element.classList.add(ASYNC_FORM_LOADING_CLASS)
       lastRequestTimestamp = Date.now();
 
-      var url = formElement.getAttribute('action');
+      var url = element.getAttribute('action');
       var headers = { };
-      var body = new FormData(formElement);
+      var body = new FormData(element);
 
       if (options && options.headers) {
         Object.keys(options.headers).forEach(function(headerKey) {
@@ -66,21 +95,24 @@
         }).then(function(response) {
           processResponse(response[0]);
         }).catch(function(error) {
-          var failureMessage = DEFAULT_FAILURE_MESSAGE;
+          var failureMessage = ASYNC_FORM_DEFAULT_FAILURE_MESSAGE;
           if (options.i18n && options.i18n.asyncFormFailure) {
             failureMessage = options.i18n.asyncFormFailure;
           }
           processResponse({ content: failureMessage });
 
-          formElement.classList.remove(ASYNC_FORM_LOADING_CLASS);
+          element.classList.remove(ASYNC_FORM_LOADING_CLASS);
         });
     }
 
-    setup();
-
-    return {
-      scope: formElement,
-      destroy: function() {},
-    };
+    return init();
   };
+
+  if (UtilRegistry) {
+    UtilRegistry.register({
+      name: ASYNC_FORM_UTIL_NAME,
+      selector: ASYNC_FORM_UTIL_SELECTOR,
+      setup: asyncFormUtil
+    });
+  }
 })();

From 09a5ab94dd4d8a28ae86f1fc5591232b879875a0 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 9 Apr 2019 22:14:05 +0200
Subject: [PATCH 047/238] fix issue with conditional fieldsets in modals

---
 static/js/utils/form.js                            | 2 +-
 static/js/utils/modal.js                           | 4 ++--
 templates/widgets/multi-action/multi-action.hamlet | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index baa0eb9e6..cb7cdd9f9 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -159,7 +159,7 @@
       if (!element.dataset.conditionalInput) {
         throw new Error('Interactive Fieldset needs a selector for a conditional input!');
       }
-      conditionalInput = document.querySelector(element.dataset.conditionalInput);
+      conditionalInput = document.querySelector('#' + element.dataset.conditionalInput);
       if (!conditionalInput) {
         // abort if form has no required inputs
         throw new Error('Couldn\'t find the conditional input. Aborting setup for interactive fieldset.');
diff --git a/static/js/utils/modal.js b/static/js/utils/modal.js
index 6b5f0fba1..a0993d802 100644
--- a/static/js/utils/modal.js
+++ b/static/js/utils/modal.js
@@ -173,9 +173,9 @@
     }
 
     function withPrefixedInputIDs(modalContent) {
-      var idAttrs = ['id', 'for', 'data-conditional-id'];
+      var idAttrs = ['id', 'for', 'data-conditional-input'];
       idAttrs.forEach(function(attr) {
-        modalContent.querySelectorAll('[' + attr + ']').forEach(function(input) {
+        Array.from(modalContent.querySelectorAll('[' + attr + ']')).forEach(function(input) {
           var value = element.id + '__' + input.getAttribute(attr);
           input.setAttribute(attr, value);
         });
diff --git a/templates/widgets/multi-action/multi-action.hamlet b/templates/widgets/multi-action/multi-action.hamlet
index f65a39dec..f8b284f24 100644
--- a/templates/widgets/multi-action/multi-action.hamlet
+++ b/templates/widgets/multi-action/multi-action.hamlet
@@ -1,4 +1,4 @@
-<fieldset uw-interactive-fieldset data-conditional-input="##{fvId actionView}" data-conditional-value="#{toPathPiece act}">
+<fieldset uw-interactive-fieldset data-conditional-input=#{fvId actionView} data-conditional-value=#{toPathPiece act}>
   <legend>
     _{act}
   ^{w}

From 1824b12ae2769fd11592ec3aa86172636bf0e35c Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 9 Apr 2019 22:14:35 +0200
Subject: [PATCH 048/238] fix async forms in modals

---
 static/js/utils/asyncForm.js | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/static/js/utils/asyncForm.js b/static/js/utils/asyncForm.js
index c7fde55c5..4b7b94951 100644
--- a/static/js/utils/asyncForm.js
+++ b/static/js/utils/asyncForm.js
@@ -21,7 +21,10 @@
   var ASYNC_FORM_RESPONSE_CLASS = 'async-form__response';
   var ASYNC_FORM_LOADING_CLASS = 'async-form--loading';
   var ASYNC_FORM_MIN_DELAY = 600;
-  var ASYNC_FORM_DEFAULT_FAILURE_MESSAGE = 'The response we received from the server did not match what we expected. Please let us know this happened via the help widget in the top navigation.';
+
+  var MODAL_SELECTOR = '.modal';
+  var MODAL_HEADER_KEY = 'Is-Modal';
+  var MODAL_HEADER_VALUE = 'True';
 
   var asyncFormUtil = function(element) {
 
@@ -72,6 +75,10 @@
     function submitHandler(event) {
       event.preventDefault();
 
+      if (!HttpClient) {
+        throw new Error('HttpClient not found! Can\'t fetch submit form asynchronously!');
+      }
+
       element.classList.add(ASYNC_FORM_LOADING_CLASS)
       lastRequestTimestamp = Date.now();
 
@@ -79,13 +86,12 @@
       var headers = { };
       var body = new FormData(element);
 
-      if (options && options.headers) {
-        Object.keys(options.headers).forEach(function(headerKey) {
-          headers[headerKey] = options.headers[headerKey];
-        });
+      var isModal = element.closest(MODAL_SELECTOR);
+      if (!!isModal) {
+        headers[MODAL_HEADER_KEY] = MODAL_HEADER_VALUE;
       }
 
-      window.utils.httpClient.post(url, headers, body)
+      HttpClient.post(url, headers, body)
         .then(function(response) {
           if (response.headers.get("content-type").indexOf("application/json") !== -1) {// checking response header
             return response.json();
@@ -95,10 +101,7 @@
         }).then(function(response) {
           processResponse(response[0]);
         }).catch(function(error) {
-          var failureMessage = ASYNC_FORM_DEFAULT_FAILURE_MESSAGE;
-          if (options.i18n && options.i18n.asyncFormFailure) {
-            failureMessage = options.i18n.asyncFormFailure;
-          }
+          var failureMessage = I18n.get('asyncFormFailure');
           processResponse({ content: failureMessage });
 
           element.classList.remove(ASYNC_FORM_LOADING_CLASS);

From f601cc877114f6f4ca37d11dd3f9abec8c331b73 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 10 Apr 2019 08:49:24 +0200
Subject: [PATCH 049/238] fix async table using previous requests url

---
 static/js/utils/asyncTable.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/static/js/utils/asyncTable.js b/static/js/utils/asyncTable.js
index 86bcd38fa..0c5f30e31 100644
--- a/static/js/utils/asyncTable.js
+++ b/static/js/utils/asyncTable.js
@@ -68,6 +68,9 @@
 
       processLocalStorage();
 
+      // clear currentTableUrl from previous requests
+      setLocalStorageParameter('currentTableUrl', null);
+
       // mark initialized
       element.classList.add(ASYNC_TABLE_INITIALIZED_CLASS);
 
@@ -337,6 +340,7 @@
         element.classList.remove(ASYNC_TABLE_LOADING_CLASS);
       }).catch(function(err) {
         console.error(err);
+        element.classList.remove(ASYNC_TABLE_LOADING_CLASS);
       });
     }
 

From 1532518943da98cc472d5a8dba9663ec842010b4 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 10 Apr 2019 09:25:51 +0200
Subject: [PATCH 050/238] Fix build

---
 src/Foundation.hs | 2 +-
 src/Utils/Lens.hs | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 41d23fa65..1eebfd41c 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -2306,7 +2306,7 @@ instance YesodMail UniWorX where
   mailT ctx mail = defMailT ctx $ do
     void setMailObjectId
     setDateCurrent
-    replaceMailHeader "Sender" . Just . addressEmail =<< getsYesod (appMailFrom . appSettings)
+    replaceMailHeader "Sender" . Just =<< getsYesod (view $ _appMailFrom . _addressEmail)
 
     mail <* setMailSmtpData
 
diff --git a/src/Utils/Lens.hs b/src/Utils/Lens.hs
index b6a09e3c3..4493dc612 100644
--- a/src/Utils/Lens.hs
+++ b/src/Utils/Lens.hs
@@ -70,6 +70,8 @@ hasEntityUser = hasEntity
 --   hasUser = _entityVal . hasUser
 
 
+makeLenses_ ''Address
+
 makeLenses_ ''SheetCorrector
 
 makeLenses_ ''SubmissionGroup

From 1eb076cc93b2b8d608668ea190b5a33731c18108 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 10 Apr 2019 10:39:03 +0200
Subject: [PATCH 051/238] tokenRestrictions and documentation

---
 package.yaml       |  1 +
 src/Model/Token.hs | 67 +++++++++++++++++++++++++++++++++-------------
 2 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/package.yaml b/package.yaml
index 94235a3c1..f6d487376 100644
--- a/package.yaml
+++ b/package.yaml
@@ -119,6 +119,7 @@ dependencies:
   - semigroupoids
   - jose-jwt
   - mono-traversable
+  - lens-aeson
 
 other-extensions:
   - GeneralizedNewtypeDeriving
diff --git a/src/Model/Token.hs b/src/Model/Token.hs
index f84fc970a..5b67782a5 100644
--- a/src/Model/Token.hs
+++ b/src/Model/Token.hs
@@ -2,8 +2,9 @@
 
 module Model.Token
   ( BearerToken(..)
+  , _tokenIdentifier, _tokenAuthority, _tokenRoutes, _tokenAddAuth, _tokenRestrictions, _tokenRestrictionIx, _tokenRestrictionAt, _tokenIssuedAt, _tokenIssuedBy, _tokenExpiresAt, _tokenStartsAt
   , bearerToken
-  , encodeToken, BearerTokenException(..), decodeToken
+  , encodeToken, BearerTokenException(..), decodeToken, jwtEncoding
   , tokenToJSON, tokenParseJSON, tokenParseJSON'
   , askJwt
   ) where
@@ -11,8 +12,9 @@ module Model.Token
 import ClassyPrelude.Yesod
 import Model
 import Settings
-import Utils (NTop(..), hoistMaybe)
+import Utils (NTop(..), hoistMaybe, assertM')
 import Utils.Lens hiding ((.=))
+import Data.Aeson.Lens (AsJSON(..))
 import Utils.Parameters
 
 import Yesod.Auth (AuthId)
@@ -29,7 +31,7 @@ import Data.HashSet (HashSet)
 
 import qualified Data.HashMap.Strict as HashMap
 
-import Data.Aeson.Types (Parser, (.:?), (.:))
+import Data.Aeson.Types (Parser, (.:?), (.:), (.!=))
 import qualified Data.Aeson as JSON
 import qualified Data.Aeson.Types as JSON
 import qualified Data.Aeson.Parser as JSON
@@ -45,26 +47,42 @@ import Control.Monad.Random (MonadRandom(..))
 import Control.Monad.Trans.Maybe (MaybeT(..))
 
 
+-- | Presenting a `BearerToken` transfers some authorisation from `tokenAuthority` to _whoever_ presents the token
 data BearerToken site = BearerToken
-  { tokenIdentifier :: TokenId -- ^ Unique identifier for each token; maybe useful for tracing usage of tokens
-  , tokenAuthority  :: AuthId site -- ^ Tokens only grant rights the `tokenAuthority` has (i.e. `AuthTag`s are evaluated with the user set to `tokenAuthority`)
-  , tokenRoutes     :: Maybe (HashSet (Route site)) -- ^ Tokens can optionally be restricted to only be usable on a subset of routes
-  , tokenAddAuth    :: Maybe AuthDNF -- ^ Tokens can specify an additional predicate logic formula of `AuthTag`s that needs to evaluate to `Authorized` in order for the token to be valid.
-  , tokenIssuedAt   :: UTCTime
-  , tokenIssuedBy   :: InstanceId
+  { tokenIdentifier   :: TokenId -- ^ Unique identifier for each token; maybe useful for tracing usage of tokens
+  , tokenAuthority    :: AuthId site -- ^ Tokens only grant rights the `tokenAuthority` has (i.e. `AuthTag`s are evaluated with the user set to `tokenAuthority`)
+  , tokenRoutes       :: Maybe (HashSet (Route site)) -- ^ Tokens can optionally be restricted to only be usable on a subset of routes
+  , tokenAddAuth      :: Maybe AuthDNF -- ^ Tokens can specify an additional predicate logic formula of `AuthTag`s that needs to evaluate to `Authorized` in order for the token to be valid.
+  , tokenRestrictions :: HashMap (Route site) Value -- ^ Tokens can be restricted to certain actions within the context of a route (i.e. creating an user only with a certain username, resetting a password only if the old matches a hash, ...)
+  , tokenIssuedAt     :: UTCTime
+  , tokenIssuedBy     :: InstanceId
   , tokenExpiresAt
-  , tokenStartsAt   :: Maybe UTCTime
+  , tokenStartsAt     :: Maybe UTCTime
   } deriving (Generic, Typeable)
 
 deriving instance (Eq (AuthId site), Eq (Route site)) => Eq (BearerToken site)
 deriving instance (Read (AuthId site), Eq (Route site), Hashable (Route site), Read (Route site)) => Read (BearerToken site)
 deriving instance (Show (AuthId site), Show (Route site)) => Show (BearerToken site)
 
+makeLenses_ ''BearerToken
+
+_tokenRestrictionIx :: (FromJSON a, ToJSON a, Hashable (Route site), Eq (Route site)) => Route site -> Traversal' (BearerToken site) a
+-- ^ Focus a singular restriction (by route) if it exists
+_tokenRestrictionIx route = _tokenRestrictions . ix route . _JSON
+
+_tokenRestrictionAt :: (FromJSON a, ToJSON a, Hashable (Route site), Eq (Route site)) => Route site -> Traversal' (BearerToken site) (Maybe a)
+-- ^ Focus a singular restriction (by route) whether it exists, or not
+_tokenRestrictionAt route = _tokenRestrictions . at route . maybePrism _JSON
+
+
 tokenToJSON :: forall m.
                ( MonadHandler m
                , HasCryptoUUID (AuthId (HandlerSite m)) m
                , RenderRoute (HandlerSite m)
                ) => BearerToken (HandlerSite m) -> m Value
+-- ^ Encode a `BearerToken` analogously to `toJSON`
+--
+-- Monadic context is needed because `AuthId`s are encrypted during encoding
 tokenToJSON BearerToken{..} = do
   cID <- encrypt tokenAuthority :: m (CryptoUUID (AuthId (HandlerSite m)))
   let stdPayload = Jose.JwtClaims
@@ -80,6 +98,7 @@ tokenToJSON BearerToken{..} = do
     catMaybes [ Just $ "authority" .= cID
               , ("routes" .=) <$> tokenRoutes
               , ("add-auth" .=) <$> tokenAddAuth
+              , ("restrictions" .=) <$> assertM' (not . HashMap.null) tokenRestrictions
               ]
     ++ let JSON.Object hm = toJSON stdPayload in HashMap.toList hm
 
@@ -90,12 +109,18 @@ tokenParseJSON :: forall site.
                   )
                => Value
                -> ReaderT CryptoIDKey Parser (BearerToken site)
+-- ^ Decode a `Value` to a `BearerToken` analogously to `parseJSON`
+--
+-- Monadic context is needed because `AuthId`s are encrypted during encoding
+--
+-- It's usually easier to use `tokenParseJSON'`
 tokenParseJSON v@(Object o) = do
   tokenAuthority' <- lift (o .: "authority") :: ReaderT CryptoIDKey Parser (CryptoUUID (AuthId site))
   tokenAuthority <- decrypt tokenAuthority'
 
-  tokenRoutes    <- lift $ o .:? "routes"
-  tokenAddAuth   <- lift $ o .:? "add-auth"
+  tokenRoutes        <- lift $ o .:? "routes"
+  tokenAddAuth       <- lift $ o .:? "add-auth"
+  tokenRestrictions  <- lift $ o .:? "restrictions" .!= HashMap.empty
   Jose.JwtClaims{..} <- lift $ parseJSON v
 
   let unIntDate (IntDate posix) = posixSecondsToUTCTime posix
@@ -118,6 +143,7 @@ tokenParseJSON' :: forall m.
                   , MonadCryptoKey m ~ CryptoIDKey
                   )
                => m (Value -> Parser (BearerToken (HandlerSite m)))
+-- ^ Read `CryptoIDKey` from monadic context and construct a `Parser` for `BearerToken`s
 tokenParseJSON' = do
   cidKey <- cryptoIDKey return
   return $ flip runReaderT cidKey . tokenParseJSON
@@ -135,6 +161,7 @@ bearerToken :: forall m.
             -> Maybe (Maybe UTCTime) -- ^ @Nothing@ determines default expiry time automatically
             -> Maybe UTCTime -- ^ @Nothing@ means token starts to be valid immediately
             -> m (BearerToken (HandlerSite m))
+-- ^ Smart constructor for `Bearertoken`, does not set route restrictions (due to polymorphism), use `_tokenRestrictionAt`
 bearerToken tokenAuthority tokenRoutes tokenAddAuth mTokenExpiresAt tokenStartsAt = do
   tokenIdentifier <- liftIO getRandom
   tokenIssuedAt <- liftIO getCurrentTime
@@ -149,11 +176,13 @@ bearerToken tokenAuthority tokenRoutes tokenAddAuth mTokenExpiresAt tokenStartsA
         = Just $ tDiff `addUTCTime` fromMaybe tokenIssuedAt tokenStartsAt
         | otherwise
         = Nothing
+      tokenRestrictions = HashMap.empty
 
   return BearerToken{..}
 
 
 jwtEncoding :: Jose.JwtEncoding
+-- ^ How should `Jwt`s be signed and/or encrypted?
 jwtEncoding = Jose.JwsEncoding Jose.HS256
 
 
@@ -165,6 +194,7 @@ encodeToken :: forall m.
                , RenderRoute (HandlerSite m)
                )
             => BearerToken (HandlerSite m) -> m Jwt
+-- ^ Call `tokenToJSON` and encode the result as a `Jwt` according to `jwtEncoding`
 encodeToken token = do
   payload <- Jose.Claims . toStrict . JSON.encode <$> tokenToJSON token
   JwkSet jwks <- getsYesod $ view jsonWebKeySet
@@ -172,9 +202,9 @@ encodeToken token = do
 
 
 data BearerTokenException
-  = BearerTokenJwtError Jose.JwtError
-  | BearerTokenUnsecured
-  | BearerTokenInvalidFormat String
+  = BearerTokenJwtError Jose.JwtError -- ^ An Error occurred in the underlying `Jwt`-Implementation
+  | BearerTokenUnsecured -- ^ `Jwt` is insufficiently secured (unsigned and not encrypted)
+  | BearerTokenInvalidFormat String -- ^ Content of the `Jwt` could not be parsed as a `BearerToken`
   | BearerTokenExpired | BearerTokenNotStarted
   deriving (Eq, Show, Generic, Typeable)
 
@@ -191,6 +221,7 @@ decodeToken :: forall m.
                , Hashable (Route (HandlerSite m))
                )
             => Jwt -> m (BearerToken (HandlerSite m))
+-- ^ Decode a `Jwt` according to `jwtEncoding` and call `tokenParseJSON`
 decodeToken (Jwt bs) = do
   JwkSet jwks <- getsYesod $ view jsonWebKeySet
   content <- either (throwM . BearerTokenJwtError) return =<< liftIO (Jose.decode jwks Nothing bs)
@@ -208,11 +239,9 @@ decodeToken (Jwt bs) = do
   return token
 
 
-askJwt :: forall m.
-          ( MonadHandler m
-          )
+askJwt :: forall m. ( MonadHandler m )
        => m (Maybe Jwt)
--- | Retrieve current `Jwt` from HTTP-Header, POST-Parameter, or GET-Parameter
+-- ^ Retrieve current `Jwt` from HTTP-Header, POST-Parameter, or GET-Parameter
 askJwt = runMaybeT $ asum
   [ MaybeT lookupBearerAuth >>= hoistMaybe . fromPathPiece
   , MaybeT $ lookupGlobalPostParam PostBearer

From 0b33becbc908e01964f2152d6133c2142c451400 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 10 Apr 2019 11:05:03 +0200
Subject: [PATCH 052/238] Add warning about _tokenRestrictionIx

---
 src/Model/Token.hs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Model/Token.hs b/src/Model/Token.hs
index 5b67782a5..d438965a4 100644
--- a/src/Model/Token.hs
+++ b/src/Model/Token.hs
@@ -68,6 +68,8 @@ makeLenses_ ''BearerToken
 
 _tokenRestrictionIx :: (FromJSON a, ToJSON a, Hashable (Route site), Eq (Route site)) => Route site -> Traversal' (BearerToken site) a
 -- ^ Focus a singular restriction (by route) if it exists
+--
+-- This /cannot/ be used to add restrictions, use `_tokenRestrictionAt` instead
 _tokenRestrictionIx route = _tokenRestrictions . ix route . _JSON
 
 _tokenRestrictionAt :: (FromJSON a, ToJSON a, Hashable (Route site), Eq (Route site)) => Route site -> Traversal' (BearerToken site) (Maybe a)

From 9c3e413706f82dacb5716a7e4b1e269983fcbc94 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 10 Apr 2019 11:38:42 +0200
Subject: [PATCH 053/238] tokenRestrict & documentation

---
 src/Model/Token.hs | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/Model/Token.hs b/src/Model/Token.hs
index d438965a4..e3b3148cf 100644
--- a/src/Model/Token.hs
+++ b/src/Model/Token.hs
@@ -3,6 +3,7 @@
 module Model.Token
   ( BearerToken(..)
   , _tokenIdentifier, _tokenAuthority, _tokenRoutes, _tokenAddAuth, _tokenRestrictions, _tokenRestrictionIx, _tokenRestrictionAt, _tokenIssuedAt, _tokenIssuedBy, _tokenExpiresAt, _tokenStartsAt
+  , tokenRestrict
   , bearerToken
   , encodeToken, BearerTokenException(..), decodeToken, jwtEncoding
   , tokenToJSON, tokenParseJSON, tokenParseJSON'
@@ -47,13 +48,20 @@ import Control.Monad.Random (MonadRandom(..))
 import Control.Monad.Trans.Maybe (MaybeT(..))
 
 
--- | Presenting a `BearerToken` transfers some authorisation from `tokenAuthority` to _whoever_ presents the token
+-- | Presenting a `BearerToken` transfers some authorisation from `tokenAuthority` to /whoever/ presents the token
 data BearerToken site = BearerToken
-  { tokenIdentifier   :: TokenId -- ^ Unique identifier for each token; maybe useful for tracing usage of tokens
-  , tokenAuthority    :: AuthId site -- ^ Tokens only grant rights the `tokenAuthority` has (i.e. `AuthTag`s are evaluated with the user set to `tokenAuthority`)
-  , tokenRoutes       :: Maybe (HashSet (Route site)) -- ^ Tokens can optionally be restricted to only be usable on a subset of routes
-  , tokenAddAuth      :: Maybe AuthDNF -- ^ Tokens can specify an additional predicate logic formula of `AuthTag`s that needs to evaluate to `Authorized` in order for the token to be valid.
-  , tokenRestrictions :: HashMap (Route site) Value -- ^ Tokens can be restricted to certain actions within the context of a route (i.e. creating an user only with a certain username, resetting a password only if the old matches a hash, ...)
+  { tokenIdentifier   :: TokenId
+    -- ^ Unique identifier for each token; maybe useful for tracing usage of tokens
+  , tokenAuthority    :: AuthId site
+    -- ^ Tokens only grant rights the `tokenAuthority` has (i.e. `AuthTag`s are evaluated with the user set to `tokenAuthority`)
+  , tokenRoutes       :: Maybe (HashSet (Route site))
+    -- ^ Tokens can optionally be restricted to only be usable on a subset of routes
+  , tokenAddAuth      :: Maybe AuthDNF
+    -- ^ Tokens can specify an additional predicate logic formula of `AuthTag`s that needs to evaluate to `Authorized` in order for the token to be valid.
+  , tokenRestrictions :: HashMap (Route site) Value
+    -- ^ Tokens can be restricted to certain actions within the context of a route (i.e. creating an user only with a certain username, resetting a password only if the old matches a hash, ...)
+    --
+    -- In general this is not encrypted; some care is required to not expose sensitive information to the bearer of the token
   , tokenIssuedAt     :: UTCTime
   , tokenIssuedBy     :: InstanceId
   , tokenExpiresAt
@@ -69,13 +77,20 @@ makeLenses_ ''BearerToken
 _tokenRestrictionIx :: (FromJSON a, ToJSON a, Hashable (Route site), Eq (Route site)) => Route site -> Traversal' (BearerToken site) a
 -- ^ Focus a singular restriction (by route) if it exists
 --
--- This /cannot/ be used to add restrictions, use `_tokenRestrictionAt` instead
+-- This /cannot/ be used to add restrictions, use `_tokenRestrictionAt` or `tokenRestrict` instead
 _tokenRestrictionIx route = _tokenRestrictions . ix route . _JSON
 
 _tokenRestrictionAt :: (FromJSON a, ToJSON a, Hashable (Route site), Eq (Route site)) => Route site -> Traversal' (BearerToken site) (Maybe a)
 -- ^ Focus a singular restriction (by route) whether it exists, or not
 _tokenRestrictionAt route = _tokenRestrictions . at route . maybePrism _JSON
 
+tokenRestrict :: (ToJSON a, Hashable (Route site), Eq (Route site)) => Route site -> a -> BearerToken site -> BearerToken site
+-- ^ Add a restriction to a `BearerToken`
+--
+-- If a restriction already exists for the targeted route, it's silently overwritten
+tokenRestrict route (toJSON -> resVal) = over _tokenRestrictions $ HashMap.insert route resVal
+
+
 
 tokenToJSON :: forall m.
                ( MonadHandler m
@@ -163,7 +178,7 @@ bearerToken :: forall m.
             -> Maybe (Maybe UTCTime) -- ^ @Nothing@ determines default expiry time automatically
             -> Maybe UTCTime -- ^ @Nothing@ means token starts to be valid immediately
             -> m (BearerToken (HandlerSite m))
--- ^ Smart constructor for `Bearertoken`, does not set route restrictions (due to polymorphism), use `_tokenRestrictionAt`
+-- ^ Smart constructor for `BearerToken`, does not set route restrictions (due to polymorphism), use `tokenRestrict`
 bearerToken tokenAuthority tokenRoutes tokenAddAuth mTokenExpiresAt tokenStartsAt = do
   tokenIdentifier <- liftIO getRandom
   tokenIssuedAt <- liftIO getCurrentTime

From a0f645d9c4b8a7ecfa91d7699c120e47bebc48b7 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Wed, 10 Apr 2019 11:45:14 +0200
Subject: [PATCH 054/238] Hopefully fixes #333

---
 hlint.sh                              |  3 +++
 messages/uniworx/de.msg               | 24 ++++++++++++------------
 src/Handler/Utils/Table/Pagination.hs |  2 +-
 templates/info-lecturer/de.hamlet     | 23 ++++++++++++++++++++---
 4 files changed, 36 insertions(+), 16 deletions(-)
 create mode 100755 hlint.sh

diff --git a/hlint.sh b/hlint.sh
new file mode 100755
index 000000000..0dbb0fa1b
--- /dev/null
+++ b/hlint.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+exec -- ./test.sh uniworx:test:hlint
diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 5786e1f13..a33c06e1c 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -159,21 +159,21 @@ SheetInvisibleUntil date@Text: Dieses Übungsblatt ist für Teilnehmer momentan
 SheetName: Name
 SheetDescription: Hinweise für Teilnehmer
 SheetGroup: Gruppenabgabe
-SheetVisibleFrom: Sichtbar ab
-SheetVisibleFromTip: Ohne Datum wird das Blatt nie sichtbar, z.B. weil es noch nicht fertig ist
-SheetActiveFrom: Aktiv ab
-SheetActiveFromTip: Abgabe und Download der Aufgabenstellung ist erst ab diesem Datum möglich
-SheetActiveTo: Abgabefrist
+SheetVisibleFrom: Sichtbar für Teilnehmer ab
+SheetVisibleFromTip: Ohne Datum nie sichtbar und keine Abgabe möglich; nur für unfertige Blätter leer lassen, deren Fristen/Bewertung sich noch ändern kann
+SheetActiveFrom: Beginn Abgabezeitraum
+SheetActiveFromTip: Download der Aufgabenstellung erst ab diesem Datum möglich
+SheetActiveTo: Ende Abgabezeitraum
 SheetHintFromTip: Ohne Datum nie für Teilnehmer sichtbar, Korrektoren können diese Dateien immer herunterladen
 SheetSolutionFromTip: Ohne Datum nie für Teilnehmer sichtbar, Korrektoren können diese Dateien immer herunterladen
 SheetMarkingTip: Hinweise zur Korrektur, sichtbar nur für Korrektoren
 SheetPseudonym: Persönliches Abgabe-Pseudonym
 SheetGeneratePseudonym: Generieren
 
-SheetErrVisibility: Sichtbarkeit muss vor Beginn der Abgabefrist liegen
-SheetErrDeadlineEarly: Ende der Abgabefrist muss nach deren Beginn liegen
-SheetErrHintEarly: Hinweise dürfen erst nach Beginn der Abgabefrist herausgegeben werden
-SheetErrSolutionEarly: Die Lösung sollte erst nach Ende der Abgabefrist herausgegeben werden
+SheetErrVisibility: "Beginn Abgabezeitraum" muss nach "Sichbar für Teilnehmer ab" liegen
+SheetErrDeadlineEarly: "Ende Abgabezeitraum" muss nach "Beginn Abzeitraum" liegen
+SheetErrHintEarly: Hinweise dürfen erst nach Beginn des Abgabezeitraums herausgegeben werden
+SheetErrSolutionEarly: Lösungen dürfen erst nach Ende der Abgabezeitraums herausgegeben werden
 
 
 Deadline: Abgabe
@@ -244,7 +244,7 @@ AddCorrector: Zusätzlicher Korrektor
 CorrectorExists email@UserEmail: #{email} ist bereits als Korrektor eingetragen
 SheetCorrectorsTitle tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName: Korrektoren für #{display tid}-#{display ssh}-#{csh} #{sheetName}
 CountTutProp: Tutorien zählen gegen Proportion
-AutoAssignCorrs: Korrekturen am Ende der Abgabefrist automatisch zuteilen
+AutoAssignCorrs: Korrekturen nach Ablauf des Abgabezeitraums automatisch zuteilen
 Corrector: Korrektor
 Correctors: Korrektoren
 CorState: Status
@@ -496,7 +496,7 @@ MailSubmissionsUnassignedIntro n@Int courseName@Text termDesc@Text sheetName@She
 
 MailSubjectSheetSoonInactive csh@CourseShorthand sheetName@SheetName: #{sheetName} in #{csh} kann nur noch kurze Zeit abgegeben werden
 MailSheetSoonInactiveIntro courseName@Text termDesc@Text sheetName@SheetName: Abgabefirst für #{sheetName} im Kurs #{courseName} (#{termDesc}) endet in Kürze.
-MailSubjectSheetInactive csh@CourseShorthand sheetName@SheetName: Abgabfrist für #{sheetName} in #{csh} abgelaufen
+MailSubjectSheetInactive csh@CourseShorthand sheetName@SheetName: Abgabezeitraum für #{sheetName} in #{csh} abgelaufen
 MailSheetInactiveIntro courseName@Text termDesc@Text sheetName@SheetName n@Int num@Int64: Die Abgabefirst für #{sheetName} im Kurs #{courseName} (#{termDesc}) beendet. Es gab #{noneOneMoreDE n "Keine Abgaben" "Nur eine Abgabe von " (display n <> " Abgaben von ")}#{noneOneMoreDE num "" "einem Teilnehmer" (display num <> " Teilnehmern")}.
 
 MailSubjectCorrectionsAssigned csh@CourseShorthand sheetName@SheetName: Ihnen wurden Korrekturen zu #{sheetName} in #{csh} zugeteilt
@@ -554,7 +554,7 @@ NotificationTriggerSubmissionRatedGraded: Meine Abgabe in einem gewerteten Übun
 NotificationTriggerSubmissionRated: Meine Abgabe wurde korrigiert
 NotificationTriggerSheetActive: Ich kann ein neues Übungsblatt herunterladen
 NotificationTriggerSheetSoonInactive: Ich kann ein Übungsblatt bald nicht mehr abgeben
-NotificationTriggerSheetInactive: Abgabefrist eines meiner Übungsblätter ist abgelaufen
+NotificationTriggerSheetInactive: Abgabezeitraum eines meiner Übungsblätter ist abgelaufen
 NotificationTriggerCorrectionsAssigned: Mir wurden Abgaben zur Korrektur zugeteilt
 NotificationTriggerCorrectionsNotDistributed: Abgaben eines meiner Übungsblätter konnten keinem Korrektur zugeteilt werden
 NotificationTriggerUserRightsUpdate: Meine Berechtigungen wurden geändert
diff --git a/src/Handler/Utils/Table/Pagination.hs b/src/Handler/Utils/Table/Pagination.hs
index d5925f31c..81ca65bd4 100644
--- a/src/Handler/Utils/Table/Pagination.hs
+++ b/src/Handler/Utils/Table/Pagination.hs
@@ -595,7 +595,7 @@ instance Monoid x => Monoid (DBCell (RWST (Maybe (Env, FileEnv), UniWorX, [Lang]
 instance IsDBTable m a => IsString (DBCell m a) where
   fromString = cell . fromString
 
-
+-- | DB-backed tables with pagination, may short-circuit a handler
 dbTable :: forall m x. IsDBTable m x => PSValidator m x -> DBTable m x -> DB (DBResult m x)
 dbTable PSValidator{..} dbtable@DBTable{ dbtIdent = dbtIdent'@(toPathPiece -> dbtIdent), dbtStyle = DBStyle{..}, .. } = do
   let
diff --git a/templates/info-lecturer/de.hamlet b/templates/info-lecturer/de.hamlet
index a8610e5ff..a7bcf0057 100644
--- a/templates/info-lecturer/de.hamlet
+++ b/templates/info-lecturer/de.hamlet
@@ -1,3 +1,4 @@
+$newline text
 <section>
   UniWorX erfahrene Veranstalter finden
   hier die wichtigsten Neuerungen.
@@ -6,6 +7,9 @@
   <h2>Bekannte Probleme in Bearbeitung
 
   <dl .deflist>
+    <dt .deflist__dt>Derzeit keine bekannt.
+
+
     $#
     $# MOVE ITEM TO SECTION "VERANSTALTUNGEN", once it is implemented:
     $#
@@ -81,6 +85,15 @@
         von der Studentenkanzelei keine aktuelle und vollständige Schlüsselzuordnung
         bekommen können.
 
+    <dt .deflist__dt> Aus Studentensicht
+    <dd .deflist__dd>
+      <p>
+        UniWorX hatte spezielle Links "Aus Studentensicht", welche in Uni2work überflüssig geworden sind.
+        Stattdessen kann man sich in Uni2work #
+          <a href=@{AuthPredsR}>Berechtigungen hier temporär selbst entziehen
+        . Um die eigene Veranstaltung aus Sicht eines Teilnehmers zu sehen, deaktiviert man #
+        die Berechtigungsprüfungen "_{MsgAuthTagLecturer}" und/oder "_{MsgAuthTagCorrector}"
+
 <section>
   <h2>Übungsbetrieb
 
@@ -114,14 +127,18 @@
     <dt .deflist__dt> Lösungshinweise
     <dd .deflist__dd>
       Zusätzlich zu Aufgabe und Lösung können Hinweise ab einem
-      Datum vor Abgabfrist freigeschaltet werden,
+      Datum vor Ende des Abgabezeitraums freigeschaltet werden,
       z.B. Lösungen zu Präsenzaufgaben.
 
     <dt .deflist__dt> Sichtbarkeit
     <dd .deflist__dd>
-      Übungsblätter können bis zu einem Datum vor den Teilnehmern versteckt werden.
       <p>
-        Die Aufgabenstellung ist erst mit Eröffnung der Abgabe erhältlich,
+        Übungsblätter können bis zu einem Datum "Sichtabr ab" vor allen Teilnehmern versteckt werden.
+        Das kann nützlich sein, um Tutoren und Korrektoren ein provisorisches Übungsblatt verfügbar zu machen,
+        dessen Bewertungsmodalitäten und Fristen sich noch ändern können.
+      <p>
+        Erst wenn das Blatt sichtbar wird, sehen die Teilnehmer in Ihrer Übersichtsliste.
+        Alle Dateien zur Aufgabenstellung sind aber erst mit Beginn des Abgabezeitraums erhältlich,
         so wie bisher in UniWorX auch.
 
     <dt .deflist__dt> Zeitstempel

From 346067ccdda3ee903416e85734707e387c192790 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 10 Apr 2019 20:00:57 +0200
Subject: [PATCH 055/238] remove obsolete form.julius

---
 templates/widgets/form/form.julius | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 templates/widgets/form/form.julius

diff --git a/templates/widgets/form/form.julius b/templates/widgets/form/form.julius
deleted file mode 100644
index 00b3a3c8f..000000000
--- a/templates/widgets/form/form.julius
+++ /dev/null
@@ -1,3 +0,0 @@
-document.addEventListener('DOMContentLoaded', function() {
-  window.utils.setup('form', document.querySelector('#' + #{String formId}));
-});

From 796cddf21ebd705d62c355aa075bdb80ea4b527e Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 10 Apr 2019 20:01:56 +0200
Subject: [PATCH 056/238] refactor asidenav js util

---
 src/Foundation.hs                          |  2 +-
 static/js/utils/asidenav.js                | 71 ++++++++++++++++++----
 templates/widgets/asidenav/asidenav.hamlet |  2 +-
 templates/widgets/asidenav/asidenav.julius |  4 --
 4 files changed, 60 insertions(+), 19 deletions(-)
 delete mode 100644 templates/widgets/asidenav/asidenav.julius

diff --git a/src/Foundation.hs b/src/Foundation.hs
index b645b5fa1..1e9d7451f 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1069,8 +1069,8 @@ siteLayout' headingOverride widget = do
       addScript $ StaticR js_services_httpClient_js
       addScript $ StaticR js_services_i18n_js
       -- addScript $ StaticR js_utils_alerts_js
-      -- addScript $ StaticR js_utils_asidenav_js
       -- JavaScript utils
+      addScript $ StaticR js_utils_asidenav_js
       addScript $ StaticR js_utils_asyncForm_js
       addScript $ StaticR js_utils_asyncTable_js
       addScript $ StaticR js_utils_checkAll_js
diff --git a/static/js/utils/asidenav.js b/static/js/utils/asidenav.js
index bb95f6455..cb01836fd 100644
--- a/static/js/utils/asidenav.js
+++ b/static/js/utils/asidenav.js
@@ -1,31 +1,74 @@
 (function() {
   'use strict';
 
-  window.utils = window.utils || {};
+  /**
+   *
+   * Asidenav Utility
+   *  Correctly positions hovered asidenav submenus and handles the favorites button on mobile
+   *
+   * Attribute: uw-asidenav
+   *
+   * Example usage:
+   *  <div uw-asidenav>
+   *    <div .asidenav>
+   *      <div .asidenav__box>
+   *        <ul .asidenav__list.list--iconless>
+   *          <li .asidenav__list-item>
+   *            <a .asidenav__link-wrapper href="#">
+   *              <div .asidenav__link-shorthand>EIP
+   *              <div .asidenav__link-label>Einführung in die Programmierung
+   *            <div .asidenav__nested-list-wrapper>
+   *              <ul .asidenav__nested-list.list--iconless>
+   *                Übungsblätter
+   *                ...
+   *
+   */
+
+  var ASIDENAV_UTIL_NAME = 'asidenav';
+  var ASIDENAV_UTIL_SELECTOR = '[uw-asidenav]';
 
   var FAVORITES_BTN_CLASS = 'navbar__list-item--favorite';
   var FAVORITES_BTN_ACTIVE_CLASS = 'navbar__list-item--active';
+  var ASIDENAV_INITIALIZED_CLASS = 'asidenav--initialized';
   var ASIDENAV_EXPANDED_CLASS = 'main__aside--expanded';
   var ASIDENAV_LIST_ITEM_CLASS = 'asidenav__list-item';
   var ASIDENAV_SUBMENU_CLASS = 'asidenav__nested-list-wrapper';
 
-  window.utils.aside = function(asideEl) {
+  var asidenavUtil = function(element) {
 
-    if (!asideEl) {
-      throw new Error('asideEl not defined');
+    function init() {
+      if (!element) {
+        throw new Error('Asidenav utility cannot be setup without an element!');
+      }
+
+      if (element.classList.contains(ASIDENAV_INITIALIZED_CLASS)) {
+        return false;
+      }
+
+      initFavoritesButton();
+      initAsidenavSubmenus();
+
+      // mark initialized
+      element.classList.add(ASIDENAV_INITIALIZED_CLASS);
+
+      return {
+        name: ASIDENAV_UTIL_NAME,
+        element: element,
+        destroy: function() {},
+      };
     }
 
     function initFavoritesButton() {
       var favoritesBtn = document.querySelector('.' + FAVORITES_BTN_CLASS);
       favoritesBtn.addEventListener('click', function(event) {
         favoritesBtn.classList.toggle(FAVORITES_BTN_ACTIVE_CLASS);
-        asideEl.classList.toggle(ASIDENAV_EXPANDED_CLASS);
+        element.classList.toggle(ASIDENAV_EXPANDED_CLASS);
         event.preventDefault();
       }, true);
     }
 
     function initAsidenavSubmenus() {
-      var asidenavLinksWithSubmenus = Array.from(asideEl.querySelectorAll('.' + ASIDENAV_LIST_ITEM_CLASS))
+      var asidenavLinksWithSubmenus = Array.from(element.querySelectorAll('.' + ASIDENAV_LIST_ITEM_CLASS))
         .map(function(listItem) {
           var submenu = listItem.querySelector('.' + ASIDENAV_SUBMENU_CLASS);
           return { listItem, submenu };
@@ -53,12 +96,14 @@
       };
     }
 
-    initFavoritesButton();
-    initAsidenavSubmenus();
-
-    return {
-      scope: asideEl,
-      destroy: function() {},
-    };
+    return init();
   };
+
+  if (UtilRegistry) {
+    UtilRegistry.register({
+      name: ASIDENAV_UTIL_NAME,
+      selector: ASIDENAV_UTIL_SELECTOR,
+      setup: asidenavUtil,
+    });
+  }
 })();
diff --git a/templates/widgets/asidenav/asidenav.hamlet b/templates/widgets/asidenav/asidenav.hamlet
index 6bbcb159c..1640e0953 100644
--- a/templates/widgets/asidenav/asidenav.hamlet
+++ b/templates/widgets/asidenav/asidenav.hamlet
@@ -1,5 +1,5 @@
 $newline never
-<aside .main__aside>
+<aside .main__aside uw-asidenav>
   <div .asidenav__logo>
     <a href="/" .asidenav__logo-link>
       <span .asidenav__logo-link-item.asidenav__logo-lmu>LMU
diff --git a/templates/widgets/asidenav/asidenav.julius b/templates/widgets/asidenav/asidenav.julius
deleted file mode 100644
index 9387bc714..000000000
--- a/templates/widgets/asidenav/asidenav.julius
+++ /dev/null
@@ -1,4 +0,0 @@
-document.addEventListener('DOMContentLoaded', function() {
-  var asidenavEl = document.querySelector('.main__aside');
-  window.utils.setup('aside', asidenavEl);
-});

From 1c99b36be019c42bf2bfb01d89cb6cc150723912 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 10 Apr 2019 20:03:05 +0200
Subject: [PATCH 057/238] add documentation for async form internationalization

---
 static/js/utils/asyncForm.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/static/js/utils/asyncForm.js b/static/js/utils/asyncForm.js
index 4b7b94951..eaf6f9221 100644
--- a/static/js/utils/asyncForm.js
+++ b/static/js/utils/asyncForm.js
@@ -12,6 +12,11 @@
    * Example usage:
    *   <form uw-async-form method='POST' action='...'>
    *     ...
+   *
+   * Internationalization:
+   *  This utility expects the following translations to be available:
+   *    asyncFormFailure: text that gets shown if an async form request fails
+   *      example: "Oops. Something went wrong."
    */
 
   var ASYNC_FORM_UTIL_NAME = 'asyncForm';

From 7d7c0d15c9b7f552ddffd13c9bdb05c84147e9e6 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 10 Apr 2019 20:19:49 +0200
Subject: [PATCH 058/238] refactor alerts js utility

---
 src/Foundation.hs                      |   2 +-
 static/css/utils/alerts.scss           |  20 ----
 static/js/utils/alerts.js              | 134 ++++++++++++++++++-------
 templates/widgets/alerts/alerts.hamlet |   2 +-
 4 files changed, 99 insertions(+), 59 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 1e9d7451f..b834b1dab 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1068,8 +1068,8 @@ siteLayout' headingOverride widget = do
       addScript $ StaticR js_services_utilRegistry_js
       addScript $ StaticR js_services_httpClient_js
       addScript $ StaticR js_services_i18n_js
-      -- addScript $ StaticR js_utils_alerts_js
       -- JavaScript utils
+      addScript $ StaticR js_utils_alerts_js
       addScript $ StaticR js_utils_asidenav_js
       addScript $ StaticR js_utils_asyncForm_js
       addScript $ StaticR js_utils_asyncTable_js
diff --git a/static/css/utils/alerts.scss b/static/css/utils/alerts.scss
index 3256eef96..bd6b55bfd 100644
--- a/static/css/utils/alerts.scss
+++ b/static/css/utils/alerts.scss
@@ -1,23 +1,3 @@
-/* ALERTS */
-/**
-  .alert
-    Regular Info Alert
-    Disappears automatically after 30 seconds
-    Disappears after x seconds if explicitly specified via data-decay='x'
-    Can be told not to disappear with data-decay='0'
-
-  .alert-success
-    Disappears automatically after 30 seconds
-
-  .alert-warning
-    Does not disappear
-    Orange regardless of user's selected theme
-
-  .alert-error
-    Does not disappear
-    Red regardless of user's selected theme
-
- */
 .alerts {
   position: fixed;
   bottom: 0;
diff --git a/static/js/utils/alerts.js b/static/js/utils/alerts.js
index b854495a0..8b2ba92fb 100644
--- a/static/js/utils/alerts.js
+++ b/static/js/utils/alerts.js
@@ -1,68 +1,126 @@
 (function() {
   'use strict';
 
-  window.utils = window.utils || {};
+  /**
+   *
+   * Alerts Utility
+   *  makes alerts interactive
+   *
+   * Attribute: uw-alerts
+   *
+   * Types of alerts:
+   *   [default]
+   *     Regular Info Alert
+   *     Disappears automatically after 30 seconds
+   *     Disappears after x seconds if explicitly specified via data-decay='x'
+   *     Can be told not to disappear with data-decay='0'
+   *
+   *   [success]
+   *     Currently no special visual appearance
+   *     Disappears automatically after 30 seconds
+   *
+   *   [warning]
+   *     Will be coloured warning-orange regardless of user's selected theme
+   *     Does not disappear
+   *
+   *   [error]
+   *     Will be coloured error-red regardless of user's selected theme
+   *     Does not disappear
+   *
+   * Example usage:
+   *  <div .alerts uw-alerts>
+   *    <div .alerts__toggler>
+   *      <div .alert.alert-info>
+   *      <div .alert__closer>
+   *      <div .alert__icon>
+   *      <div .alert__content>
+   *        This is some information
+   *
+   */
 
-  var ALERTS_CLASS = 'alerts';
+  var ALERTS_UTIL_NAME = 'alerts';
+  var ALERTS_UTIL_SELECTOR = '[uw-alerts]';
+
+  var ALERTS_INITIALIZED_CLASS = 'alerts--initialized';
   var ALERTS_TOGGLER_CLASS = 'alerts__toggler';
   var ALERTS_TOGGLER_VISIBLE_CLASS = 'alerts__toggler--visible';
   var ALERTS_TOGGLER_APPEAR_DELAY = 120;
 
   var ALERT_CLASS = 'alert';
+  var ALERT_INITIALIZED_CLASS = 'alert--initialized';
   var ALERT_CLOSER_CLASS = 'alert__closer';
   var ALERT_INVISIBLE_CLASS = 'alert--invisible';
   var ALERT_AUTO_HIDE_DELAY = 10;
   var ALERT_AUTOCLOSING_MATCHER = '.alert-info, .alert-success';
 
-  var JS_INITIALIZED_CLASS = 'js-initialized';
-
-  window.utils.alerts = function(alertsEl) {
-
-    if (alertsEl.classList.contains(JS_INITIALIZED_CLASS)) {
-      return false;
-    }
-
-    if (!alertsEl || !alertsEl.classList.contains(ALERTS_CLASS)) {
-      throw new Error('utils.alerts has to be called with alerts element');
-    }
-
+  var alertsUtil = function(element) {
     var togglerCheckRequested = false;
+    var togglerElement;
+    var alertElements;
 
-    var togglerEl = alertsEl.querySelector('.' + ALERTS_TOGGLER_CLASS);
+    function init() {
+      if (!element) {
+        throw new Error('Alerts util has to be called with an element!');
+      }
 
-    var alertElements = Array.from(alertsEl.querySelectorAll('.' + ALERT_CLASS))
-      .filter(function(alert) {
-        return !alert.classList.contains(JS_INITIALIZED_CLASS);
+      if (element.classList.contains(ALERTS_INITIALIZED_CLASS)) {
+        return false;
+      }
+
+      togglerElement = element.querySelector('.' + ALERTS_TOGGLER_CLASS);
+      alertElements = gatherAlertElements();
+
+      initToggler();
+      initAlerts();
+
+      // mark initialized
+      element.classList.add(ALERTS_INITIALIZED_CLASS);
+
+      return {
+        name: ALERTS_UTIL_NAME,
+        element: element,
+        destroy: function() {},
+      };
+    }
+
+    function gatherAlertElements() {
+      return Array.from(element.querySelectorAll('.' + ALERT_CLASS)).filter(function(alert) {
+        return !alert.classList.contains(ALERT_INITIALIZED_CLASS);
       });
+    }
 
     function initToggler() {
-      togglerEl.addEventListener('click', function() {
+      togglerElement.addEventListener('click', function() {
         alertElements.forEach(function(alertEl) {
           toggleAlert(alertEl, true);
         });
-        togglerEl.classList.remove(ALERTS_TOGGLER_VISIBLE_CLASS);
+        togglerElement.classList.remove(ALERTS_TOGGLER_VISIBLE_CLASS);
       });
-      alertsEl.classList.add(JS_INITIALIZED_CLASS);
+      element.classList.add(ALERTS_INITIALIZED_CLASS);
     }
 
-    function initAlert(alertEl) {
+    function initAlerts() {
+      alertElements.forEach(initAlert);
+    }
+
+    function initAlert(alertElement) {
       var autoHideDelay = ALERT_AUTO_HIDE_DELAY;
-      if (alertEl.dataset.decay) {
-        autoHideDelay = parseInt(alertEl.dataset.decay, 10);
+      if (alertElement.dataset.decay) {
+        autoHideDelay = parseInt(alertElement.dataset.decay, 10);
       }
 
-      var closeEl = alertEl.querySelector('.' + ALERT_CLOSER_CLASS);
+      var closeEl = alertElement.querySelector('.' + ALERT_CLOSER_CLASS);
       closeEl.addEventListener('click', function() {
-        toggleAlert(alertEl);
+        toggleAlert(alertElement);
       });
 
-      if (autoHideDelay > 0 && alertEl.matches(ALERT_AUTOCLOSING_MATCHER)) {
+      if (autoHideDelay > 0 && alertElement.matches(ALERT_AUTOCLOSING_MATCHER)) {
         window.setTimeout(function() {
-          toggleAlert(alertEl);
+          toggleAlert(alertElement);
         }, autoHideDelay * 1000);
       }
 
-      alertEl.classList.add(JS_INITIALIZED_CLASS);
+      alertElement.classList.add(ALERTS_INITIALIZED_CLASS);
     }
 
     function toggleAlert(alertEl, visible) {
@@ -80,17 +138,19 @@
       }, true);
 
       window.setTimeout(function() {
-        togglerEl.classList.toggle(ALERTS_TOGGLER_VISIBLE_CLASS, alertsHidden);
+        togglerElement.classList.toggle(ALERTS_TOGGLER_VISIBLE_CLASS, alertsHidden);
         togglerCheckRequested = false;
       }, ALERTS_TOGGLER_APPEAR_DELAY);
     }
 
-    initToggler();
-    alertElements.forEach(initAlert);
-
-    return {
-      scope: alertsEl,
-      destroy: function() {},
-    };
+    return init();
   };
+
+  if (UtilRegistry) {
+    UtilRegistry.register({
+      name: ALERTS_UTIL_NAME,
+      selector: ALERTS_UTIL_SELECTOR,
+      setup: alertsUtil,
+    });
+  }
 })();
diff --git a/templates/widgets/alerts/alerts.hamlet b/templates/widgets/alerts/alerts.hamlet
index bc034c08e..196890850 100644
--- a/templates/widgets/alerts/alerts.hamlet
+++ b/templates/widgets/alerts/alerts.hamlet
@@ -1,4 +1,4 @@
-<div #alerts-1 .alerts> <!-- make wIdent work here instead of '#alerts-1' -->
+<div #alerts-1 .alerts uw-alerts>
   <div .alerts__toggler>
   $forall (status, msg) <- mmsgs
     $with status2 <- bool status "info" (status == "")

From 1dc322aeac61df38e5ea2e29510d0310505e4591 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 10 Apr 2019 20:21:49 +0200
Subject: [PATCH 059/238] remove obsolete code from default-layout.julius

---
 templates/default-layout.julius | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/templates/default-layout.julius b/templates/default-layout.julius
index 78e911914..3460c74bd 100644
--- a/templates/default-layout.julius
+++ b/templates/default-layout.julius
@@ -47,7 +47,5 @@ if (I18n) {
 }
 
 document.addEventListener('DOMContentLoaded', function() {
-  window.utils.setup('flatpickr', document.body, { setupFunction: setupDatepicker });
-  window.utils.setup('showHide', document.body);
-  window.utils.setup('inputs', document.body);
+  setupDatepicker(document.body);
 });

From f4ed279a15842dc442e910d69288e6c87363b013 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 10 Apr 2019 23:09:54 +0200
Subject: [PATCH 060/238] Remove isDynamic from modal.hamlet & minor cleanup

---
 src/Utils/Modal.hs                   | 4 +---
 templates/widgets/modal/modal.hamlet | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Utils/Modal.hs b/src/Utils/Modal.hs
index d62b64607..14ce09965 100644
--- a/src/Utils/Modal.hs
+++ b/src/Utils/Modal.hs
@@ -7,7 +7,6 @@ module Utils.Modal
 import ClassyPrelude.Yesod
 
 import Control.Lens
-import Control.Lens.Extras (is)
 import Utils.Route
 
 import Settings (widgetFile)
@@ -22,12 +21,11 @@ data Modal site = Modal
 
 customModal :: Modal site -> WidgetT site IO ()
 customModal Modal{..} = do
-  let isDynamic = is _Left modalContent
   triggerId' <- maybe newIdent return modalTriggerId
 
   $(widgetFile "widgets/modal/modal")
 
-  route <- for (modalContent ^? _Left) toTextUrl
+  route <- traverse toTextUrl $ modalContent ^? _Left
   modalTrigger route triggerId'
 
 -- | Create a link to a modal
diff --git a/templates/widgets/modal/modal.hamlet b/templates/widgets/modal/modal.hamlet
index c87dd4232..001e4a00f 100644
--- a/templates/widgets/modal/modal.hamlet
+++ b/templates/widgets/modal/modal.hamlet
@@ -1,5 +1,5 @@
 $newline never
-<div uw-modal data-modal-trigger=##{triggerId'} data-modal-closeable :isDynamic:.not-used>
+<div uw-modal data-modal-trigger=##{triggerId'} data-modal-closeable>
   $case modalContent
     $of Right content
       <div .modal__content>

From 04d0f19d9cc3d16f609b7bcf28a3e123f98c1dd2 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 10 Apr 2019 22:51:03 +0200
Subject: [PATCH 061/238] implement destroy util function in js utility
 registry

---
 static/js/services/utilRegistry.js | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/static/js/services/utilRegistry.js b/static/js/services/utilRegistry.js
index a73b914bf..4ffdada2f 100644
--- a/static/js/services/utilRegistry.js
+++ b/static/js/services/utilRegistry.js
@@ -106,8 +106,25 @@
     }
 
     function _destroyUtilInstances(name) {
-      console.log('TODO: destroy util instances', { name });
-      // call destroy on each activeUtilInstance that matches the name
+      activeUtilInstances
+        .map(function(util, index) {
+          return {
+            util: util,
+            index: index,
+          };
+        }).filter(function(activeUtil) {
+          // find utils instances to destroy
+          return activeUtil.util.name === name;
+        }).forEach(function(activeUtil) {
+          // destroy util instance
+          activeUtil.util.destroy();
+          delete activeUtilInstances[activeUtil.index];
+        });
+
+      // get rid of now empty array slots
+      activeUtilInstances = activeUtilInstances.filter(function(util) {
+        return !!util;
+      })
     }
 
     // public API

From 6f549ad90c741ab8c4749e25fd134ea8f0900684 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 10 Apr 2019 23:19:26 +0200
Subject: [PATCH 062/238] change i18n for async form failure for transfer to
 .msg

---
 templates/default-layout.julius | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/default-layout.julius b/templates/default-layout.julius
index 3460c74bd..27a220a02 100644
--- a/templates/default-layout.julius
+++ b/templates/default-layout.julius
@@ -40,7 +40,7 @@ if (I18n) {
     filesSelected: 'Dateien ausgewählt',
     selectFile: 'Datei auswählen',
     selectFiles: 'Datei(en) auswählen',
-    asyncFormFailure: 'Da ist etwas schief gelaufen, das tut uns Leid.<br>Falls das erneut passiert schicke uns gerne eine kurze Beschreibung dieses Ereignisses über das Hilfe-Widget rechts oben.<br><br>Vielen Dank für deine Hilfe',
+    asyncFormFailure: 'Da ist etwas schief gelaufen, das tut uns Leid. Falls das erneut passiert schicke uns gerne eine kurze Beschreibung dieses Ereignisses über das Hilfe-Widget rechts oben. Vielen Dank für deine Hilfe!',
   });
 } else {
   throw new Error('I18n JavaScript service is missing!');

From 760b7be0ecc47ee3d514a7fce428ed12f26141d9 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 10 Apr 2019 23:24:27 +0200
Subject: [PATCH 063/238] only show info for previously uploaded files if there
 are some

---
 templates/multiFileField.hamlet | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/multiFileField.hamlet b/templates/multiFileField.hamlet
index 973cd762e..48af3d786 100644
--- a/templates/multiFileField.hamlet
+++ b/templates/multiFileField.hamlet
@@ -1,5 +1,5 @@
 $newline never
-<!-- TODO: add $if to check if there were files uploaded already -->
+$if not (null fileInfos)
   <div .file-uploads-label>_{MsgPreviouslyUploadedInfo}
   <ol .file-input__list>
     $forall FileUploadInfo{..} <- fileInfos

From 23d94e1335394f7eb379ddd963dcc82cf911a1bb Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 10 Apr 2019 23:25:49 +0200
Subject: [PATCH 064/238] remove poc js utility

---
 src/Foundation.hs      |  1 -
 static/js/utils/poc.js | 33 ---------------------------------
 2 files changed, 34 deletions(-)
 delete mode 100644 static/js/utils/poc.js

diff --git a/src/Foundation.hs b/src/Foundation.hs
index b834b1dab..ef1793856 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1077,7 +1077,6 @@ siteLayout' headingOverride widget = do
       addScript $ StaticR js_utils_form_js
       addScript $ StaticR js_utils_inputs_js
       addScript $ StaticR js_utils_modal_js
-      addScript $ StaticR js_utils_poc_js
       addScript $ StaticR js_utils_showHide_js
       -- addScript $ StaticR js_utils_tabber_js
       addStylesheet $ StaticR css_utils_alerts_scss
diff --git a/static/js/utils/poc.js b/static/js/utils/poc.js
deleted file mode 100644
index 5d87a0f82..000000000
--- a/static/js/utils/poc.js
+++ /dev/null
@@ -1,33 +0,0 @@
-(function() {
-
-  var UTIL_NAME = 'poc';
-  var UTIL_SELECTOR = '[uw-poc]';
-
-  var util = function(element) {
-
-    function _init() {
-      var color = 'red';
-      if (element.dataset.color) {
-        color = element.dataset.color;
-      }
-      element.style.outline = '1px solid ' + color;
-    }
-
-    _init();
-
-    return {
-      name: UTIL_NAME,
-      element: element,
-      destroy: function() {},
-    };
-  };
-
-  if (UtilRegistry) {
-    UtilRegistry.register({
-      name: UTIL_NAME,
-      selector: UTIL_SELECTOR,
-      setup: util,
-    });
-  }
-
-})();

From 8cbded79db4b9b5848151ed7cec1be1541262079 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 10 Apr 2019 23:29:45 +0200
Subject: [PATCH 065/238] add dynamic theme switcher js utility

---
 templates/default-layout.julius | 27 +++++++++++++++++++++++++++
 templates/profile.julius        | 24 ++++++++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 templates/profile.julius

diff --git a/templates/default-layout.julius b/templates/default-layout.julius
index 27a220a02..6c5e8bfc1 100644
--- a/templates/default-layout.julius
+++ b/templates/default-layout.julius
@@ -49,3 +49,30 @@ if (I18n) {
 document.addEventListener('DOMContentLoaded', function() {
   setupDatepicker(document.body);
 });
+
+/**
+ * The following code should be moved to profile.julius as soon as the widget file is actually used.
+ */
+(function() {
+  'use strict';
+
+  var DEFAULT_THEME = 'theme--default';
+
+  document.addEventListener('DOMContentLoaded', function() {
+
+    var themeSwitcher = document.querySelector('#theme-select');
+    var currentTheme = DEFAULT_THEME;
+
+    if (themeSwitcher) {
+      currentTheme = 'theme--' + themeSwitcher.value;
+      themeSwitcher.addEventListener('input', function() {
+
+        var desiredTheme = 'theme--' + themeSwitcher.value;
+        document.body.classList.remove(currentTheme);
+        document.body.classList.add(desiredTheme);
+        currentTheme = desiredTheme;
+      });
+    }
+  });
+
+})();
diff --git a/templates/profile.julius b/templates/profile.julius
new file mode 100644
index 000000000..9e125f982
--- /dev/null
+++ b/templates/profile.julius
@@ -0,0 +1,24 @@
+
+(function() {
+  'use strict';
+
+  var DEFAULT_THEME = 'theme--default';
+
+  document.addEventListener('DOMContentLoaded', function() {
+
+    var themeSwitcher = document.querySelector('#theme-select');
+    var currentTheme = DEFAULT_THEME;
+
+    if (themeSwitcher) {
+      currentTheme = 'theme--' + themeSwitcher.value;
+      themeSwitcher.addEventListener('input', function() {
+
+        var desiredTheme = 'theme--' + themeSwitcher.value;
+        document.body.classList.remove(currentTheme);
+        document.body.classList.add(desiredTheme);
+        currentTheme = desiredTheme;
+      });
+    }
+  });
+
+})();

From 26658723b94749145f134c73a0a400cdcb708d5d Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 10 Apr 2019 23:32:28 +0200
Subject: [PATCH 066/238] add scope to setupAll of js util registry

---
 static/js/services/utilRegistry.js | 4 ++--
 static/js/utils/asyncTable.js      | 2 +-
 static/js/utils/modal.js           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/static/js/services/utilRegistry.js b/static/js/services/utilRegistry.js
index 4ffdada2f..9090be850 100644
--- a/static/js/services/utilRegistry.js
+++ b/static/js/services/utilRegistry.js
@@ -46,14 +46,14 @@
       }
     }
 
-    function setupAllUtils() {
+    function setupAllUtils(scope) {
       if (DEBUG_MODE > 1) {
         console.info('registered js utilities:');
         console.table(registeredUtils);
       }
 
       registeredUtils.forEach(function(util) {
-        setupUtil(util);
+        setupUtil(util, scope);
       });
     }
 
diff --git a/static/js/utils/asyncTable.js b/static/js/utils/asyncTable.js
index 0c5f30e31..9c731b33e 100644
--- a/static/js/utils/asyncTable.js
+++ b/static/js/utils/asyncTable.js
@@ -351,7 +351,7 @@
       element.innerHTML = newWrapperContents.innerHTML;
 
       if (UtilRegistry) {
-        UtilRegistry.setupAll();
+        UtilRegistry.setupAll(element);
       }
     }
 
diff --git a/static/js/utils/modal.js b/static/js/utils/modal.js
index a0993d802..c29feea69 100644
--- a/static/js/utils/modal.js
+++ b/static/js/utils/modal.js
@@ -169,7 +169,7 @@
       element.insertBefore(modalContent, null);
 
       // setup any newly arrived utils
-      UtilRegistry.setupAll();
+      UtilRegistry.setupAll(element);
     }
 
     function withPrefixedInputIDs(modalContent) {

From 58a7bba64f3ebc7b43fbbecb8fe666a3f69918d9 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 10 Apr 2019 23:35:27 +0200
Subject: [PATCH 067/238] reduce debug level in js util registry

---
 static/js/services/utilRegistry.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/js/services/utilRegistry.js b/static/js/services/utilRegistry.js
index 9090be850..ca12f3d28 100644
--- a/static/js/services/utilRegistry.js
+++ b/static/js/services/utilRegistry.js
@@ -4,7 +4,7 @@
   var registeredUtils = [];
   var activeUtilInstances = [];
 
-  var DEBUG_MODE = /localhost/.test(window.location.href) && 2;
+  var DEBUG_MODE = /localhost/.test(window.location.href) && 0;
 
   // Registry
   // (revealing module pattern)

From 325db53043e2d94a2811867aa251f22692f805d4 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 10 Apr 2019 23:39:41 +0200
Subject: [PATCH 068/238] remove obsolete alerts.julius

---
 templates/widgets/alerts/alerts.julius | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 templates/widgets/alerts/alerts.julius

diff --git a/templates/widgets/alerts/alerts.julius b/templates/widgets/alerts/alerts.julius
deleted file mode 100644
index 659c9d921..000000000
--- a/templates/widgets/alerts/alerts.julius
+++ /dev/null
@@ -1,4 +0,0 @@
-document.addEventListener('DOMContentLoaded', function() {
-  var alertsElement = document.querySelector('#' + 'alerts-1');
-  window.utils.setup('alerts', alertsElement);
-});

From 586fb937369174b9090f47f5fd3610c5197d5e13 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 11 Apr 2019 00:05:01 +0200
Subject: [PATCH 069/238] Introduce Utils.Frontend.I18n

---
 messages/frontend/de.msg          |  4 +++
 src/Foundation.hs                 |  6 +++++
 src/Import/NoFoundation.hs        |  3 ++-
 src/Utils/Frontend/I18n.hs        | 41 +++++++++++++++++++++++++++++++
 src/Utils/{ => Frontend}/Modal.hs |  2 +-
 templates/default-layout.julius   |  7 +-----
 6 files changed, 55 insertions(+), 8 deletions(-)
 create mode 100644 messages/frontend/de.msg
 create mode 100644 src/Utils/Frontend/I18n.hs
 rename src/Utils/{ => Frontend}/Modal.hs (97%)

diff --git a/messages/frontend/de.msg b/messages/frontend/de.msg
new file mode 100644
index 000000000..f01c31640
--- /dev/null
+++ b/messages/frontend/de.msg
@@ -0,0 +1,4 @@
+FilesSelected: Dateien ausgewählt
+SelectFile: Datei auswählen
+SelectFiles: Datei(en) auswählen
+AsyncFormFailure: Da ist etwas schief gelaufen, das tut uns Leid. Falls das erneut passiert schicke uns gerne eine kurze Beschreibung dieses Ereignisses über das Hilfe-Widget rechts oben. Vielen Dank für deine Hilfe!
\ No newline at end of file
diff --git a/src/Foundation.hs b/src/Foundation.hs
index b834b1dab..39fcaf424 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -187,6 +187,7 @@ mkMessageVariant "UniWorX" "Campus" "messages/campus" "de"
 mkMessageVariant "UniWorX" "Dummy" "messages/dummy" "de"
 mkMessageVariant "UniWorX" "PWHash" "messages/pw-hash" "de"
 mkMessageVariant "UniWorX" "Button" "messages/button" "de"
+mkMessageVariant "UniWorX" "Frontend" "messages/frontend" "de"
 
 -- This instance is required to use forms. You can modify renderMessage to
 -- achieve customized and internationalized form validation messages.
@@ -1053,6 +1054,11 @@ siteLayout' headingOverride widget = do
       hasSecondaryPageActions = any (is _PageActionSecondary) $ toListOf (traverse . _1 . _menuItemType) menuTypes
       hasPrimaryPageActions = any (is _PageActionPrime) $ toListOf (traverse . _1 . _menuItemType) menuTypes
 
+  MsgRenderer mr <- getMsgRenderer
+  let
+    -- See Utils.Frontend.I18n and files in messages/frontend for message definitions
+    frontendI18n = toJSON (mr :: FrontendMessage -> Text)
+
   pc <- widgetToPageContent $ do
       -- 3rd party
       addScript $ StaticR js_vendor_flatpickr_js
diff --git a/src/Import/NoFoundation.hs b/src/Import/NoFoundation.hs
index 457682087..9302db552 100644
--- a/src/Import/NoFoundation.hs
+++ b/src/Import/NoFoundation.hs
@@ -15,7 +15,8 @@ import Yesod.Auth             as Import
 import Yesod.Core.Types       as Import (loggerSet)
 import Yesod.Default.Config2  as Import
 import Utils                  as Import
-import Utils.Modal            as Import
+import Utils.Frontend.Modal   as Import
+import Utils.Frontend.I18n    as Import
 import Yesod.Core.Json        as Import (provideJson)
 import Yesod.Core.Types.Instances as Import ()
 
diff --git a/src/Utils/Frontend/I18n.hs b/src/Utils/Frontend/I18n.hs
new file mode 100644
index 000000000..9c8533496
--- /dev/null
+++ b/src/Utils/Frontend/I18n.hs
@@ -0,0 +1,41 @@
+module Utils.Frontend.I18n
+  ( FrontendMessage(..)
+  ) where
+
+import ClassyPrelude
+import Data.Universe
+
+import Control.Lens
+import Utils.PathPiece
+
+import Web.PathPieces
+import Data.Aeson
+import Data.Aeson.Types (toJSONKeyText)
+import Data.Aeson.TH
+import qualified Data.Char as Char
+
+
+-- | I18n-Messages used in JavaScript-Frontend
+--
+-- Only nullary constructors are supported
+--
+-- @MsgCamelCaseIdentifier@ gets translated to @camelCaseIdentifier@ in Frontend (see `nullaryPathPiece` and `deriveJSON` below)
+data FrontendMessage = MsgFilesSelected
+                     | MsgSelectFile
+                     | MsgSelectFiles
+                     | MsgAsyncFormFailure
+  deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
+instance Universe FrontendMessage
+instance Finite FrontendMessage
+instance Hashable FrontendMessage
+
+nullaryPathPiece ''FrontendMessage $ over _head Char.toLower . mconcat . drop 1 . splitCamel
+
+deriveJSON defaultOptions
+  { constructorTagModifier = over _head Char.toLower . mconcat . drop 1 . splitCamel
+  } ''FrontendMessage
+
+instance ToJSONKey FrontendMessage where
+  toJSONKey = toJSONKeyText toPathPiece
+instance FromJSONKey FrontendMessage where
+  fromJSONKey = FromJSONKeyTextParser $ parseJSON . String
diff --git a/src/Utils/Modal.hs b/src/Utils/Frontend/Modal.hs
similarity index 97%
rename from src/Utils/Modal.hs
rename to src/Utils/Frontend/Modal.hs
index 14ce09965..79142ae4b 100644
--- a/src/Utils/Modal.hs
+++ b/src/Utils/Frontend/Modal.hs
@@ -1,4 +1,4 @@
-module Utils.Modal
+module Utils.Frontend.Modal
   ( Modal(..)
   , customModal
   , modal
diff --git a/templates/default-layout.julius b/templates/default-layout.julius
index 27a220a02..8c7295843 100644
--- a/templates/default-layout.julius
+++ b/templates/default-layout.julius
@@ -36,12 +36,7 @@ function setupDatepicker(wrapper) {
 }
 
 if (I18n) {
-  I18n.addMany({
-    filesSelected: 'Dateien ausgewählt',
-    selectFile: 'Datei auswählen',
-    selectFiles: 'Datei(en) auswählen',
-    asyncFormFailure: 'Da ist etwas schief gelaufen, das tut uns Leid. Falls das erneut passiert schicke uns gerne eine kurze Beschreibung dieses Ereignisses über das Hilfe-Widget rechts oben. Vielen Dank für deine Hilfe!',
-  });
+  I18n.addMany(#{frontendI18n});
 } else {
   throw new Error('I18n JavaScript service is missing!');
 }

From 3b14a4f03d76b6aa0faf2598e1542e6d24ce9460 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 11 Apr 2019 12:52:27 +0200
Subject: [PATCH 070/238] reinstate profile.hamlet

---
 src/Handler/Profile.hs          |  9 +++++----
 templates/default-layout.julius | 27 ---------------------------
 2 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs
index 5de418a34..00ac76742 100644
--- a/src/Handler/Profile.hs
+++ b/src/Handler/Profile.hs
@@ -116,10 +116,11 @@ postProfileR = do
 
   siteLayout [whamlet|_{MsgProfileFor} ^{nameWidget userDisplayName userSurname}|] $ do
     setTitle . toHtml $ "Profil " <> userIdent
-    wrapForm formWidget def
-      { formAction = Just $ SomeRoute ProfileR
-      , formEncoding = formEnctype
-      }
+    let settingsForm = wrapForm formWidget def
+          { formAction = Just $ SomeRoute ProfileR
+          , formEncoding = formEnctype
+          }
+    $(widgetFile "profile")
 
 
 getProfileDataR :: Handler Html
diff --git a/templates/default-layout.julius b/templates/default-layout.julius
index dffe24834..8c7295843 100644
--- a/templates/default-layout.julius
+++ b/templates/default-layout.julius
@@ -44,30 +44,3 @@ if (I18n) {
 document.addEventListener('DOMContentLoaded', function() {
   setupDatepicker(document.body);
 });
-
-/**
- * The following code should be moved to profile.julius as soon as the widget file is actually used.
- */
-(function() {
-  'use strict';
-
-  var DEFAULT_THEME = 'theme--default';
-
-  document.addEventListener('DOMContentLoaded', function() {
-
-    var themeSwitcher = document.querySelector('#theme-select');
-    var currentTheme = DEFAULT_THEME;
-
-    if (themeSwitcher) {
-      currentTheme = 'theme--' + themeSwitcher.value;
-      themeSwitcher.addEventListener('input', function() {
-
-        var desiredTheme = 'theme--' + themeSwitcher.value;
-        document.body.classList.remove(currentTheme);
-        document.body.classList.add(desiredTheme);
-        currentTheme = desiredTheme;
-      });
-    }
-  });
-
-})();

From ea658f65ce25ddc85c225e88825698c6906e6b02 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 12 Apr 2019 14:08:55 +0200
Subject: [PATCH 071/238] Lecturer invitations via e-mail

---
 messages/uniworx/de.msg                  |  14 +-
 models/courses                           |   6 +
 routes                                   |   1 +
 src/Database/Persist/Types/Instances.hs  |  12 ++
 src/Foundation.hs                        |   6 +-
 src/Handler/Course.hs                    | 155 +++++++++++++++++++----
 src/Import/NoFoundation.hs               |   1 +
 src/Jobs.hs                              |   1 +
 src/Jobs/Handler/LecturerInvitation.hs   |  43 +++++++
 src/Jobs/Types.hs                        |   3 +
 src/Model.hs                             |   2 +
 src/Model/Types.hs                       |   2 +
 src/Utils/DB.hs                          |   6 +
 templates/courseLecInvite.hamlet         |   3 +
 templates/mail/lecturerInvitation.hamlet |  11 ++
 15 files changed, 237 insertions(+), 29 deletions(-)
 create mode 100644 src/Database/Persist/Types/Instances.hs
 create mode 100644 src/Jobs/Handler/LecturerInvitation.hs
 create mode 100644 templates/courseLecInvite.hamlet
 create mode 100644 templates/mail/lecturerInvitation.hamlet

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index a2b384c03..06715ee26 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -11,6 +11,8 @@ BtnCandidatesInfer: Studienfachzuordnung automatisch lernen
 BtnCandidatesDeleteConflicts: Konflikte löschen
 BtnCandidatesDeleteAll: Alle Beobachtungen löschen
 BtnResetTokens: Authorisierungs-Tokens invalidieren
+BtnLecInvAccept: Annehmen
+BtnLecInvDecline: Ablehnen
 
 Aborted: Abgebrochen
 Remarks: Hinweise
@@ -523,6 +525,9 @@ MailEditNotifications: Benachrichtigungen ein-/ausschalten
 MailSubjectSupport: Supportanfrage
 MailSubjectSupportCustom customSubject@Text: [Support] #{customSubject}
 
+MailSubjectLecturerInvitation tid@TermId ssh@SchoolId csh@CourseShorthand: [#{display tid}-#{display ssh}-#{csh}] Einladung zum Kursverwalter
+CourseLecturerInvitationAcceptDecline: Einladung annehmen/ablehnen
+
 SheetGrading: Bewertung
 SheetGradingPoints maxPoints@Points: #{tshow maxPoints} Punkte
 SheetGradingPassPoints maxPoints@Points passingPoints@Points: Bestanden ab #{tshow passingPoints} von #{tshow maxPoints} Punkten
@@ -745,4 +750,11 @@ DBTIRowsMissing n@Int: #{pluralDE n "Eine Zeile ist" "Einige Zeile sind"} aus de
 MassInputAddDimension: Hinzufügen
 MassInputDeleteCell: Entfernen
 
-NavigationFavourites: Favoriten
\ No newline at end of file
+NavigationFavourites: Favoriten
+
+EmailInvitationWarning: Dem System ist kein Nutzer mit dieser Addresse bekannt. Es wird eine Einladung per E-Mail versandt.
+
+LecturerInvitationAccepted lType@Text csh@CourseShorthand: Sie wurden als #{lType} für #{csh} eingetragen
+LecturerInvitationDeclined csh@CourseShorthand: Sie haben die Einladung, Kursverwalter für #{csh} zu werden, abgelehnt
+CourseLecInviteHeading courseName@Text: Einladung zum Kursverwalter für #{courseName}
+CourseLecInviteExplanation: Sie wurden eingeladen, Verwalter für einen Kurs zu sein.
\ No newline at end of file
diff --git a/models/courses b/models/courses
index 4fcf67d65..45166d7d5 100644
--- a/models/courses
+++ b/models/courses
@@ -35,6 +35,12 @@ Lecturer                       -- course ownership
     course       CourseId
     type         LecturerType  default='"lecturer"'
     UniqueLecturer user course -- note: multiple lecturers per course are allowed, but no duplicated rows in this table
+LecturerInvitation json        -- preliminary course ownership for when a token to become `Lecturer` is sent to an email
+    email        (CI Text)
+    course       CourseId
+    type         LecturerType Maybe
+    UniqueLecturerInvitation email course
+    deriving Eq Ord Read Show Generic Typeable
 CourseParticipant                      -- course enrolement
     course       CourseId
     user         UserId
diff --git a/routes b/routes
index 6e4a39302..87401b00d 100644
--- a/routes
+++ b/routes
@@ -76,6 +76,7 @@
   /                           CShowR          GET             !free
   /register                   CRegisterR          POST        !timeANDcapacity
   /edit                       CEditR          GET POST
+  /lecturer-invite/#UserEmail CLecInviteR     GET POST
   /delete                     CDeleteR        GET POST        !lecturerANDempty
   /users                      CUsersR         GET POST
   /users/#CryptoUUIDUser      CUserR          GET POST        !lecturerANDparticipant
diff --git a/src/Database/Persist/Types/Instances.hs b/src/Database/Persist/Types/Instances.hs
new file mode 100644
index 000000000..db5957d54
--- /dev/null
+++ b/src/Database/Persist/Types/Instances.hs
@@ -0,0 +1,12 @@
+{-# LANGUAGE UndecidableInstances #-}
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Database.Persist.Types.Instances
+  (
+  ) where
+
+import ClassyPrelude
+import Database.Persist.Types
+
+instance (Hashable record, Hashable (Key record)) => Hashable (Entity record) where
+  s `hashWithSalt` Entity{..} = s `hashWithSalt` entityKey `hashWithSalt` entityVal
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 1eebfd41c..38c2052c9 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -487,11 +487,13 @@ tagAccessPredicate AuthToken = APDB $ \mAuthId route isWrite -> exceptT return r
   User{userTokensIssuedAfter} <- lift $ get404 tokenAuthority
   guardMExceptT (Just tokenIssuedAt >= userTokensIssuedAfter) (unauthorizedI MsgUnauthorizedTokenExpired)
 
-  authorityVal <- evalAccessFor (Just tokenAuthority) route isWrite
+  authorityVal <- do
+    dnf <- either throwM return $ routeAuthTags route
+    fmap fst . runWriterT $ evalAuthTags (AuthTagActive $ (/=) AuthToken) dnf (Just tokenAuthority) route isWrite
   guardExceptT (is _Authorized authorityVal) authorityVal
 
   whenIsJust tokenAddAuth $ \addDNF -> do
-    additionalVal <- fmap fst . runWriterT $ evalAuthTags (AuthTagActive $ const True) addDNF mAuthId route isWrite
+    additionalVal <- fmap fst . runWriterT $ evalAuthTags (AuthTagActive $ (/=) AuthToken) addDNF mAuthId route isWrite
     guardExceptT (is _Authorized additionalVal) additionalVal
 
   return Authorized
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 98016ca8e..848faf0e7 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -33,6 +33,8 @@ import qualified Database.Esqueleto as E
 
 import Text.Blaze.Html.Renderer.Text (renderHtml)
 
+import Jobs.Queue
+
 -- NOTE: Outdated way to use dbTable; see ProfileDataR Handler for a more recent method.
 type CourseTableData = DBRow (Entity Course, Int, Bool, Entity School)
 
@@ -416,7 +418,7 @@ getCourseNewR = do
           return course
       template <- case listToMaybe oldCourses of
         (Just oldTemplate) ->
-            let newTemplate = courseToForm oldTemplate [] in
+            let newTemplate = courseToForm oldTemplate [] [] in
             return $ Just $ newTemplate
                 { cfCourseId   = Nothing
                 , cfTerm       = TermKey $ TermIdentifier 0 Winter -- invalid, will be ignored; undefined won't work due to strictness
@@ -445,13 +447,14 @@ postCEditR = pgCEditR
 
 pgCEditR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 pgCEditR tid ssh csh = do
-  courseLecs <- runDB $ do
-      mbCourse <- getBy (TermSchoolCourseShort tid ssh csh)
-      mbLecs   <- for mbCourse $ \course -> map entityVal <$> selectList [LecturerCourse ==. entityKey course] [Asc LecturerType]
-      return $ (,) <$> mbCourse <*> mbLecs
+  courseData <- runDB $ do
+      mbCourse     <- getBy (TermSchoolCourseShort tid ssh csh)
+      mbLecs       <- for mbCourse $ \course -> map entityVal <$> selectList [LecturerCourse ==. entityKey course] [Asc LecturerType]
+      mbLecInvites <- for mbCourse $ \course -> map entityVal <$> selectList [LecturerInvitationCourse ==. entityKey course] [Asc LecturerInvitationType]
+      return $ (,,) <$> mbCourse <*> mbLecs <*> mbLecInvites
   -- IMPORTANT: both GET and POST Handler must use the same template,
   --    since an Edit is identified via CourseID, which is not embedded in the received form data for security reasons.
-  courseEditHandler (\p -> Just . SomeRoute $ CourseR tid ssh csh CEditR :#: p) $ uncurry courseToForm <$> courseLecs
+  courseEditHandler (\p -> Just . SomeRoute $ CourseR tid ssh csh CEditR :#: p) $ $(uncurryN 3) courseToForm <$> courseData
 
 
 getCDeleteR, postCDeleteR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
@@ -479,7 +482,7 @@ courseEditHandler miButtonAction mbCourseForm = do
         , cfTerm     = tid
         } -> do -- create new course
           now <- liftIO getCurrentTime
-          insertOkay <- runDB $ do
+          insertOkay <- runDBJobs $ do
             insertOkay <- insertUnique Course
               { courseName            = cfName     res
               , courseDescription     = cfDesc     res
@@ -495,7 +498,11 @@ courseEditHandler miButtonAction mbCourseForm = do
               , courseDeregisterUntil = cfDeRegUntil res
               }
             whenIsJust insertOkay $ \cid -> do
-                forM_ (cfLecturers res) (\(lid,lty) -> insert_  $ Lecturer lid cid lty)
+                forM_ (cfLecturers res) $ \case
+                  Right (lid, lty) -> insert_  $ Lecturer lid cid lty
+                  Left (lEmail, mLTy) -> do
+                    insert_ $ LecturerInvitation lEmail cid mLTy
+                    queueDBJob . JobLecturerInvitation aid $ LecturerInvitation lEmail cid mLTy
                 insert_ $ CourseEdit aid now cid
             return insertOkay
           case insertOkay of
@@ -513,7 +520,7 @@ courseEditHandler miButtonAction mbCourseForm = do
         } -> do -- edit existing course
           now <- liftIO getCurrentTime
           -- addMessage "debug" [shamlet| #{show res}|]
-          success <- runDB $ do
+          success <- runDBJobs $ do
             old <- get cid
             case old of
               Nothing -> addMessageI Error MsgInvalidInput $> False
@@ -536,7 +543,15 @@ courseEditHandler miButtonAction mbCourseForm = do
                   (Just _) -> addMessageI Warning (MsgCourseEditDupShort tid ssh csh) $> False
                   Nothing  -> do
                     deleteWhere [LecturerCourse ==. cid]
-                    forM_ (cfLecturers res) (\(lid,lty) -> insert_  $ Lecturer lid cid lty)
+                    forM_ (cfLecturers res) $ \case
+                      Right (lid, lty) -> insert_  $ Lecturer lid cid lty
+                      Left (lEmail, mLTy) -> do
+                        insertRes <- insertUnique (LecturerInvitation lEmail cid mLTy)
+                        case insertRes of
+                          Just _  ->
+                            queueDBJob . JobLecturerInvitation aid $ LecturerInvitation lEmail cid mLTy
+                          Nothing -> 
+                            updateBy (UniqueLecturerInvitation lEmail cid) [ LecturerInvitationType =. mLTy ]
                     insert_ $ CourseEdit aid now cid
                     addMessageI Success $ MsgCourseEditOk tid ssh csh
                     return True
@@ -564,11 +579,11 @@ data CourseForm = CourseForm
         , cfRegFrom    :: Maybe UTCTime
         , cfRegTo      :: Maybe UTCTime
         , cfDeRegUntil :: Maybe UTCTime
-        , cfLecturers  :: [(UserId, LecturerType)]
+        , cfLecturers  :: [Either (UserEmail, Maybe LecturerType) (UserId, LecturerType)]
         }
 
-courseToForm :: Entity Course -> [Lecturer] -> CourseForm
-courseToForm (Entity cid Course{..}) lecs = CourseForm
+courseToForm :: Entity Course -> [Lecturer] -> [LecturerInvitation] -> CourseForm
+courseToForm (Entity cid Course{..}) lecs lecInvites = CourseForm
     { cfCourseId   = Just cid
     , cfName       = courseName
     , cfDesc       = courseDescription
@@ -582,7 +597,8 @@ courseToForm (Entity cid Course{..}) lecs = CourseForm
     , cfRegFrom    = courseRegisterFrom
     , cfRegTo      = courseRegisterTo
     , cfDeRegUntil = courseDeregisterUntil
-    , cfLecturers  = [(lecturerUser, lecturerType) | Lecturer{..} <- lecs]
+    , cfLecturers  = [Right (lecturerUser, lecturerType) | Lecturer{..} <- lecs]
+                  ++ [Left (lecturerInvitationEmail, lecturerInvitationType) | LecturerInvitation{..} <- lecInvites ]
     }
 
 makeCourseForm :: (forall p. PathPiece p => p -> Maybe (SomeRoute UniWorX)) -> Maybe CourseForm -> Form CourseForm
@@ -609,29 +625,46 @@ makeCourseForm miButtonAction template = identifyForm FIDcourse $ \html -> do
                 | otherwise ->  termsSetField [cfTerm cform]
           _allOtherCases -> return termsAllowedField
 
-    let miAdd :: ListPosition -> Natural -> (Text -> Text) -> FieldView UniWorX -> Maybe (Form (Map ListPosition UserId -> FormResult (Map ListPosition UserId)))
+    let miAdd :: ListPosition -> Natural -> (Text -> Text) -> FieldView UniWorX -> Maybe (Form (Map ListPosition (Either UserEmail UserId) -> FormResult (Map ListPosition (Either UserEmail UserId))))
         miAdd _ _ nudge btn = Just $ \csrf -> do
           (addRes, addView) <- mpreq emailField ("" & addName (nudge "user")) Nothing
           addRes'  <- for addRes $ liftHandlerT . runDB . getKeyBy . UniqueEmail . CI.mk
           let addRes'' = case (,) <$> addRes <*> addRes' of
-                FormSuccess (email, Nothing) -> FormFailure [ mr . MsgEMailUnknown $ CI.mk email ]
-                FormSuccess (email, Just lid) -> FormSuccess $ \prev -> if
-                  | lid `elem` Map.elems prev -> FormFailure [ mr . MsgCourseLecturerAlreadyAdded $ CI.mk email ]
-                  | otherwise -> FormSuccess $ Map.singleton (maybe 0 succ . fmap fst $ Map.lookupMax prev) lid
+                FormSuccess (CI.mk -> email, mLid) ->
+                  let new = maybe (Left email) Right mLid
+                  in  FormSuccess $ \prev -> if
+                        | new `elem` Map.elems prev -> FormFailure [ mr $ MsgCourseLecturerAlreadyAdded email ] -- Since there is only ever one email address associated with any user, the case where a @Left email@ corresponds to a @Right lid@ can never occur (at least logically; might still be the same person, of course)
+                        | otherwise -> FormSuccess $ Map.singleton (maybe 0 succ . fmap fst $ Map.lookupMax prev) new
                 FormFailure errs -> FormFailure errs
                 FormMissing -> FormMissing
               addView'  = toWidget csrf >> fvInput addView >> fvInput btn
           return (addRes'', addView')
 
-        miCell :: ListPosition -> UserId -> Maybe LecturerType -> (Text -> Text) -> Form LecturerType
-        miCell _ lid defType nudge = \csrf -> do
-          (lrwRes,lrwView) <- mreq (selectField optionsFinite) ("" & addName (nudge "lecturer-type")) defType
+        miCell :: ListPosition -> Either UserEmail UserId -> Maybe (Maybe LecturerType) -> (Text -> Text) -> Form (Maybe LecturerType)
+        miCell _ (Right lid) defType nudge = \csrf -> do
+          (lrwRes,lrwView) <- mreq (selectField optionsFinite) ("" & addName (nudge "lecturer-type")) (join defType)
           User{userEmail, userDisplayName, userSurname} <- liftHandlerT . runDB $ get404 lid
           let lrwView' = [whamlet|$newline never
                   #{csrf}
                   ^{nameEmailWidget userEmail userDisplayName userSurname} #
                   ^{fvInput lrwView}
                 |]
+          return (Just <$> lrwRes,lrwView')
+        miCell _ (Left lEmail) defType nudge = \csrf -> do
+          (lrwRes,lrwView) <- mopt (selectField optionsFinite) ("" & addName (nudge "lecturer-type")) defType
+          let lrwView' = [whamlet|
+                           $newline never
+                           #{csrf}
+                           <span style="font-family:monospace">
+                             #{lEmail}
+                            #
+                           <div .tooltip>
+                             <div .tooltip__handle>
+                             <div .tooltip__content>
+                               _{MsgEmailInvitationWarning}
+                            #
+                           ^{fvInput lrwView}
+                         |]
           return (lrwRes,lrwView')
 
         miDelete :: ListLength   -- ^ Current shape
@@ -643,13 +676,22 @@ makeCourseForm miButtonAction template = identifyForm FIDcourse $ \html -> do
         miAllowAdd _ _ _ = True
 
 
-        lecturerForm :: AForm Handler [(UserId,LecturerType)]
-        lecturerForm = formToAForm . over (mapped._2) pure . over (mapped._1.mapped) Map.elems $ massInput
+        lecturerForm :: AForm Handler [Either (UserEmail, Maybe LecturerType) (UserId, LecturerType)]
+        lecturerForm = formToAForm . over (mapped._2) pure . over (mapped._1.mapped) (map liftEither . Map.elems) $ massInput
                 MassInput{..}
                 (fslI MsgCourseLecturers & setTooltip MsgCourseLecturerRightsIdentical)
                 True
-                (Just . Map.fromList . zip [0..] $ maybe [(uid, CourseLecturer)] cfLecturers template)
+                (Just . Map.fromList . zip [0..] $ maybe [(Right uid, Just CourseLecturer)] (map unliftEither . cfLecturers) template)
                 mempty
+          where
+            liftEither :: (Either UserEmail UserId, Maybe LecturerType) -> Either (UserEmail, Maybe LecturerType) (UserId, LecturerType)
+            liftEither (Right lid  , Just lType) = Right (lid   , lType )
+            liftEither (Left lEmail, mLType    ) = Left  (lEmail, mLType)
+            liftEither _                         = error "liftEither: lecturerForm produced output it should not have been able to"
+
+            unliftEither :: Either (UserEmail, Maybe LecturerType) (UserId, LecturerType) -> (Either UserEmail UserId, Maybe LecturerType)
+            unliftEither (Right (lid   , lType )) = (Right lid  , Just lType)
+            unliftEither (Left  (lEmail, mLType)) = (Left lEmail, mLType    )
 
     (newRegFrom,newRegTo,newDeRegUntil) <- case template of
         (Just cform) | (Just _cid) <- cfCourseId cform -> return (Nothing,Nothing,Nothing)
@@ -717,7 +759,7 @@ validateCourse CourseForm{..} = do
           ( NTop cfRegFrom <= NTop cfDeRegUntil
           , MsgCourseDeregistrationEndMustBeAfterStart
           )
-        , ( maybe (any ((== uid) . fst) cfLecturers) (\(Entity _ UserAdmin{}) -> True) userAdmin
+        , ( maybe (anyOf (traverse . _Right . _1) (== uid) cfLecturers) (\(Entity _ UserAdmin{}) -> True) userAdmin
           , MsgCourseUserMustBeLecturer
           )
         ] ]
@@ -1039,3 +1081,64 @@ getCNotesR, postCNotesR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 -- If they are shared, adjust MsgCourseUserNoteTooltip
 getCNotesR  = error "CNotesR: Not implemented"
 postCNotesR = error "CNotesR: Not implemented"
+
+
+data ButtonLecInvite = BtnLecInvAccept | BtnLecInvDecline
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
+instance Universe ButtonLecInvite
+instance Finite ButtonLecInvite
+
+nullaryPathPiece ''ButtonLecInvite $ camelToPathPiece' 3
+embedRenderMessage ''UniWorX ''ButtonLecInvite id
+
+instance Button UniWorX ButtonLecInvite where
+  btnClasses BtnLecInvAccept = [BCIsButton, BCPrimary]
+  btnClasses BtnLecInvDecline = [BCIsButton, BCDanger]
+
+getCLecInviteR, postCLecInviteR :: TermId -> SchoolId -> CourseShorthand -> UserEmail -> Handler Html
+getCLecInviteR = postCLecInviteR
+postCLecInviteR tid ssh csh email = do
+  uid <- requireAuthId
+  (Entity cid Course{..}, Entity liId LecturerInvitation{..}) <- runDB $ do
+    cRes@(Entity cid _) <- getBy404 $ TermSchoolCourseShort tid ssh csh
+    iRes <- getBy404 $ UniqueLecturerInvitation email cid
+    return (cRes, iRes)
+
+  ((btnResult, btnInnerWidget), btnEncoding) <- runFormPost $ \csrf -> do
+    (ltRes, ltView) <- case lecturerInvitationType of
+      Nothing -> mreq (selectField optionsFinite) "" Nothing
+      Just lType -> mforced (selectField optionsFinite) "" lType
+    (btnRes, btnWdgt) <- buttonForm mempty
+    return ((,) <$> ltRes <*> btnRes, toWidget csrf <> fvInput ltView <> btnWdgt)
+  mJwt <- askJwt
+
+  let btnWidget = wrapForm btnInnerWidget' def
+        { formEncoding = btnEncoding
+        , formAction = Just . SomeRoute . CourseR tid ssh csh $ CLecInviteR email
+        , formSubmit = FormNoSubmit
+        }
+      btnInnerWidget'
+        = [whamlet|
+            $newline never
+            $maybe jwt <- mJwt
+              <input type=hidden name=#{toPathPiece PostBearer} value=#{toPathPiece jwt}>
+            ^{btnInnerWidget}
+          |]
+
+  formResult btnResult $ \case
+    (lType, BtnLecInvAccept) -> do
+      runDB $ do
+        delete liId
+        insert_ $ Lecturer uid cid lType
+      MsgRenderer mr <- getMsgRenderer
+      addMessageI Success $ MsgLecturerInvitationAccepted (mr lType) csh
+      redirect $ CourseR tid ssh csh CShowR
+    (_, BtnLecInvDecline) -> do
+      runDB $
+        delete liId
+      addMessageI Info $ MsgLecturerInvitationDeclined csh
+      redirect HomeR
+
+  siteLayoutMsg (MsgCourseLecInviteHeading $ CI.original courseName) $ do
+    setTitleI . MsgCourseLecInviteHeading $ CI.original courseName
+    $(widgetFile "courseLecInvite")
diff --git a/src/Import/NoFoundation.hs b/src/Import/NoFoundation.hs
index fd37d73bc..cae93d5f8 100644
--- a/src/Import/NoFoundation.hs
+++ b/src/Import/NoFoundation.hs
@@ -64,6 +64,7 @@ import Ldap.Client.Pool as Import
 import Database.Esqueleto.Instances as Import ()
 import Database.Persist.Sql.Instances as Import ()
 import Database.Persist.Sql as Import (SqlReadT,SqlWriteT)
+import Database.Persist.Types.Instances as Import ()
 
 import Numeric.Natural.Instances as Import ()
 import System.Random as Import (Random)
diff --git a/src/Jobs.hs b/src/Jobs.hs
index 04df2686c..9b06c3a1c 100644
--- a/src/Jobs.hs
+++ b/src/Jobs.hs
@@ -59,6 +59,7 @@ import Jobs.Handler.QueueNotification
 import Jobs.Handler.HelpRequest
 import Jobs.Handler.SetLogSettings
 import Jobs.Handler.DistributeCorrections
+import Jobs.Handler.LecturerInvitation
 
   
 data JobQueueException = JInvalid QueuedJobId QueuedJob
diff --git a/src/Jobs/Handler/LecturerInvitation.hs b/src/Jobs/Handler/LecturerInvitation.hs
new file mode 100644
index 000000000..098ccbb61
--- /dev/null
+++ b/src/Jobs/Handler/LecturerInvitation.hs
@@ -0,0 +1,43 @@
+module Jobs.Handler.LecturerInvitation
+  ( dispatchJobLecturerInvitation
+  ) where
+
+import Import
+
+import Text.Hamlet
+
+import qualified Data.HashSet as HashSet
+
+import qualified Data.CaseInsensitive as CI
+
+import Utils.Lens
+
+import Control.Monad.Trans.Maybe
+
+
+dispatchJobLecturerInvitation :: UserId -> LecturerInvitation -> Handler ()
+dispatchJobLecturerInvitation jInviter jLecturerInvitation@LecturerInvitation{..} = do
+  ctx <- runDB . runMaybeT $ do
+    course <- MaybeT $ get lecturerInvitationCourse
+    void . MaybeT $ getByValue jLecturerInvitation
+    user <- MaybeT $ get jInviter
+    return (course, user)
+
+  case ctx of
+    Just (Course{..}, User{..}) -> do
+      let baseRoute = CourseR courseTerm courseSchool courseShorthand $ CLecInviteR lecturerInvitationEmail
+      jwt <- encodeToken =<< bearerToken jInviter (Just $ HashSet.singleton baseRoute) Nothing Nothing Nothing
+      let
+        invitationUrl :: SomeRoute UniWorX
+        invitationUrl = SomeRoute (baseRoute, [(toPathPiece GetBearer, toPathPiece jwt)])
+      invitationUrl' <- toTextUrl invitationUrl
+
+      mailT def $ do
+        _mailTo .= [Address Nothing (CI.original $ lecturerInvitationEmail)]
+        replaceMailHeader "Reply-To" . Just . renderAddress $ Address (Just userDisplayName) (CI.original userEmail)
+        replaceMailHeader "Auto-Submitted" $ Just "auto-generated"
+        setSubjectI $ MsgMailSubjectLecturerInvitation courseTerm courseSchool courseShorthand
+      
+        addPart ($(ihamletFile "templates/mail/lecturerInvitation.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX))
+    Nothing -> runDB .
+      deleteBy $ UniqueLecturerInvitation lecturerInvitationEmail lecturerInvitationCourse
diff --git a/src/Jobs/Types.hs b/src/Jobs/Types.hs
index dc29a9e7a..42ce48824 100644
--- a/src/Jobs/Types.hs
+++ b/src/Jobs/Types.hs
@@ -23,6 +23,9 @@ data Job = JobSendNotification { jRecipient :: UserId, jNotification :: Notifica
                           }
          | JobSetLogSettings { jInstance :: InstanceId, jLogSettings :: LogSettings }
          | JobDistributeCorrections { jSheet :: SheetId }
+         | JobLecturerInvitation { jInviter :: UserId
+                                 , jLecturerInvitation :: LecturerInvitation
+                                 }
   deriving (Eq, Ord, Show, Read, Generic, Typeable)
 data Notification = NotificationSubmissionRated { nSubmission :: SubmissionId }
                   | NotificationSheetActive { nSheet :: SheetId }
diff --git a/src/Model.hs b/src/Model.hs
index 9210edfde..1b16cd35e 100644
--- a/src/Model.hs
+++ b/src/Model.hs
@@ -40,5 +40,7 @@ deriving instance Eq (Unique Sheet)
 -- Automatically generated (i.e. numeric) ids are already taken care of
 deriving instance Binary (Key Term)
 
+instance Hashable LecturerInvitation
+
 submissionRatingDone :: Submission -> Bool
 submissionRatingDone Submission{..} = isJust submissionRatingTime
diff --git a/src/Model/Types.hs b/src/Model/Types.hs
index 21672d9d2..00bda42a1 100644
--- a/src/Model/Types.hs
+++ b/src/Model/Types.hs
@@ -824,6 +824,8 @@ deriveJSON  defaultOptions
   } ''LecturerType
 derivePersistFieldJSON ''LecturerType
 
+instance Hashable LecturerType
+
 
 -- Type synonyms
 
diff --git a/src/Utils/DB.hs b/src/Utils/DB.hs
index cb8b80d4e..9700dd88f 100644
--- a/src/Utils/DB.hs
+++ b/src/Utils/DB.hs
@@ -35,6 +35,12 @@ existsKey :: (PersistEntityBackend record ~ BaseBackend backend, PersistEntity r
   => Key record -> ReaderT backend m Bool
 existsKey = fmap isJust . get -- TODO optimize, so that DB does not deliver entire record
 
+updateBy :: (PersistUniqueRead backend, PersistStoreWrite backend, MonadIO m, PersistRecordBackend record backend )
+  => Unique record -> [Update record] -> ReaderT backend m ()
+updateBy uniq updates = do
+  key <- getKeyBy uniq
+  for_ key $ flip update updates
+
 myReplaceUnique -- Identical to Database.Persist.Class, except for the better type signature (original requires Eq  record which is not needed anyway)
     :: (MonadIO m
        ,Eq (Unique record)
diff --git a/templates/courseLecInvite.hamlet b/templates/courseLecInvite.hamlet
new file mode 100644
index 000000000..408556fb7
--- /dev/null
+++ b/templates/courseLecInvite.hamlet
@@ -0,0 +1,3 @@
+<p>
+  _{MsgCourseLecInviteExplanation}
+^{btnWidget}
diff --git a/templates/mail/lecturerInvitation.hamlet b/templates/mail/lecturerInvitation.hamlet
new file mode 100644
index 000000000..9de17cc39
--- /dev/null
+++ b/templates/mail/lecturerInvitation.hamlet
@@ -0,0 +1,11 @@
+$newline never
+\<!doctype html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+  <body>
+    <p>
+      _{MsgCourseLecInviteExplanation}
+    <p>
+      <a href=#{invitationUrl'}>
+        _{MsgCourseLecturerInvitationAcceptDecline}

From b584e1afb635974d83201dcec6686092416cef9a Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 12 Apr 2019 14:09:15 +0200
Subject: [PATCH 072/238] Fix for new behaviour of library-only

---
 build.sh | 2 +-
 db.sh    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.sh b/build.sh
index 13a8b2490..962ccc1ee 100755
--- a/build.sh
+++ b/build.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-exec -- stack build --fast --flag uniworx:library-only --flag uniworx:dev
+exec -- stack build --fast --flag uniworx:-library-only --flag uniworx:dev
 echo Build task completed.
diff --git a/db.sh b/db.sh
index 8861a2ac4..b05463c3a 100755
--- a/db.sh
+++ b/db.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 # Options: see /test/Database.hs (Main)
-stack build --fast --flag uniworx:library-only --flag uniworx:dev
+stack build --fast --flag uniworx:-library-only --flag uniworx:dev
 stack exec uniworxdb -- $@

From c055645f1170500a5ab71e84cacc581be7116cd0 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 12 Apr 2019 14:24:26 +0200
Subject: [PATCH 073/238] Move form input required-mark closer to caption

---
 static/css/utils/inputs.scss         | 7 +++----
 templates/widgets/aform/aform.hamlet | 5 +++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/static/css/utils/inputs.scss b/static/css/utils/inputs.scss
index db16a94d3..6eaabc448 100644
--- a/static/css/utils/inputs.scss
+++ b/static/css/utils/inputs.scss
@@ -30,22 +30,21 @@
   padding-top: 6px;
 }
 
-.form-group__hint {
+.form-group__label__hint {
   margin-top: 7px;
   color: var(--color-fontsec);
   font-size: 0.9rem;
 }
 
 .form-group--required {
-
-  .form-group__label::after {
+  .form-group__label__caption::after {
     content: ' *';
     color: var(--color-error);
   }
 }
 
 .form-group--optional {
-  .form-group__label::after {
+  .form-group__label__caption::after {
     content: '';
   }
 }
diff --git a/templates/widgets/aform/aform.hamlet b/templates/widgets/aform/aform.hamlet
index 87f40532c..eddce8fdc 100644
--- a/templates/widgets/aform/aform.hamlet
+++ b/templates/widgets/aform/aform.hamlet
@@ -14,9 +14,10 @@ $case formLayout
         <div .form-group :fvRequired view:.form-group--required :not $ fvRequired view:.form-group--optional :isJust $ fvErrors view:.form-group--has-error>
           $if not (Blaze.null $ fvLabel view)
             <label .form-group__label for=#{fvId view}>
-              #{fvLabel view}
+              <span .form-group__label__caption>
+                #{fvLabel view}
               $maybe hint <- fvTooltip view
-                <div .form-group__hint>^{hint}
+                <div .form-group__label__hint>^{hint}
           <div .form-group__input>
             ^{fvInput view}
             $maybe err <- fvErrors view

From 753c660007de308433dc1c7da8bb60ee0a1c94df Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Fri, 12 Apr 2019 21:50:41 +0200
Subject: [PATCH 074/238] rename css classes to more closely follow BEM

---
 static/css/utils/inputs.scss         | 8 ++++----
 templates/widgets/aform/aform.hamlet | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/static/css/utils/inputs.scss b/static/css/utils/inputs.scss
index 6eaabc448..15b8bb47e 100644
--- a/static/css/utils/inputs.scss
+++ b/static/css/utils/inputs.scss
@@ -25,26 +25,26 @@
   color: var(--color-fontsec);
 }
 
-.form-group__label {
+.form-group-label {
   font-weight: 600;
   padding-top: 6px;
 }
 
-.form-group__label__hint {
+.form-group-label__hint {
   margin-top: 7px;
   color: var(--color-fontsec);
   font-size: 0.9rem;
 }
 
 .form-group--required {
-  .form-group__label__caption::after {
+  .form-group-label__caption::after {
     content: ' *';
     color: var(--color-error);
   }
 }
 
 .form-group--optional {
-  .form-group__label__caption::after {
+  .form-group-label__caption::after {
     content: '';
   }
 }
diff --git a/templates/widgets/aform/aform.hamlet b/templates/widgets/aform/aform.hamlet
index eddce8fdc..91ebc2b93 100644
--- a/templates/widgets/aform/aform.hamlet
+++ b/templates/widgets/aform/aform.hamlet
@@ -3,7 +3,7 @@ $newline never
 $case formLayout
   $of FormDBTablePagesize
     $forall view <- fieldViews
-      <label .form-group__label.label-pagesize for=#{fvId view}>#{fvLabel view}
+      <label .form-group-label.label-pagesize for=#{fvId view}>#{fvLabel view}
       ^{fvInput view}
   $of _
     $forall view <- fieldViews
@@ -13,11 +13,11 @@ $case formLayout
       $else
         <div .form-group :fvRequired view:.form-group--required :not $ fvRequired view:.form-group--optional :isJust $ fvErrors view:.form-group--has-error>
           $if not (Blaze.null $ fvLabel view)
-            <label .form-group__label for=#{fvId view}>
-              <span .form-group__label__caption>
+            <label .form-group-label for=#{fvId view}>
+              <span .form-group-label__caption>
                 #{fvLabel view}
               $maybe hint <- fvTooltip view
-                <div .form-group__label__hint>^{hint}
+                <div .form-group-label__hint>^{hint}
           <div .form-group__input>
             ^{fvInput view}
             $maybe err <- fvErrors view

From 2d67bec95657489fa3e3169a80540a17f1d83301 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Fri, 12 Apr 2019 22:01:28 +0200
Subject: [PATCH 075/238] more documentation for I18n JS utility

---
 static/js/services/i18n.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/static/js/services/i18n.js b/static/js/services/i18n.js
index 1e314cab4..730e11935 100644
--- a/static/js/services/i18n.js
+++ b/static/js/services/i18n.js
@@ -1,8 +1,18 @@
 (function() {
   'use strict';
 
-  // Global I18n registry that stores and serves translations.
-  // Each translation must have a unique ID.
+  /**
+   * I18n
+   *
+   * This module stores and serves translated strings, according to the users language settings.
+   *
+   * Translations are stored in /messages/frontend/*.msg.
+   *
+   * To make additions to any of these files accessible to JavaScrip Utilities
+   * you need to add them to the respective *.msg file and to the list of FrontendMessages
+   * in /src/Utils/Frontend/I18n.hs.
+   *
+   */
   window.I18n = (function() {
 
     var translations = {};
@@ -19,7 +29,7 @@
 
     function getTranslation(id) {
       if (!translations[id]) {
-        return '(translation missing for »' + id + '«)';
+        throw new Error('I18N Error: Translation missing for »' + id + '«!');
       }
       return translations[id];
     }

From 1aa54636b6dad5bf98e28fe08828f496003d880d Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Fri, 12 Apr 2019 22:09:59 +0200
Subject: [PATCH 076/238] move massinput js logic to shakespeare widget

---
 static/js/utils/inputs.js                    | 27 --------------------
 templates/widgets/massinput/massinput.julius | 20 +++++++++++++--
 2 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/static/js/utils/inputs.js b/static/js/utils/inputs.js
index d332daaa1..d5d7ee5a1 100644
--- a/static/js/utils/inputs.js
+++ b/static/js/utils/inputs.js
@@ -197,31 +197,4 @@
   if (UtilRegistry) {
     inputUtilities.forEach(UtilRegistry.register);
   }
-
-  // FH: leaving this as it is to be able to understand whats going on
-
-  // Override implicit submit (pressing enter) behaviour to trigger a specified submit button instead of the default
-  window.utils.implicitSubmit = function(input, options) {
-    var submit = options.submit;
-
-    if (!submit) {
-      throw new Error('window.utils.implicitSubmit(input, options) needs to be passed a submit element via options');
-    }
-
-    var doSubmit = function(event) {
-      if (event.keyCode == 13) {
-        event.preventDefault();
-        submit.click();
-      }
-    };
-
-    input.addEventListener('keypress', doSubmit);
-
-    return {
-      scope: input,
-      destroy: function() {
-        input.removeEventListener('keypress', doSubmit);
-      },
-    };
-  }
 })();
diff --git a/templates/widgets/massinput/massinput.julius b/templates/widgets/massinput/massinput.julius
index 219636e59..3c6c2a25b 100644
--- a/templates/widgets/massinput/massinput.julius
+++ b/templates/widgets/massinput/massinput.julius
@@ -6,7 +6,7 @@ document.addEventListener('DOMContentLoaded', function() {
   var cellInputs = Array.from(form.querySelectorAll('.massinput--cell input:not([type=hidden])'));
 
   cellInputs.forEach(function(input) {
-    window.utils.setup('implicitSubmit', input, { submit: formSubmit });
+      makeImplicitSubmit(input, formSubmit);
   });
 
 
@@ -15,7 +15,23 @@ document.addEventListener('DOMContentLoaded', function() {
     var addInputs = Array.from(wrapper.querySelectorAll('input:not([type=hidden]):not(.btn-mass-input-add)'));
 
     addInputs.forEach(function(input) {
-      window.utils.setup('implicitSubmit', input, { submit: addSubmit });
+      makeImplicitSubmit(input, addSubmit);
     });
   });
+
+  // Override implicit submit (pressing enter) behaviour to trigger a specified submit button instead of the default
+  function makeImplicitSubmit(input, submit) {
+    if (!submit) {
+      throw new Error('implicitSubmit(input, options) needs to be passed a submit element via options');
+    }
+
+    var doSubmit = function(event) {
+      if (event.keyCode == 13) {
+        event.preventDefault();
+        submit.click();
+      }
+    };
+
+    input.addEventListener('keypress', doSubmit);
+  }
 });

From 5b6c35fedda596674d8a8f483fd2b698f0ee00c3 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 15 Apr 2019 16:41:14 +0200
Subject: [PATCH 077/238] Cleanup

---
 messages/uniworx/de.msg                       |  4 +
 routes                                        |  2 +-
 src/Data/Set/Instances.hs                     | 14 +++
 src/Handler/Utils/Communication.hs            | 93 +++++++++++--------
 src/Handler/Utils/Form.hs                     | 86 ++++++-----------
 src/Handler/Utils/Form/MassInput.hs           |  3 +-
 src/Handler/Utils/Rating.hs                   |  2 -
 src/Import/NoFoundation.hs                    |  1 +
 src/Jobs/Types.hs                             | 21 ++++-
 src/Utils.hs                                  |  2 +-
 src/Utils/Lens.hs                             |  4 +-
 .../multi-action/multi-action-collect.hamlet  |  4 -
 12 files changed, 127 insertions(+), 109 deletions(-)
 create mode 100644 src/Data/Set/Instances.hs
 delete mode 100644 templates/widgets/multi-action/multi-action-collect.hamlet

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index b36af2378..71ac1bcd6 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -736,3 +736,7 @@ CommRecipients: Empfänger
 
 AddRecipientGroups: Empfängergruppen
 AddRecipientCustom: Weitere Empfänger
+
+RGCourseParticipants: Kursteilnehmer
+RGCourseLecturers: Kursverwalter
+RGCourseCorrectors: Korrektoren
\ No newline at end of file
diff --git a/routes b/routes
index 391821721..d6b6e9236 100644
--- a/routes
+++ b/routes
@@ -78,7 +78,7 @@
   /users                      CUsersR         GET POST
   /users/#CryptoUUIDUser      CUserR          GET POST        !lecturerANDparticipant
   /correctors                 CHiWisR         GET
-  /mail                       CCommR          GET POST
+  /communication              CCommR          GET POST
   /notes                      CNotesR         GET POST        !corrector
   /subs                       CCorrectionsR   GET POST
   /ex                         SheetListR      GET             !registered !materials !corrector
diff --git a/src/Data/Set/Instances.hs b/src/Data/Set/Instances.hs
new file mode 100644
index 000000000..9dc1c48cd
--- /dev/null
+++ b/src/Data/Set/Instances.hs
@@ -0,0 +1,14 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Data.Set.Instances
+  (
+  ) where
+
+import ClassyPrelude
+
+import Data.Set (Set)
+import qualified Data.Set as Set
+
+
+instance (Ord a, Hashable a) => Hashable (Set a) where
+  hashWithSalt s xs = hashWithSalt s $ Set.toAscList xs
diff --git a/src/Handler/Utils/Communication.hs b/src/Handler/Utils/Communication.hs
index 7e7d24522..fc07e9098 100644
--- a/src/Handler/Utils/Communication.hs
+++ b/src/Handler/Utils/Communication.hs
@@ -1,9 +1,18 @@
 module Handler.Utils.Communication where
 
 import Import
+import Handler.Utils.Form
+import Handler.Utils.Form.MassInput
+import Utils.Lens
+
+import Jobs.Types
 
 import qualified Database.Esqueleto as E
 
+import qualified Data.Map as Map
+import qualified Data.Set as Set
+  
+
 data RecipientGroup = RGCourseParticipants | RGCourseLecturers | RGCourseCorrectors
   deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
 
@@ -13,17 +22,19 @@ nullaryPathPiece ''RecipientGroup $ camelToPathPiece' 1
 embedRenderMessage ''UniWorX ''RecipientGroup id
 
 
-data RecipientAddOptions
+data RecipientAddOption
   = AddRecipientGroups
   | AddRecipientGroup RecipientGroup
   | AddRecipientCustom
   deriving (Eq, Ord, Read, Show, Generic, Typeable)
 
-instance Universe RecipientAddOptions where
-  universe = AddRecipientGroups:
-             [AddRecipientGroup g | g <- universe]
-             ++ [AddRecipientCustom]
-instance Finite RecipientAddOptions
+instance Universe RecipientAddOption where
+  universe = concat
+    [ pure AddRecipientGroups
+    , [ AddRecipientGroup g | g <- universe ]
+    , pure AddRecipientCustom
+    ]
+instance Finite RecipientAddOption
 
 instance PathPiece RecipientAddOption where
   toPathPiece AddRecipientGroups    = "recipient-groups"
@@ -37,19 +48,17 @@ instance RenderMessage UniWorX RecipientAddOption where
     AddRecipientGroups  -> renderMessage' MsgAddRecipientGroups
     AddRecipientCustom  -> renderMessage' MsgAddRecipientCustom
     AddRecipientGroup g -> renderMessage' g
-    where renderMessage' = renderMessage foundation ls
+    where
+      renderMessage' :: forall msg. RenderMessage UniWorX msg => msg -> Text
+      renderMessage' = renderMessage foundation ls
 
 
-data CommunicationRoute = CommuncationRoute
+data CommunicationRoute = CommunicationRoute
   { crRecipients :: Map RecipientGroup (E.SqlQuery (E.SqlExpr (Entity User)))
-  , crJob        :: MailT Handler () -> Handler Job
+  , crJob        :: Communication -> DB Job
   }
 
-data Communication = Communication
- { cRecipients :: Set (Either Email UserId)
- , cSubject :: Text
- }
-
+-- `Communication` is defined in `Jobs.Types`
 
 
 commR :: CommunicationRoute -> Handler Html
@@ -57,32 +66,40 @@ commR CommunicationRoute{..} =  do
   MsgRenderer mr <- getMsgRenderer
 
   suggestedRecipients' <- runDB $ traverse E.select crRecipients
-  suggestedRecipients <- forM suggestedRecipients' . mapM $ \ent@(Entity rid _) -> (,) <$> encrypt rid <*> pure ent
+  suggestedRecipients <- forM suggestedRecipients' . mapM $ \ent@(Entity rid _) -> (,) <$> (encrypt rid :: Handler CryptoUUIDUser) <*> pure ent
 
-  let recipientAForm :: AForm (Set (Either Email UserId))
-      recipientAForm = postProcess <$> massInputA MassInput{..} (fslI MsgCommRecipients) True Nothing
-        where miAdd _ _ nudge submitButton = Just $ \csrf -> do
-                let addOptions = Map.fromList . concat $
-                      [ pure (AddRecipientGroups, apreq (selectField . return $ mkOptionsList
-                              [ Option (mr g) (Set.fromList $ map (Right . entityKey . snd) recs) (toPathPiece g) | (g,recs) <- Map.toList suggestedRecipients ]
-                          ) )
-                      , do
-                          (g,recs) <- Map.toList suggestedRecipients
-                          return ( AddRecipientGroup g
-                                 , apreq (selectField . return $ mkOptionsList
-                                     [ Option userDisplayName (Right rid) (toPathPiece cid) | (cid, Entity rid User{..}) <- recs ]
-                                 )
-                      -- , pure (AddRecipientCustom, _ )
-                      ]
-
-
-                multiAction ()
-              miCell
-              miDelete
-              miAllowAdd
-              miButtonAction
+  let recipientAForm :: AForm Handler (Set (Either UserEmail UserId))
+      recipientAForm = postProcess <$> massInputA MassInput{..} (fslI MsgCommRecipients) True (Nothing {- TODO -})
+        where
+          miAdd _ _ nudge submitView = Just $ \csrf -> do
+            let addOptions :: Map RecipientAddOption (AForm Handler (Set (Either UserEmail UserId)))
+                addOptions = Map.fromList . concat $
+                  [ pure ( AddRecipientGroups
+                         , Set.unions <$> apreq (multiSelectField . return $ mkOptionList
+                                                   [ Option (mr g) (Set.fromList $ map (Right . entityKey . snd) recs) (toPathPiece g) | (g,recs) <- Map.toList suggestedRecipients ]
+                                                ) ("" & addName (nudge . toPathPiece $ AddRecipientGroups)) Nothing
+                         )
+                  , do
+                      (g,recs) <- Map.toList suggestedRecipients
+                      return ( AddRecipientGroup g
+                             , Set.unions <$> apreq (multiSelectField . return $ mkOptionList
+                                                       [ Option userDisplayName (Set.singleton $ Right rid) (toPathPiece cid) | (cid, Entity rid User{..}) <- recs ]
+                                                    ) ("" & addName (nudge . toPathPiece $ AddRecipientGroup g)) Nothing
+                             )
+                  -- , pure (AddRecipientCustom, _ )
+                  ]
+            (addRes, addWdgt) <- multiActionM addOptions ("" & addName (nudge "select")) Nothing csrf
+            error "miAdd" :: MForm Handler (FormResult (Map ListPosition (Either UserEmail UserId) -> FormResult (Map ListPosition (Either UserEmail UserId))), Widget)
+          miCell = error "miCell"
+          miDelete :: ListLength -> ListPosition -> MaybeT (MForm Handler) (Map ListPosition ListPosition) -- This type signature is needed, so GHC can infer the type of @MassInput{..}@, above
+          miDelete = error "miDelete"
+          miAllowAdd = error "miAllowAdd"
+          miButtonAction = error "miButtonAction"
+          postProcess :: Map ListPosition (Either UserEmail UserId, ()) -> Set (Either UserEmail UserId)
+          postProcess = Set.fromList . map fst . Map.elems
 
   runFormPost . identifyForm FIDCommunication $ renderAForm FormStandard $ Communication
     <$> recipientAForm
-    <*> areq textField (fslI MsgCommSubject) Nothing
+    <*> aopt textField (fslI MsgCommSubject) Nothing
 
+  error "commR"
diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index 932044f62..61f4b5f1a 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -377,7 +377,7 @@ nullaryPathPiece ''SheetGroup' (camelToPathPiece . dropSuffix "'")
 embedRenderMessage ''UniWorX ''SheetGroup' (("SheetGroup" <>) . dropSuffix "'")
 
 sheetGradingAFormReq :: FieldSettings UniWorX -> Maybe SheetGrading -> AForm Handler SheetGrading
-sheetGradingAFormReq fs template = multiActionA fs selOptions (classify' <$> template)
+sheetGradingAFormReq fs template = multiActionA selOptions fs (classify' <$> template)
   where
     selOptions = Map.fromList
       [ ( Points',     Points     <$> maxPointsReq )
@@ -395,7 +395,7 @@ sheetGradingAFormReq fs template = multiActionA fs selOptions (classify' <$> tem
 
 
 sheetTypeAFormReq :: FieldSettings UniWorX -> Maybe SheetType -> AForm Handler SheetType
-sheetTypeAFormReq fs template = multiActionA fs selOptions (classify' <$> template)
+sheetTypeAFormReq fs template = multiActionA selOptions fs (classify' <$> template)
   where
     selOptions = Map.fromList
       [ ( Normal', Normal <$> gradingReq )
@@ -414,8 +414,8 @@ sheetTypeAFormReq fs template = multiActionA fs selOptions (classify' <$> templa
       NotGraded -> NotGraded'
 
 sheetGroupAFormReq :: FieldSettings UniWorX -> Maybe SheetGroup -> AForm Handler SheetGroup
-sheetGroupAFormReq FieldSettings{..} template = formToAForm $ do
-  let
+sheetGroupAFormReq fs template = multiActionA selOptions fs (classify' <$> template)
+  where
     selOptions = Map.fromList
       [ ( Arbitrary', Arbitrary
           <$> apreq (natField "Gruppengröße") (fslI MsgSheetGroupMaxGroupsize & noValidate) (preview _maxParticipants =<< template)
@@ -423,25 +423,6 @@ sheetGroupAFormReq FieldSettings{..} template = formToAForm $ do
       , ( RegisteredGroups', pure RegisteredGroups )
       , ( NoGroups', pure NoGroups )
       ]
-  (res, selView) <- multiAction selOptions (classify' <$> template)
-
-  fvId <- maybe newIdent return fsId
-  MsgRenderer mr <- getMsgRenderer
-
-  return (res,
-    [ FieldView
-      { fvLabel = toHtml $ mr fsLabel
-      , fvTooltip = toHtml . mr <$> fsTooltip
-      , fvId
-      , fvInput = selView
-      , fvErrors = case res of
-          FormFailure [e] -> Just $ toHtml e
-          _ -> Nothing
-      , fvRequired = True
-      }
-    ])
-
-  where
     classify' :: SheetGroup -> SheetGroup'
     classify' = \case
       Arbitrary _ -> Arbitrary'
@@ -621,48 +602,41 @@ optionsPersistCryptoId filts ords toDisplay = fmap mkOptionList $ do
                  , optionExternalValue = toPathPiece (cId :: CryptoID UUID (Key a))
                  }) cPairs
 
-multiAction :: (RenderMessage UniWorX action, PathPiece action, Ord action, Eq action)
+multiAction :: forall action a.
+               ( RenderMessage UniWorX action, PathPiece action, Ord action, Eq action )
             => Map action (AForm (HandlerT UniWorX IO) a)
+            -> FieldSettings UniWorX
             -> Maybe action
-            -> MForm (HandlerT UniWorX IO) (FormResult a, Widget)
-multiAction acts defAction = do
+            -> (Html -> MForm Handler (FormResult a, [FieldView UniWorX]))
+multiAction acts fs@FieldSettings{..} defAction csrf = do
   mr <- getMessageRender
+
   let
     options = OptionList [ Option (mr a) a (toPathPiece a) | a <- Map.keys acts ] fromPathPiece
-  (actionRes, actionView) <- mreq (selectField $ return options) "" defAction
+  (actionRes, actionView) <- mreq (selectField $ return options) fs defAction
   results <- mapM (fmap (over _2 ($ [])) . aFormToForm) acts
-  let mToWidget (_, []) = return Nothing
-      mToWidget aForm = Just . snd <$> renderAForm FormStandard (formToAForm $ return aForm) mempty
-  widgets <- mapM mToWidget results
-  let actionWidgets = Map.foldrWithKey accWidget [] widgets
-      accWidget _act Nothing = id
-      accWidget act (Just w) = cons $(widgetFile "widgets/multi-action/multi-action")
-      actionResults = Map.map fst results
-  return ((actionResults Map.!) =<< actionRes, $(widgetFile "widgets/multi-action/multi-action-collect"))
+
+  let actionResults = view _1 <$> results
+      actionViews = Map.foldrWithKey accViews [] results
+
+      accViews :: forall b. action -> (b, [FieldView UniWorX]) -> [FieldView UniWorX] -> [FieldView UniWorX]
+      accViews act = flip mappend . over (mapped . _fvInput) (\w -> $(widgetFile "widgets/multi-action/multi-action")) . snd
+
+  return ((actionResults Map.!) =<< actionRes, over _fvInput (mappend $ toWidget csrf) actionView : actionViews)
 
 multiActionA :: (RenderMessage UniWorX action, PathPiece action, Ord action, Eq action)
-            => FieldSettings UniWorX
-            -> Map action (AForm (HandlerT UniWorX IO) a)
-            -> Maybe action
-            -> AForm (HandlerT UniWorX IO) a
-multiActionA FieldSettings{..} acts defAction = formToAForm $ do
-  (res, selView) <- multiAction acts defAction
+             => Map action (AForm (HandlerT UniWorX IO) a)
+             -> FieldSettings UniWorX
+             -> Maybe action
+             -> AForm Handler a
+multiActionA acts fSettings defAction = formToAForm $ multiAction acts fSettings defAction mempty
 
-  fvId <- maybe newIdent return fsId
-  MsgRenderer mr <- getMsgRenderer
-
-  return (res,
-    [ FieldView
-      { fvLabel = toHtml $ mr fsLabel
-      , fvTooltip = toHtml . mr <$> fsTooltip
-      , fvId
-      , fvInput = selView
-      , fvErrors = case res of
-          FormFailure [e] -> Just $ toHtml e
-          _ -> Nothing
-      , fvRequired = True
-      }
-    ])
+multiActionM :: (RenderMessage UniWorX action, PathPiece action, Ord action, Eq action)
+             => Map action (AForm (HandlerT UniWorX IO) a)
+             -> FieldSettings UniWorX
+             -> Maybe action
+             -> (Html -> MForm Handler (FormResult a, Widget))
+multiActionM acts fSettings defAction = renderAForm FormStandard $ multiActionA acts fSettings defAction
 
 formResultModal :: (MonadHandler m, RedirectUrl (HandlerSite m) route) => FormResult a -> route -> (a -> WriterT [Message] m ()) -> m ()
 formResultModal res finalDest handler = maybeT_ $ do
diff --git a/src/Handler/Utils/Form/MassInput.hs b/src/Handler/Utils/Form/MassInput.hs
index 6f5e9f6dc..41402396f 100644
--- a/src/Handler/Utils/Form/MassInput.hs
+++ b/src/Handler/Utils/Form/MassInput.hs
@@ -29,7 +29,6 @@ import qualified Data.Map as Map
 import qualified Data.Foldable as Fold
 import Data.List (genericLength, genericIndex, iterate)
 
-import Control.Monad.Trans.Maybe
 import Control.Monad.Reader.Class (MonadReader(local))
 
 
@@ -407,4 +406,4 @@ massInputA :: forall handler cellData cellResult liveliness.
           -> Maybe (Map (BoxCoord liveliness) (cellData, cellResult))
           -> AForm handler (Map (BoxCoord liveliness) (cellData, cellResult))
 massInputA  mi fs fvRequired initialResult = formToAForm $
-  over _2 pure <$> massInput mi fs fvRequired initialResult mempty
\ No newline at end of file
+  over _2 pure <$> massInput mi fs fvRequired initialResult mempty
diff --git a/src/Handler/Utils/Rating.hs b/src/Handler/Utils/Rating.hs
index fc4e88574..2e980312f 100644
--- a/src/Handler/Utils/Rating.hs
+++ b/src/Handler/Utils/Rating.hs
@@ -18,8 +18,6 @@ import Import
 
 import Text.PrettyPrint.Leijen.Text hiding ((<$>))
 
-import Control.Monad.Trans.Maybe
-
 import qualified Data.Text as Text
 import qualified Data.Text.Encoding as Text
 import Data.Text.Encoding.Error (UnicodeException(..))
diff --git a/src/Import/NoFoundation.hs b/src/Import/NoFoundation.hs
index 457682087..1fb803a6f 100644
--- a/src/Import/NoFoundation.hs
+++ b/src/Import/NoFoundation.hs
@@ -47,6 +47,7 @@ import Data.Text.Encoding.Error as Import(UnicodeException(..))
 import Data.Semigroup         as Import (Semigroup)
 import Data.Monoid            as Import (Last(..), First(..))
 import Data.Monoid.Instances  as Import ()
+import Data.Set.Instances     as Import ()
 
 import Data.Binary            as Import (Binary)
 
diff --git a/src/Jobs/Types.hs b/src/Jobs/Types.hs
index 151d0e404..7e6019361 100644
--- a/src/Jobs/Types.hs
+++ b/src/Jobs/Types.hs
@@ -1,5 +1,6 @@
 module Jobs.Types
   ( Job(..), Notification(..)
+  , Communication(..)
   , JobCtl(..)
   , JobContext(..)
   ) where
@@ -34,20 +35,32 @@ instance Hashable Job
 instance Hashable Notification
 
 deriveJSON defaultOptions
-  { constructorTagModifier = intercalate "-" . map toLower . drop 1 . splitCamel
-  , fieldLabelModifier = intercalate "-" . map toLower . drop 1 . splitCamel
+  { constructorTagModifier = camelToPathPiece' 1
+  , fieldLabelModifier = camelToPathPiece' 1
   , tagSingleConstructors = True
   , sumEncoding = TaggedObject "job" "data"
   } ''Job
 
 deriveJSON defaultOptions
-  { constructorTagModifier = intercalate "-" . map toLower . drop 1 . splitCamel
-  , fieldLabelModifier = intercalate "-" . map toLower . drop 1 . splitCamel
+  { constructorTagModifier = camelToPathPiece' 1
+  , fieldLabelModifier = camelToPathPiece' 1
   , tagSingleConstructors = True
   , sumEncoding = TaggedObject "notification" "data"
   } ''Notification
 
 
+data Communication = Communication
+ { cRecipients :: Set (Either UserEmail UserId)
+ , cSubject :: Maybe Text
+ } deriving (Eq, Ord, Read, Show, Generic, Typeable)
+
+instance Hashable Communication
+
+deriveJSON defaultOptions
+  { fieldLabelModifier = camelToPathPiece' 1
+  } ''Communication
+
+
 data JobCtl = JobCtlFlush
             | JobCtlPerform QueuedJobId
             | JobCtlDetermineCrontab
diff --git a/src/Utils.hs b/src/Utils.hs
index 88adf17e4..a79e0a33b 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -45,7 +45,7 @@ import Control.Lens as Utils (none)
 import Control.Arrow as Utils ((>>>))
 import Control.Monad.Trans.Except (ExceptT(..), throwE, runExceptT)
 import Control.Monad.Except (MonadError(..))
-import Control.Monad.Trans.Maybe (MaybeT(..))
+import Control.Monad.Trans.Maybe as Utils (MaybeT(..))
 import Control.Monad.Catch hiding (throwM)
 
 
diff --git a/src/Utils/Lens.hs b/src/Utils/Lens.hs
index 0abc9a8ee..342f6a08f 100644
--- a/src/Utils/Lens.hs
+++ b/src/Utils/Lens.hs
@@ -1,7 +1,7 @@
 module Utils.Lens ( module Utils.Lens ) where
 
 import Import.NoFoundation
-import Control.Lens as Utils.Lens hiding ((<.>))
+import Control.Lens as Utils.Lens hiding ((<.>), universe)
 import Control.Lens.Extras as Utils.Lens (is)
 import Utils.Lens.TH as Utils.Lens (makeLenses_, makeClassyFor_)
 
@@ -90,6 +90,8 @@ makeLenses_ ''StudyTerms
 
 makeLenses_ ''StudyTermCandidate
 
+makeLenses_ ''FieldView
+
 
 -- makeClassy_ ''Load
 
diff --git a/templates/widgets/multi-action/multi-action-collect.hamlet b/templates/widgets/multi-action/multi-action-collect.hamlet
deleted file mode 100644
index 480c54a63..000000000
--- a/templates/widgets/multi-action/multi-action-collect.hamlet
+++ /dev/null
@@ -1,4 +0,0 @@
-^{fvInput actionView}
-
-$forall w <- actionWidgets
-  ^{w}

From fc8f37882eca71da6c9f1a939d5d974498c65d1a Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Mon, 15 Apr 2019 21:13:18 +0200
Subject: [PATCH 078/238] fix scoped js util initialization

---
 static/js/services/utilRegistry.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/static/js/services/utilRegistry.js b/static/js/services/utilRegistry.js
index ca12f3d28..ada1f7d0f 100644
--- a/static/js/services/utilRegistry.js
+++ b/static/js/services/utilRegistry.js
@@ -62,7 +62,7 @@
         console.log('setting up util', { util });
       }
 
-      scope = scope || document;
+      scope = scope || document.body;
 
       if (util && typeof util.setup === 'function') {
         const elements = _findUtilElements(util, scope);
@@ -96,6 +96,9 @@
     }
 
     function _findUtilElements(util, scope) {
+      if (scope && scope.matches(util.selector)) {
+        return [scope];
+      }
       return Array.from(scope.querySelectorAll(util.selector));
     }
 

From aee5b91b8f28920b15da022ea73cea06c7cfcd30 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Tue, 16 Apr 2019 11:06:17 +0200
Subject: [PATCH 079/238] minor filter message clarification

---
 messages/uniworx/de.msg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 468a3c484..980015007 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -254,7 +254,7 @@ CorByProportionOnly proportion@Rational: #{display proportion} Anteile
 CorByProportionIncludingTutorial proportion@Rational: #{display proportion} Anteile - Tutorium
 CorByProportionExcludingTutorial proportion@Rational: #{display proportion} Anteile + Tutorium
 
-RowCount count@Int64: #{display count} #{pluralDE count "Eintrag" "Einträge"} insgesamt
+RowCount count@Int64: #{display count} #{pluralDE count "Eintrag" "Einträge"} nach Filter
 DeleteRow: Zeile entfernen
 ProportionNegative: Anteile dürfen nicht negativ sein
 CorrectorUpdated: Korrektor erfolgreich aktualisiert

From dd1cd6650f76955bacf0791dd88b152b9ac4de96 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Tue, 16 Apr 2019 15:03:37 +0200
Subject: [PATCH 080/238] communication prototype

---
 messages/uniworx/de.msg            |  5 +++
 src/Foundation.hs                  |  5 ++-
 src/Handler/Corrections.hs         |  2 +-
 src/Handler/Course.hs              | 33 +++++++++++++++-
 src/Handler/Help.hs                |  2 +-
 src/Handler/SystemMessage.hs       |  2 +-
 src/Handler/Utils/Communication.hs | 60 +++++++++++++++++++++++-------
 7 files changed, 89 insertions(+), 20 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 44fad53b3..6f05189db 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -114,6 +114,7 @@ CourseUserNoteSaved: Notizänderungen gespeichert
 CourseUserNoteDeleted: Teilnehmernotiz gelöscht
 CourseUserDeregister: Abmelden
 CourseUsersDeregistered count@Int64: #{show count} Teilnehmer abgemeldet
+CourseUserSendMail: Mitteilung verschicken
 
 CourseLecturers: Kursverwalter
 CourseLecturer: Dozent
@@ -738,6 +739,10 @@ NavigationFavourites: Favoriten
 
 CommSubject: Betreff
 CommRecipients: Empfänger
+CommDuplicateRecipients recipients@TextList: #{pluralDE (length recipients) "Doppelter" "Doppelte"} Empfänger: #{intercalate ", " recipients}
+CommSuccess n@Int: Nachricht wurde an #{tshow n} Empfänger versandt
+
+CommCourseHeading: Kursmitteilung
 
 AddRecipientGroups: Empfängergruppen
 AddRecipientCustom: Weitere Empfänger
diff --git a/src/Foundation.hs b/src/Foundation.hs
index f85e69e54..d7b14c2f9 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -173,8 +173,9 @@ noneOneMoreDE num noneText singularForm pluralForm
   | num == 1  = singularForm
   | otherwise = pluralForm
 
--- Convenience Type for Messages
-type IntMaybe = Maybe Int -- Yesod messages cannot deal with compound type identifiers
+-- Convenience Type for Messages, since Yesod messages cannot deal with compound type identifiers
+type IntMaybe  = Maybe Int
+type TextList  = [Text]
 
 -- | Convenience function for i18n messages definitions
 maybeDisplay :: DisplayAble m => Text -> Maybe m -> Text  -> Text
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 42c21d62a..b82a85ea0 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -350,7 +350,7 @@ correctionsR whereClause displayColumns dbtFilterUI psValidator actions = do
       , dbParamsFormAttrs = []
       , dbParamsFormSubmit = FormSubmit
       , dbParamsFormAdditional = \frag -> do
-          (actionRes, action) <- multiAction actions Nothing
+          (actionRes, action) <- multiActionM actions "" Nothing mempty
           return ((, mempty) . Last . Just <$> actionRes, toWidget frag <> action)
       , dbParamsFormEvaluate = liftHandlerT . runFormPost
       , dbParamsFormResult = _1
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 00b51056f..0a780b9ad 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -9,6 +9,7 @@ import Utils.Form
 -- import Utils.DB
 import Handler.Utils
 import Handler.Utils.Course
+import Handler.Utils.Communication
 import Handler.Utils.Form.MassInput
 import Handler.Utils.Delete
 import Handler.Utils.Database
@@ -930,7 +931,7 @@ postCUsersR tid ssh csh = do
   formResult participantRes $ \case
     (CourseUserSendMail, selectedUsers) -> do
         cids <- traverse encrypt $ Set.toList selectedUsers :: Handler [CryptoUUIDUser]
-        redirect (CourseR tid ssh csh CCommR, [(toPathPiece GetRecipient, toPathPiece cid) | cid <- cids])
+        redirect (CourseR tid ssh csh CCommR, [(toPathPiece GetRecipient, toPathPiece cID) | cID <- cids])
     (CourseUserDeregister,selectedUsers) -> do
         nrDel <- runDB $ deleteWhereCount
           [ CourseParticipantCourse ==. cid
@@ -1047,4 +1048,32 @@ postCNotesR = error "CNotesR: Not implemented"
 
 getCCommR, postCCommR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getCCommR = postCCommR
-postCCommR tid ssh csh = commR _hole
+postCCommR tid ssh csh = do
+  cid  <- runDB . getKeyBy404 $ TermSchoolCourseShort tid ssh csh
+
+  commR CommunicationRoute
+    { crHeading    = SomeMessage . prependCourseTitle tid ssh csh $ SomeMessage MsgCommCourseHeading
+    , crUltDest    = SomeRoute $ CourseR tid ssh csh CCommR
+    , crJob        = error "job undefined"
+    , crRecipients = Map.fromList
+      [ ( RGCourseParticipants
+        , E.from $ \(user `E.InnerJoin` participant) -> do
+            E.on $ user E.^. UserId E.==. participant E.^. CourseParticipantUser
+            E.where_ $ participant E.^. CourseParticipantCourse E.==. E.val cid
+            return user
+        )
+      , ( RGCourseLecturers
+        , E.from $ \(user `E.InnerJoin` lecturer) -> do
+            E.on $ user E.^. UserId E.==. lecturer E.^. LecturerUser
+            E.where_ $ lecturer E.^. LecturerCourse E.==. E.val cid
+            return user
+        )
+      , ( RGCourseCorrectors
+        , E.from $ \user -> do
+            E.where_ $ E.exists $ E.from $ \(sheet `E.InnerJoin` corrector) -> do
+              E.on $ sheet E.^. SheetId E.==. corrector E.^. SheetCorrectorSheet
+              E.where_ $ sheet E.^. SheetCourse E.==. E.val cid
+            return user
+        )
+      ]
+    }
diff --git a/src/Handler/Help.hs b/src/Handler/Help.hs
index d29b7f214..788310888 100644
--- a/src/Handler/Help.hs
+++ b/src/Handler/Help.hs
@@ -25,7 +25,7 @@ data HelpForm = HelpForm
 helpForm :: (forall msg. RenderMessage UniWorX msg => msg -> Text) -> Maybe (Route UniWorX) -> Maybe UserId -> AForm _ HelpForm
 helpForm mr mReferer mUid = HelpForm
     <$> aopt routeField (fslI MsgHelpProblemPage & inputReadonly) (Just <$> mReferer)
-    <*> multiActionA (fslI MsgHelpAnswer) identActions (HIUser <$ mUid)
+    <*> multiActionA identActions (fslI MsgHelpAnswer) (HIUser <$ mUid)
     <*> aopt textField (fslpI MsgHelpSubject $ mr MsgHelpSubject) Nothing
     <*> (unTextarea <$> areq textareaField (fslpI MsgHelpRequest $ mr MsgHelpRequest) Nothing)
   where
diff --git a/src/Handler/SystemMessage.hs b/src/Handler/SystemMessage.hs
index c80ab32c0..8228136d4 100644
--- a/src/Handler/SystemMessage.hs
+++ b/src/Handler/SystemMessage.hs
@@ -217,7 +217,7 @@ postMessageListR = do
                 , (SMActivate, SMDActivate <$> aopt utcTimeField (fslI MsgSystemMessageTimestamp) (Just $ Just now))
                 , (SMDeactivate, SMDDeactivate <$> aopt utcTimeField (fslI MsgSystemMessageTimestamp) (Just Nothing))
                 ]
-          (actionRes, action) <- multiAction actions (Just SMActivate)
+          (actionRes, action) <- multiActionM actions "" (Just SMActivate) mempty
           return ((, mempty) . Last . Just <$> actionRes, toWidget frag <> action)
       , dbParamsFormEvaluate = liftHandlerT . runFormPost
       , dbParamsFormResult = id
diff --git a/src/Handler/Utils/Communication.hs b/src/Handler/Utils/Communication.hs
index fc07e9098..873781da7 100644
--- a/src/Handler/Utils/Communication.hs
+++ b/src/Handler/Utils/Communication.hs
@@ -1,17 +1,18 @@
 module Handler.Utils.Communication where
 
 import Import
-import Handler.Utils.Form
+import Handler.Utils
 import Handler.Utils.Form.MassInput
 import Utils.Lens
 
-import Jobs.Types
+import Jobs.Queue
+import Control.Monad.Trans.Reader (mapReaderT)
 
 import qualified Database.Esqueleto as E
-
+import qualified Data.CaseInsensitive as CI
 import qualified Data.Map as Map
 import qualified Data.Set as Set
-  
+
 
 data RecipientGroup = RGCourseParticipants | RGCourseLecturers | RGCourseCorrectors
   deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
@@ -56,14 +57,16 @@ instance RenderMessage UniWorX RecipientAddOption where
 data CommunicationRoute = CommunicationRoute
   { crRecipients :: Map RecipientGroup (E.SqlQuery (E.SqlExpr (Entity User)))
   , crJob        :: Communication -> DB Job
+  , crHeading    :: SomeMessage UniWorX
+  , crUltDest    :: SomeRoute UniWorX
   }
-
 -- `Communication` is defined in `Jobs.Types`
 
 
 commR :: CommunicationRoute -> Handler Html
 commR CommunicationRoute{..} =  do
   MsgRenderer mr <- getMsgRenderer
+  mbCurrentRoute <- getCurrentRoute
 
   suggestedRecipients' <- runDB $ traverse E.select crRecipients
   suggestedRecipients <- forM suggestedRecipients' . mapM $ \ent@(Entity rid _) -> (,) <$> (encrypt rid :: Handler CryptoUUIDUser) <*> pure ent
@@ -86,20 +89,51 @@ commR CommunicationRoute{..} =  do
                                                        [ Option userDisplayName (Set.singleton $ Right rid) (toPathPiece cid) | (cid, Entity rid User{..}) <- recs ]
                                                     ) ("" & addName (nudge . toPathPiece $ AddRecipientGroup g)) Nothing
                              )
-                  -- , pure (AddRecipientCustom, _ )
+                  , pure ( AddRecipientCustom
+                         , Set.fromList . map (Left . CI.mk) <$> apreq multiEmailField ("" & addName (nudge $ toPathPiece AddRecipientCustom)) Nothing )
                   ]
             (addRes, addWdgt) <- multiActionM addOptions ("" & addName (nudge "select")) Nothing csrf
-            error "miAdd" :: MForm Handler (FormResult (Map ListPosition (Either UserEmail UserId) -> FormResult (Map ListPosition (Either UserEmail UserId))), Widget)
-          miCell = error "miCell"
+            -- lookupUserDisplayName :: UserId -> UserDisplayName
+            lookupUserDisplayName <- liftHandlerT . runDB $ do
+                let uids = toListOf (_FormSuccess . folded . _Right) addRes
+                names <- forM uids getJustEntity
+                return $ \uid -> case filter ((== uid) . entityKey) names of
+                  [Entity _ User{..}] -> userDisplayName
+                  _other              -> error "UserId lookpup failed"
+            let addRes'  = addRes <&> \newSet oldMap -> if
+                              | collisions <- newSet `Set.intersection` Set.fromList (Map.elems oldMap)
+                              , not $ Set.null collisions ->
+                                  FormFailure [ mr . MsgCommDuplicateRecipients . map (either CI.original lookupUserDisplayName) $ Set.toList collisions ]
+                              | otherwise -> FormSuccess . Map.fromList . zip [maybe 0 (succ . fst) (Map.lookupMax oldMap)..] $ Set.toList newSet
+
+                addWdgt' = mconcat [ toWidget csrf, addWdgt, fvInput submitView ]
+            return (addRes', addWdgt')
+
+          miCell _ (Left email) _ _nudge csrf
+            = return (pure (), toWidget csrf <> toWidget (mailtoHtml email))
+          miCell _ (Right rid) _ _nudge csrf = do
+            User{..} <- liftHandlerT . runDB $ getJust rid
+            return (pure (), toWidget csrf <> nameEmailWidget userEmail userDisplayName userSurname)
           miDelete :: ListLength -> ListPosition -> MaybeT (MForm Handler) (Map ListPosition ListPosition) -- This type signature is needed, so GHC can infer the type of @MassInput{..}@, above
-          miDelete = error "miDelete"
-          miAllowAdd = error "miAllowAdd"
-          miButtonAction = error "miButtonAction"
+          miDelete = miDeleteList -- default for lists suffices, since there are no restrictions
+          miAllowAdd _ _ _ = True
+          miButtonAction :: forall p . PathPiece p => p -> Maybe (SomeRoute UniWorX)
+          miButtonAction anchor = SomeRoute . (:#: anchor) <$> mbCurrentRoute
           postProcess :: Map ListPosition (Either UserEmail UserId, ()) -> Set (Either UserEmail UserId)
           postProcess = Set.fromList . map fst . Map.elems
 
-  runFormPost . identifyForm FIDCommunication $ renderAForm FormStandard $ Communication
+  ((commRes,commWdgt),commEncoding) <- runFormPost . identifyForm FIDCommunication . renderAForm FormStandard $ Communication
     <$> recipientAForm
     <*> aopt textField (fslI MsgCommSubject) Nothing
+  formResult commRes $ \comm -> do
+    runDBJobs $ queueDBJob =<< mapReaderT lift (crJob comm)
+    addMessageI Success . MsgCommSuccess . Set.size $ cRecipients comm
+    redirect crUltDest
 
-  error "commR"
+
+  let formWdgt = wrapForm commWdgt def
+        { formMethod   = POST
+        , formAction   = SomeRoute <$> mbCurrentRoute
+        , formEncoding = commEncoding
+        }
+  siteLayoutMsg crHeading formWdgt

From 5021cca59cc13d1bfa8ce039069748e0811eae3f Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 16 Apr 2019 15:14:33 +0200
Subject: [PATCH 081/238] Don't capture submit of all dbTable-Forms

---
 static/js/utils/asyncTable.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/static/js/utils/asyncTable.js b/static/js/utils/asyncTable.js
index 9c731b33e..a8021817b 100644
--- a/static/js/utils/asyncTable.js
+++ b/static/js/utils/asyncTable.js
@@ -135,7 +135,7 @@
 
       if (tableFilterForm) {
         gatherTableFilterInputs(tableFilterForm);
-        addTableFilterEventListeners();
+        addTableFilterEventListeners(tableFilterForm);
       }
     }
 
@@ -157,7 +157,7 @@
       });
     }
 
-    function addTableFilterEventListeners() {
+    function addTableFilterEventListeners(tableFilterForm) {
       tableFilterInputs.search.forEach(function(input) {
         var debouncedInput = debounce(function() {
           if (input.value.length === 0 || input.value.length > 2) {
@@ -188,7 +188,7 @@
         });
       });
 
-      element.addEventListener('submit', function(event) {
+      tableFilterForm.addEventListener('submit', function(event) {
         event.preventDefault();
         updateFromTableFilter();
       });

From 529b2f22c4b467fc503a7469aebc012128d3aad4 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Tue, 16 Apr 2019 15:22:16 +0200
Subject: [PATCH 082/238] filter duplicate recipients silently

---
 messages/uniworx/de.msg            |  2 +-
 src/Handler/Utils/Communication.hs | 34 +++++++++++++++++-------------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 6f05189db..84c01ecaa 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -739,7 +739,7 @@ NavigationFavourites: Favoriten
 
 CommSubject: Betreff
 CommRecipients: Empfänger
-CommDuplicateRecipients recipients@TextList: #{pluralDE (length recipients) "Doppelter" "Doppelte"} Empfänger: #{intercalate ", " recipients}
+CommDuplicateRecipients n@Int: #{tshow n} #{pluralDE n "doppelter" "doppelte"} Empfänger ignoriert
 CommSuccess n@Int: Nachricht wurde an #{tshow n} Empfänger versandt
 
 CommCourseHeading: Kursmitteilung
diff --git a/src/Handler/Utils/Communication.hs b/src/Handler/Utils/Communication.hs
index 873781da7..dc8d6fe54 100644
--- a/src/Handler/Utils/Communication.hs
+++ b/src/Handler/Utils/Communication.hs
@@ -80,31 +80,35 @@ commR CommunicationRoute{..} =  do
                   [ pure ( AddRecipientGroups
                          , Set.unions <$> apreq (multiSelectField . return $ mkOptionList
                                                    [ Option (mr g) (Set.fromList $ map (Right . entityKey . snd) recs) (toPathPiece g) | (g,recs) <- Map.toList suggestedRecipients ]
-                                                ) ("" & addName (nudge . toPathPiece $ AddRecipientGroups)) Nothing
+                                                ) (fslI AddRecipientGroups & addName (nudge . toPathPiece $ AddRecipientGroups)) Nothing
                          )
                   , do
                       (g,recs) <- Map.toList suggestedRecipients
                       return ( AddRecipientGroup g
                              , Set.unions <$> apreq (multiSelectField . return $ mkOptionList
                                                        [ Option userDisplayName (Set.singleton $ Right rid) (toPathPiece cid) | (cid, Entity rid User{..}) <- recs ]
-                                                    ) ("" & addName (nudge . toPathPiece $ AddRecipientGroup g)) Nothing
+                                                    ) (fslI (AddRecipientGroup g) & addName (nudge . toPathPiece $ AddRecipientGroup g)) Nothing
                              )
                   , pure ( AddRecipientCustom
-                         , Set.fromList . map (Left . CI.mk) <$> apreq multiEmailField ("" & addName (nudge $ toPathPiece AddRecipientCustom)) Nothing )
+                         , Set.fromList . map (Left . CI.mk) <$> apreq multiEmailField (fslI AddRecipientCustom & addName (nudge $ toPathPiece AddRecipientCustom)) Nothing )
                   ]
-            (addRes, addWdgt) <- multiActionM addOptions ("" & addName (nudge "select")) Nothing csrf
+            (addRes, addWdgt) <- multiActionM addOptions ("foobar" & addName (nudge "select")) Nothing csrf
             -- lookupUserDisplayName :: UserId -> UserDisplayName
-            lookupUserDisplayName <- liftHandlerT . runDB $ do
-                let uids = toListOf (_FormSuccess . folded . _Right) addRes
-                names <- forM uids getJustEntity
-                return $ \uid -> case filter ((== uid) . entityKey) names of
-                  [Entity _ User{..}] -> userDisplayName
-                  _other              -> error "UserId lookpup failed"
-            let addRes'  = addRes <&> \newSet oldMap -> if
-                              | collisions <- newSet `Set.intersection` Set.fromList (Map.elems oldMap)
-                              , not $ Set.null collisions ->
-                                  FormFailure [ mr . MsgCommDuplicateRecipients . map (either CI.original lookupUserDisplayName) $ Set.toList collisions ]
-                              | otherwise -> FormSuccess . Map.fromList . zip [maybe 0 (succ . fst) (Map.lookupMax oldMap)..] $ Set.toList newSet
+            -- lookupUserDisplayName <- liftHandlerT . runDB $ do
+            --     let uids = toListOf (_FormSuccess . folded . _Right) addRes
+            --     names <- forM uids getJustEntity
+            --     return $ \uid -> case filter ((== uid) . entityKey) names of
+            --       [Entity _ User{..}] -> userDisplayName
+            --       _other              -> error "UserId lookpup failed"
+            let addRes'  = addRes <&> \newSet oldMap ->
+                            -- if
+                            --   | collisions <- newSet `Set.intersection` Set.fromList (Map.elems oldMap)
+                            --   , not $ Set.null collisions ->
+                            --       -- FormFailure [ mr . MsgCommDuplicateRecipients . map (either CI.original lookupUserDisplayName) $ Set.toList collisions ]
+                            --       FormFailure [ mr . MsgCommDuplicateRecipients $ Set.size collisions ]
+                            --   | otherwise -> FormSuccess . Map.fromList . zip [maybe 0 (succ . fst) (Map.lookupMax oldMap)..] $ Set.toList newSet
+                            let freshSet = newSet `Set.difference` Set.fromList (Map.elems oldMap)
+                            in  FormSuccess . Map.fromList . zip [maybe 0 (succ . fst) (Map.lookupMax oldMap)..] $ Set.toList freshSet
 
                 addWdgt' = mconcat [ toWidget csrf, addWdgt, fvInput submitView ]
             return (addRes', addWdgt')

From 80e67996e6309e1868453d582b78a4cba06c9971 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 16 Apr 2019 15:38:19 +0200
Subject: [PATCH 083/238] Adjust `interactiveFieldsetUtil` for flatter
 `multiAction`

---
 static/js/utils/form.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index cb7cdd9f9..9c577725a 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -145,6 +145,7 @@
   var interactiveFieldsetUtil = function(element) {
     var conditionalInput;
     var conditionalValue;
+    var formGroup;
 
     function init() {
       if (!element) {
@@ -171,6 +172,11 @@
       }
       conditionalValue = element.dataset.conditionalValue;
 
+      formGroup = element.closest('.form-group');
+      if (!formGroup) {
+        throw new Error('Interactive Fieldset needs a .form-group ancestor!');
+      }
+
       // add event listener
       conditionalInput.addEventListener('input', updateVisibility);
 
@@ -188,7 +194,7 @@
     }
 
     function updateVisibility() {
-      element.classList.toggle('hidden', conditionalInput.value !== conditionalValue);
+      formGroup.classList.toggle('hidden', conditionalInput.value !== conditionalValue);
     }
 
     return init();

From c229a013767f4d9605fd74eb46f5eb8e4202be9e Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Tue, 16 Apr 2019 15:39:21 +0200
Subject: [PATCH 084/238] cbody added

---
 messages/uniworx/de.msg            |  2 ++
 src/Handler/Utils/Communication.hs | 21 ++++-----------------
 src/Jobs/Types.hs                  |  1 +
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 84c01ecaa..a809cde7e 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -738,7 +738,9 @@ MassInputDeleteCell: Entfernen
 NavigationFavourites: Favoriten
 
 CommSubject: Betreff
+CommBody: Nachricht
 CommRecipients: Empfänger
+CommRecipientsSelectBy: Auswahl nach
 CommDuplicateRecipients n@Int: #{tshow n} #{pluralDE n "doppelter" "doppelte"} Empfänger ignoriert
 CommSuccess n@Int: Nachricht wurde an #{tshow n} Empfänger versandt
 
diff --git a/src/Handler/Utils/Communication.hs b/src/Handler/Utils/Communication.hs
index dc8d6fe54..abc9d4ed0 100644
--- a/src/Handler/Utils/Communication.hs
+++ b/src/Handler/Utils/Communication.hs
@@ -92,24 +92,10 @@ commR CommunicationRoute{..} =  do
                   , pure ( AddRecipientCustom
                          , Set.fromList . map (Left . CI.mk) <$> apreq multiEmailField (fslI AddRecipientCustom & addName (nudge $ toPathPiece AddRecipientCustom)) Nothing )
                   ]
-            (addRes, addWdgt) <- multiActionM addOptions ("foobar" & addName (nudge "select")) Nothing csrf
-            -- lookupUserDisplayName :: UserId -> UserDisplayName
-            -- lookupUserDisplayName <- liftHandlerT . runDB $ do
-            --     let uids = toListOf (_FormSuccess . folded . _Right) addRes
-            --     names <- forM uids getJustEntity
-            --     return $ \uid -> case filter ((== uid) . entityKey) names of
-            --       [Entity _ User{..}] -> userDisplayName
-            --       _other              -> error "UserId lookpup failed"
+            (addRes, addWdgt) <- multiActionM addOptions (fslI MsgCommRecipientsSelectBy & addName (nudge "select")) Nothing csrf
             let addRes'  = addRes <&> \newSet oldMap ->
-                            -- if
-                            --   | collisions <- newSet `Set.intersection` Set.fromList (Map.elems oldMap)
-                            --   , not $ Set.null collisions ->
-                            --       -- FormFailure [ mr . MsgCommDuplicateRecipients . map (either CI.original lookupUserDisplayName) $ Set.toList collisions ]
-                            --       FormFailure [ mr . MsgCommDuplicateRecipients $ Set.size collisions ]
-                            --   | otherwise -> FormSuccess . Map.fromList . zip [maybe 0 (succ . fst) (Map.lookupMax oldMap)..] $ Set.toList newSet
-                            let freshSet = newSet `Set.difference` Set.fromList (Map.elems oldMap)
-                            in  FormSuccess . Map.fromList . zip [maybe 0 (succ . fst) (Map.lookupMax oldMap)..] $ Set.toList freshSet
-
+                  let freshSet = newSet `Set.difference` Set.fromList (Map.elems oldMap)
+                  in  FormSuccess . Map.fromList . zip [maybe 0 (succ . fst) (Map.lookupMax oldMap)..] $ Set.toList freshSet
                 addWdgt' = mconcat [ toWidget csrf, addWdgt, fvInput submitView ]
             return (addRes', addWdgt')
 
@@ -129,6 +115,7 @@ commR CommunicationRoute{..} =  do
   ((commRes,commWdgt),commEncoding) <- runFormPost . identifyForm FIDCommunication . renderAForm FormStandard $ Communication
     <$> recipientAForm
     <*> aopt textField (fslI MsgCommSubject) Nothing
+    <*> areq htmlField (fslI MsgCommBody)    Nothing
   formResult commRes $ \comm -> do
     runDBJobs $ queueDBJob =<< mapReaderT lift (crJob comm)
     addMessageI Success . MsgCommSuccess . Set.size $ cRecipients comm
diff --git a/src/Jobs/Types.hs b/src/Jobs/Types.hs
index 0aa6afe47..a7b1c7c27 100644
--- a/src/Jobs/Types.hs
+++ b/src/Jobs/Types.hs
@@ -55,6 +55,7 @@ deriveJSON defaultOptions
 data Communication = Communication
  { cRecipients :: Set (Either UserEmail UserId)
  , cSubject :: Maybe Text
+ , cBody :: Html
  } deriving (Eq, Ord, Read, Show, Generic, Typeable)
 
 instance Hashable Communication

From 6f4b09bb0ad6fe814f5cf39299f31b9d92f70b89 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 16 Apr 2019 15:51:03 +0200
Subject: [PATCH 085/238] Instances for Html

---
 src/Import/NoFoundation.hs  |  2 ++
 src/Text/Blaze/Instances.hs | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 src/Text/Blaze/Instances.hs

diff --git a/src/Import/NoFoundation.hs b/src/Import/NoFoundation.hs
index 74f6f10bd..767067ba1 100644
--- a/src/Import/NoFoundation.hs
+++ b/src/Import/NoFoundation.hs
@@ -69,6 +69,8 @@ import Numeric.Natural.Instances as Import ()
 import System.Random as Import (Random)
 import Control.Monad.Random.Class as Import (MonadRandom(..))
 
+import Text.Blaze.Instances as Import ()
+
 
 import Control.Monad.Trans.RWS (RWST)
 
diff --git a/src/Text/Blaze/Instances.hs b/src/Text/Blaze/Instances.hs
new file mode 100644
index 000000000..346b17c60
--- /dev/null
+++ b/src/Text/Blaze/Instances.hs
@@ -0,0 +1,37 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Text.Blaze.Instances
+  (
+  ) where
+
+import ClassyPrelude
+import Text.Blaze
+import qualified Text.Blaze.Renderer.Text as Text
+
+import Text.Read (Read(..))
+
+import Data.Hashable (Hashable(..))
+import Data.Aeson (ToJSON(..), FromJSON(..))
+import qualified Data.Aeson as Aeson
+
+
+instance Eq Markup where
+  (==) = (==) `on` Text.renderMarkup
+
+instance Ord Markup where
+  compare = comparing Text.renderMarkup
+
+instance Read Markup where
+  readPrec = preEscapedLazyText <$> readPrec
+
+instance Show Markup where
+  showsPrec prec = showsPrec prec . Text.renderMarkup
+
+instance Hashable Markup where
+  hashWithSalt s = hashWithSalt s . Text.renderMarkup
+
+instance ToJSON Markup where
+  toJSON = Aeson.String . toStrict . Text.renderMarkup
+
+instance FromJSON Markup where
+  parseJSON = Aeson.withText "Html" $ return . preEscapedText

From 6a85cbdf383e2b19b459481755c6bb6b23a02bac Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Tue, 16 Apr 2019 17:56:31 +0200
Subject: [PATCH 086/238] Hinweise zum Korrektur-Upload

---
 messages/uniworx/de.msg                       |  2 +-
 src/Handler/Corrections.hs                    |  4 +++-
 src/Handler/Sheet.hs                          |  9 ++++----
 .../corrections-upload-instructions/de.hamlet | 22 +++++++++++++++++++
 templates/corrections-upload.hamlet           |  5 ++++-
 5 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 templates/corrections-upload-instructions/de.hamlet

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 980015007..bd11b5726 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -255,7 +255,7 @@ CorByProportionIncludingTutorial proportion@Rational: #{display proportion} Ante
 CorByProportionExcludingTutorial proportion@Rational: #{display proportion} Anteile + Tutorium
 
 RowCount count@Int64: #{display count} #{pluralDE count "Eintrag" "Einträge"} nach Filter
-DeleteRow: Zeile entfernen
+DeleteRow: Entfernen
 ProportionNegative: Anteile dürfen nicht negativ sein
 CorrectorUpdated: Korrektor erfolgreich aktualisiert
 CorrectorsUpdated: Korrektoren erfolgreich aktualisiert
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 42c21d62a..2a3a2b89a 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -724,7 +724,9 @@ postCorrectionsUploadR = do
         , formEncoding = uploadEncoding
         }
 
-  defaultLayout
+
+  defaultLayout $ do
+    let uploadInstruction = $(i18nWidgetFile "corrections-upload-instructions")
     $(widgetFile "corrections-upload")
 
 getCorrectionsCreateR, postCorrectionsCreateR :: Handler Html
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index cc5bc7718..39b2effd9 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -738,11 +738,11 @@ correctorForm shid = do
 
   let
     corrColonnade = mconcat
-      [ headed (Yesod.textCell $ mr MsgCorrector) $ \CorrectorForm{..} -> Yesod.textCell cfUserName
-      , headed (Yesod.textCell $ mr MsgCorState) $ \CorrectorForm{..} -> Yesod.cell $ fvInput cfViewState
-      , headed (Yesod.textCell $ mr MsgCorByTut) $ \CorrectorForm{..} -> Yesod.cell $ fvInput cfViewByTut
+      [ headed (Yesod.textCell $ mr MsgCorrector)     $ \CorrectorForm{..} -> Yesod.textCell cfUserName
+      , headed (Yesod.textCell $ mr MsgCorState)      $ \CorrectorForm{..} -> Yesod.cell $ fvInput cfViewState
+      , headed (Yesod.textCell $ mr MsgCorByTut)      $ \CorrectorForm{..} -> Yesod.cell $ fvInput cfViewByTut
       , headed (Yesod.textCell $ mr MsgCorProportion) $ \CorrectorForm{..} -> Yesod.cell $ fvInput cfViewProp
-      , headed (Yesod.textCell $ mr MsgDeleteRow) $ \CorrectorForm{..} -> Yesod.cell $ fvInput cfViewDel
+      , headed (Yesod.textCell $ mr MsgDeleteRow)     $ \CorrectorForm{..} -> Yesod.cell $ fvInput cfViewDel
       ]
     corrResults
       | FormSuccess (Just es) <- addTutRes
@@ -804,3 +804,4 @@ getSCorrR tid ssh csh shn = do
       { formAction = Just . SomeRoute $ CSheetR tid ssh csh shn SCorrR
       , formEncoding = formEnctype
       }
+
diff --git a/templates/corrections-upload-instructions/de.hamlet b/templates/corrections-upload-instructions/de.hamlet
new file mode 100644
index 000000000..0a04c6c4f
--- /dev/null
+++ b/templates/corrections-upload-instructions/de.hamlet
@@ -0,0 +1,22 @@
+<section>
+  <p>
+    Das Hochladen einer Korrekturen markiert die entsprechende
+    Abgabe automatisch als "korrigiert", falls Ihnen die Abgabe zugeteilt gewesen war.
+  <p>
+    Lädt jedoch ein Assistent Korrekturen hoch, welche anderen Korrektoren
+    oder noch nicht zugeteilt wurden, so werden diese Abgaben noch nicht als "korrigiert" markiert.
+  <p>
+    Es ist geplant, dass die Bewertungsdatei in Zukunft ein eigenes Feld enthält,
+    in dem Korrektoren angeben können, ob die Korrektur abgeschlossen ist oder nicht.
+  <p>
+    Im Gegensatz zu UniWorX enthalten die heruntergeladenen Abgaben immer den
+    aktuellen Stand der Bewertung. Dies betrifft ggf. auch geänderte Dateien!
+
+<section>
+  <p>
+    Bei der Korrektur können Dateien verändert, hinzugefügt und gelöscht werden.
+    Die Abgebenden werden entsprechend informiert, sobald die Abgabe als "korrigiert" markiert wurde.
+  <p>
+    Temporäre Dateien einer eventuellen Vorkorrektur müssen also durch das Hochladen der
+    Korrekturen des letzten Korrektors gelöscht werden, falls diese den Abgabenden
+    nicht zur Verfügung gestellt werden sollen.
diff --git a/templates/corrections-upload.hamlet b/templates/corrections-upload.hamlet
index 5a7ac5710..a479c6257 100644
--- a/templates/corrections-upload.hamlet
+++ b/templates/corrections-upload.hamlet
@@ -1 +1,4 @@
-^{uploadForm}
+<section>
+  ^{uploadInstruction}
+<section>
+  ^{uploadForm}

From 8637847fc6c1bbd624ebecf5d5d6d64a0b6c0a6c Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 16 Apr 2019 21:28:21 +0200
Subject: [PATCH 087/238] Working CCommR

---
 messages/uniworx/de.msg                     |  8 +++
 src/Foundation.hs                           | 17 +++++-
 src/Handler/Course.hs                       | 15 ++++-
 src/Handler/Help.hs                         |  4 +-
 src/Handler/Utils/Communication.hs          | 41 +++++++++----
 src/Handler/Utils/Form.hs                   |  2 +-
 src/Handler/Utils/Mail.hs                   | 15 ++---
 src/Import/NoFoundation.hs                  |  2 +-
 src/Jobs.hs                                 |  1 +
 src/Jobs/Handler/HelpRequest.hs             |  4 +-
 src/Jobs/Handler/SendCourseCommunication.hs | 37 ++++++++++++
 src/Jobs/Queue.hs                           | 28 +++++++--
 src/Jobs/Types.hs                           | 26 ++++-----
 src/Mail.hs                                 | 64 +++++++++++++++------
 src/Utils/Parameters.hs                     | 13 ++++-
 15 files changed, 208 insertions(+), 69 deletions(-)
 create mode 100644 src/Jobs/Handler/SendCourseCommunication.hs

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index a809cde7e..569697d3f 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -516,6 +516,8 @@ MailEditNotifications: Benachrichtigungen ein-/ausschalten
 MailSubjectSupport: Supportanfrage
 MailSubjectSupportCustom customSubject@Text: [Support] #{customSubject}
 
+CommCourseSubject: Kursmitteilung
+
 SheetGrading: Bewertung
 SheetGradingPoints maxPoints@Points: #{tshow maxPoints} Punkte
 SheetGradingPassPoints maxPoints@Points passingPoints@Points: Bestanden ab #{tshow passingPoints} von #{tshow maxPoints} Punkten
@@ -670,6 +672,7 @@ MenuLogin: Login
 MenuLogout: Logout
 MenuCourseList: Kurse
 MenuCourseMembers: Kursteilnehmer
+MenuCourseCommunication: Kursmitteilung
 MenuTermShow: Semester
 MenuSubmissionDelete: Abgabe löschen
 MenuUsers: Benutzer
@@ -740,7 +743,9 @@ NavigationFavourites: Favoriten
 CommSubject: Betreff
 CommBody: Nachricht
 CommRecipients: Empfänger
+CommRecipientsTip: Sie können die Liste von Empfängern beliebig bearbeiten, bevor Sie die Nachricht verschicken. Sie selbst erhalten immer eine Kopie der Nachricht.
 CommRecipientsSelectBy: Auswahl nach
+CommRecipientsSelectByTip: Mögliche Empfänger sind in verschiedene Gruppen unterteilt; sie können sowohl ganze Empfängergruppen als auch einzelne Mitglieder von Empfängergruppen hinzufügen
 CommDuplicateRecipients n@Int: #{tshow n} #{pluralDE n "doppelter" "doppelte"} Empfänger ignoriert
 CommSuccess n@Int: Nachricht wurde an #{tshow n} Empfänger versandt
 
@@ -752,3 +757,6 @@ AddRecipientCustom: Weitere Empfänger
 RGCourseParticipants: Kursteilnehmer
 RGCourseLecturers: Kursverwalter
 RGCourseCorrectors: Korrektoren
+
+MultiSelectFieldTip: Mehrfach-Auswahl ist möglich (Umschalt bzw. Strg)
+MultiEmailFieldTip: Je nach Browser sind mehrere komma-separierte E-Mail-Addressen möglich
\ No newline at end of file
diff --git a/src/Foundation.hs b/src/Foundation.hs
index d7b14c2f9..8623fd45a 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1172,6 +1172,7 @@ instance YesodBreadcrumbs UniWorX where
   breadcrumb (CourseR tid ssh csh CCorrectionsR) = return ("Abgaben" , Just $ CourseR tid ssh csh CShowR)
   breadcrumb (CourseR tid ssh csh SheetListR) = return ("Übungen"    , Just $ CourseR tid ssh csh CShowR)
   breadcrumb (CourseR tid ssh csh SheetNewR ) = return ("Neu",         Just $ CourseR tid ssh csh SheetListR)
+  breadcrumb (CourseR tid ssh csh CCommR    ) = return ("Kursmitteilung", Just $ CourseR tid ssh csh CShowR)
 
   breadcrumb (CSheetR tid ssh csh shn SShowR) = return (CI.original shn, Just $ CourseR tid ssh csh SheetListR)
   breadcrumb (CSheetR tid ssh csh shn SEditR) = return ("Edit",    Just $ CSheetR tid ssh csh shn SShowR)
@@ -1539,6 +1540,14 @@ pageActions (CourseR tid ssh csh CShowR) =
       , menuItemModal = False
       , menuItemAccessCallback' = return True
       }
+  , MenuItem
+      { menuItemType = PageActionSecondary
+      , menuItemLabel = MsgMenuCourseCommunication
+      , menuItemIcon  = Nothing
+      , menuItemRoute = SomeRoute $ CourseR tid ssh csh CCommR
+      , menuItemModal = False
+      , menuItemAccessCallback' = return True
+      }
   , MenuItem
       { menuItemType = PageActionSecondary
       , menuItemLabel = MsgMenuCourseEdit
@@ -2227,11 +2236,15 @@ instance YesodMail UniWorX where
     pool <- maybe (throwM MailNotAvailable) return =<< getsYesod appSmtpPool
     withResource pool act
   mailT ctx mail = defMailT ctx $ do
-    void setMailObjectId
+    void setMailObjectIdRandom
     setDateCurrent
     replaceMailHeader "Sender" . Just . addressEmail =<< getsYesod (appMailFrom . appSettings)
 
-    mail <* setMailSmtpData
+    (mRes, smtpData) <- listen mail
+    unless (view _MailSmtpDataSet smtpData)
+      setMailSmtpData
+
+    return mRes
 
 
 instance (MonadThrow m, MonadHandler m, HandlerSite m ~ UniWorX) => MonadCrypto m where
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 0a780b9ad..6984e6e57 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -1049,12 +1049,23 @@ postCNotesR = error "CNotesR: Not implemented"
 getCCommR, postCCommR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getCCommR = postCCommR
 postCCommR tid ssh csh = do
-  cid  <- runDB . getKeyBy404 $ TermSchoolCourseShort tid ssh csh
+  jSender <- requireAuthId
+  cid <- runDB . getKeyBy404 $ TermSchoolCourseShort tid ssh csh
 
   commR CommunicationRoute
     { crHeading    = SomeMessage . prependCourseTitle tid ssh csh $ SomeMessage MsgCommCourseHeading
     , crUltDest    = SomeRoute $ CourseR tid ssh csh CCommR
-    , crJob        = error "job undefined"
+    , crJobs       = \Communication{..} -> do
+        let jSubject = cSubject
+            jMailContent = cBody
+            jCourse = cid
+            allRecipients = Set.toList $ Set.insert (Right jSender) cRecipients
+        jMailObjectUUID <- liftIO getRandom
+        jAllRecipientAddresses <- lift . fmap Set.fromList . forM allRecipients $ \case
+          Left email -> return . Address Nothing $ CI.original email
+          Right rid  -> userAddress <$> getJust rid
+        forM_ allRecipients $ \jRecipientEmail ->
+          yield JobSendCourseCommunication{..}
     , crRecipients = Map.fromList
       [ ( RGCourseParticipants
         , E.from $ \(user `E.InnerJoin` participant) -> do
diff --git a/src/Handler/Help.hs b/src/Handler/Help.hs
index 788310888..f79d36b92 100644
--- a/src/Handler/Help.hs
+++ b/src/Handler/Help.hs
@@ -53,8 +53,8 @@ postHelpR = do
     now <- liftIO getCurrentTime
     hfReferer' <- traverse toTextUrl hfReferer
     queueJob' JobHelpRequest
-      { jSender      = hfUserId
-      , jHelpSubject = hfSubject
+      { jHelpSender  = hfUserId
+      , jSubject     = hfSubject
       , jHelpRequest = hfRequest
       , jRequestTime = now
       , jReferer     = hfReferer'
diff --git a/src/Handler/Utils/Communication.hs b/src/Handler/Utils/Communication.hs
index abc9d4ed0..88dbccf55 100644
--- a/src/Handler/Utils/Communication.hs
+++ b/src/Handler/Utils/Communication.hs
@@ -1,4 +1,11 @@
-module Handler.Utils.Communication where
+module Handler.Utils.Communication
+  ( RecipientGroup(..)
+  , CommunicationRoute(..)
+  , Communication(..)
+  , commR
+  -- * Re-Exports
+  , Job(..)
+  ) where
 
 import Import
 import Handler.Utils
@@ -56,23 +63,32 @@ instance RenderMessage UniWorX RecipientAddOption where
 
 data CommunicationRoute = CommunicationRoute
   { crRecipients :: Map RecipientGroup (E.SqlQuery (E.SqlExpr (Entity User)))
-  , crJob        :: Communication -> DB Job
+  , crJobs       :: Communication -> Source (YesodDB UniWorX) Job
   , crHeading    :: SomeMessage UniWorX
   , crUltDest    :: SomeRoute UniWorX
   }
--- `Communication` is defined in `Jobs.Types`
+
+data Communication = Communication
+ { cRecipients :: Set (Either UserEmail UserId)
+ , cSubject :: Maybe Text
+ , cBody :: Html
+ }
 
 
 commR :: CommunicationRoute -> Handler Html
 commR CommunicationRoute{..} =  do
+  uid <- maybeAuthId
+  
   MsgRenderer mr <- getMsgRenderer
   mbCurrentRoute <- getCurrentRoute
 
   suggestedRecipients' <- runDB $ traverse E.select crRecipients
   suggestedRecipients <- forM suggestedRecipients' . mapM $ \ent@(Entity rid _) -> (,) <$> (encrypt rid :: Handler CryptoUUIDUser) <*> pure ent
 
+  chosenRecipients <- fmap (maybe id cons uid) $ mapM (decrypt :: CryptoUUIDUser -> Handler UserId) =<< lookupGlobalGetParams GetRecipient
+
   let recipientAForm :: AForm Handler (Set (Either UserEmail UserId))
-      recipientAForm = postProcess <$> massInputA MassInput{..} (fslI MsgCommRecipients) True (Nothing {- TODO -})
+      recipientAForm = postProcess <$> massInputA MassInput{..} (fslI MsgCommRecipients & setTooltip MsgCommRecipientsTip) True (Just . Map.fromList . zip [0..] $ map ((, ()) . Right) chosenRecipients)
         where
           miAdd _ _ nudge submitView = Just $ \csrf -> do
             let addOptions :: Map RecipientAddOption (AForm Handler (Set (Either UserEmail UserId)))
@@ -80,19 +96,20 @@ commR CommunicationRoute{..} =  do
                   [ pure ( AddRecipientGroups
                          , Set.unions <$> apreq (multiSelectField . return $ mkOptionList
                                                    [ Option (mr g) (Set.fromList $ map (Right . entityKey . snd) recs) (toPathPiece g) | (g,recs) <- Map.toList suggestedRecipients ]
-                                                ) (fslI AddRecipientGroups & addName (nudge . toPathPiece $ AddRecipientGroups)) Nothing
+                                                ) (fslI AddRecipientGroups & addName (nudge . toPathPiece $ AddRecipientGroups) & setTooltip MsgMultiSelectFieldTip) Nothing
                          )
                   , do
-                      (g,recs) <- Map.toList suggestedRecipients
+                      (g, recs) <- Map.toList suggestedRecipients
+                      guard . not $ null recs
                       return ( AddRecipientGroup g
                              , Set.unions <$> apreq (multiSelectField . return $ mkOptionList
                                                        [ Option userDisplayName (Set.singleton $ Right rid) (toPathPiece cid) | (cid, Entity rid User{..}) <- recs ]
-                                                    ) (fslI (AddRecipientGroup g) & addName (nudge . toPathPiece $ AddRecipientGroup g)) Nothing
+                                                    ) (fslI (AddRecipientGroup g) & addName (nudge . toPathPiece $ AddRecipientGroup g) & setTooltip MsgMultiSelectFieldTip) Nothing
                              )
                   , pure ( AddRecipientCustom
-                         , Set.fromList . map (Left . CI.mk) <$> apreq multiEmailField (fslI AddRecipientCustom & addName (nudge $ toPathPiece AddRecipientCustom)) Nothing )
+                         , Set.fromList . map (Left . CI.mk) <$> apreq multiEmailField (fslI AddRecipientCustom & addName (nudge $ toPathPiece AddRecipientCustom) & setTooltip MsgMultiEmailFieldTip) Nothing )
                   ]
-            (addRes, addWdgt) <- multiActionM addOptions (fslI MsgCommRecipientsSelectBy & addName (nudge "select")) Nothing csrf
+            (addRes, addWdgt) <- multiActionM addOptions (fslI MsgCommRecipientsSelectBy & addName (nudge "select") & setTooltip MsgCommRecipientsSelectByTip) Nothing csrf
             let addRes'  = addRes <&> \newSet oldMap ->
                   let freshSet = newSet `Set.difference` Set.fromList (Map.elems oldMap)
                   in  FormSuccess . Map.fromList . zip [maybe 0 (succ . fst) (Map.lookupMax oldMap)..] $ Set.toList freshSet
@@ -117,7 +134,7 @@ commR CommunicationRoute{..} =  do
     <*> aopt textField (fslI MsgCommSubject) Nothing
     <*> areq htmlField (fslI MsgCommBody)    Nothing
   formResult commRes $ \comm -> do
-    runDBJobs $ queueDBJob =<< mapReaderT lift (crJob comm)
+    runDBJobs . runConduit $ hoist (mapReaderT lift) (crJobs comm) .| sinkDBJobs
     addMessageI Success . MsgCommSuccess . Set.size $ cRecipients comm
     redirect crUltDest
 
@@ -127,4 +144,6 @@ commR CommunicationRoute{..} =  do
         , formAction   = SomeRoute <$> mbCurrentRoute
         , formEncoding = commEncoding
         }
-  siteLayoutMsg crHeading formWdgt
+  siteLayoutMsg crHeading $ do
+    setTitleI crHeading
+    formWdgt
diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index 61f4b5f1a..c37007add 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -10,7 +10,7 @@ import Handler.Utils.Form.Types
 
 import Handler.Utils.DateTime
 
-import Import hiding (cons)
+import Import
 import qualified Data.Char as Char
 import qualified Data.Text as Text
 import qualified Data.CaseInsensitive as CI
diff --git a/src/Handler/Utils/Mail.hs b/src/Handler/Utils/Mail.hs
index 5c35dd4aa..02af114b7 100644
--- a/src/Handler/Utils/Mail.hs
+++ b/src/Handler/Utils/Mail.hs
@@ -1,5 +1,6 @@
 module Handler.Utils.Mail
   ( addRecipientsDB
+  , userAddress
   , userMailT
   , addFileDB
   ) where
@@ -31,22 +32,22 @@ addRecipientsDB uFilter = runConduit $ transPipe (liftHandlerT . runDB) (selectS
       let addr = Address (Just userDisplayName) $ CI.original userEmail
       _mailTo %= flip snoc addr
 
+userAddress :: User -> Address
+userAddress User{userEmail, userDisplayName} = Address (Just userDisplayName) $ CI.original userEmail
+
 userMailT :: ( MonadHandler m
              , HandlerSite m ~ UniWorX
              , MonadBaseControl IO m
              , MonadLogger m
              ) => UserId -> MailT m a -> m a
 userMailT uid mAct = do
-  User
-    { userEmail
-    , userDisplayName
-    , userMailLanguages
+  user@User
+    { userMailLanguages
     , userDateTimeFormat
     , userDateFormat
     , userTimeFormat
     } <- liftHandlerT . runDB $ getJust uid
   let
-    addr = Address (Just userDisplayName) $ CI.original userEmail
     ctx = MailContext
       { mcLanguages = userMailLanguages
       , mcDateTimeFormat = \case
@@ -55,7 +56,7 @@ userMailT uid mAct = do
           SelFormatTime -> userTimeFormat
       }
   mailT ctx $ do
-    _mailTo .= pure addr
+    _mailTo .= pure (userAddress user)
     mAct
 
 addFileDB :: ( MonadMail m
@@ -69,4 +70,4 @@ addFileDB fId = do
     _partEncoding .= Base64
     _partFilename .= Just fileName
     _partContent .= LBS.fromStrict fileContent
-    setMailObjectId' fId :: StateT Part (HandlerT UniWorX IO) MailObjectId
+    setMailObjectIdCrypto fId :: StateT Part (HandlerT UniWorX IO) MailObjectId
diff --git a/src/Import/NoFoundation.hs b/src/Import/NoFoundation.hs
index 767067ba1..416547c54 100644
--- a/src/Import/NoFoundation.hs
+++ b/src/Import/NoFoundation.hs
@@ -3,7 +3,7 @@ module Import.NoFoundation
     , MForm
     ) where
 
-import ClassyPrelude.Yesod    as Import hiding (formatTime, derivePersistFieldJSON, addMessage, addMessageI, (.=), MForm, Proxy, foldlM, static, boolField, identifyForm)
+import ClassyPrelude.Yesod    as Import hiding (formatTime, derivePersistFieldJSON, addMessage, addMessageI, (.=), MForm, Proxy, foldlM, static, boolField, identifyForm, cons)
 import Model                  as Import
 import Model.Types.JSON       as Import
 import Model.Migration        as Import
diff --git a/src/Jobs.hs b/src/Jobs.hs
index 2a9a42556..5f4895a29 100644
--- a/src/Jobs.hs
+++ b/src/Jobs.hs
@@ -58,6 +58,7 @@ import Jobs.Handler.QueueNotification
 import Jobs.Handler.HelpRequest
 import Jobs.Handler.SetLogSettings
 import Jobs.Handler.DistributeCorrections
+import Jobs.Handler.SendCourseCommunication
 
   
 data JobQueueException = JInvalid QueuedJobId QueuedJob
diff --git a/src/Jobs/Handler/HelpRequest.hs b/src/Jobs/Handler/HelpRequest.hs
index 2b92c0e2b..a792b22b6 100644
--- a/src/Jobs/Handler/HelpRequest.hs
+++ b/src/Jobs/Handler/HelpRequest.hs
@@ -23,13 +23,13 @@ dispatchJobHelpRequest :: Either (Maybe Address) UserId
 dispatchJobHelpRequest jSender jRequestTime jHelpSubject jHelpRequest jReferer = do
   supportAddress <- getsYesod $ appMailSupport . appSettings
   userInfo <- bitraverse return (runDB . getEntity) jSender
-  let userAddress = either
+  let senderAddress = either
         id
         (fmap $ \(Entity _ User{..}) -> Address (Just userDisplayName) (CI.original userEmail))
         userInfo
   mailT def $ do
     _mailTo .= [supportAddress]
-    whenIsJust userAddress (_mailFrom .=)
+    whenIsJust senderAddress (_mailFrom .=)
     replaceMailHeader "Auto-Submitted" $ Just "no"
     setSubjectI $ maybe MsgMailSubjectSupport MsgMailSubjectSupportCustom jHelpSubject
     setDate jRequestTime
diff --git a/src/Jobs/Handler/SendCourseCommunication.hs b/src/Jobs/Handler/SendCourseCommunication.hs
new file mode 100644
index 000000000..734612c43
--- /dev/null
+++ b/src/Jobs/Handler/SendCourseCommunication.hs
@@ -0,0 +1,37 @@
+module Jobs.Handler.SendCourseCommunication
+  ( dispatchJobSendCourseCommunication
+  ) where
+
+import Import
+
+import Utils.Lens
+import Handler.Utils
+
+import qualified Data.Set as Set
+
+import qualified Data.CaseInsensitive as CI
+
+
+dispatchJobSendCourseCommunication :: Either UserEmail UserId
+                                   -> Set Address
+                                   -> CourseId
+                                   -> UserId
+                                   -> UUID
+                                   -> Maybe Text
+                                   -> Html
+                                   -> Handler ()
+dispatchJobSendCourseCommunication jRecipientEmail jAllRecipientAddresses jCourse jSender jMailObjectUUID jSubject jMailContent = do
+  (sender, Course{..}) <- runDB $ (,)
+    <$> getJust jSender
+    <*> getJust jCourse
+  either (\email -> mailT def . (assign _mailTo (pure . Address Nothing $ CI.original email) *>)) userMailT jRecipientEmail $ do
+    void $ setMailObjectUUID jMailObjectUUID
+    _mailFrom .= userAddress sender
+    if -- Use `addMailHeader` instead of `_mailCc` to make `mailT` ignore the additional recipients
+      | jRecipientEmail == Right jSender
+      -> addMailHeader "Cc" . intercalate ", " . map renderAddress $ Set.toAscList (Set.delete (userAddress sender) jAllRecipientAddresses)
+      | otherwise
+      -> addMailHeader "Cc" "Undisclosed Recipients:;"
+    addMailHeader "Auto-Submitted" "no"
+    setSubjectI . prependCourseTitle courseTerm courseSchool courseShorthand $ maybe (SomeMessage MsgCommCourseSubject) SomeMessage jSubject
+    void $ addPart jMailContent
diff --git a/src/Jobs/Queue.hs b/src/Jobs/Queue.hs
index a9d701ec4..b91a51d1d 100644
--- a/src/Jobs/Queue.hs
+++ b/src/Jobs/Queue.hs
@@ -2,7 +2,7 @@ module Jobs.Queue
   ( writeJobCtl, writeJobCtlBlock
   , queueJob, queueJob'
   , YesodJobDB
-  , runDBJobs, queueDBJob
+  , runDBJobs, queueDBJob, sinkDBJobs
   , module Jobs.Types
   ) where
 
@@ -21,6 +21,8 @@ import qualified Data.HashMap.Strict as HashMap
 
 import Control.Monad.Random (evalRand, mkStdGen, uniform)
 
+import qualified Data.Conduit.List as C
+
 
 data JobQueueException = JobQueuePoolEmpty
   deriving (Eq, Ord, Enum, Bounded, Show, Read, Generic)
@@ -29,6 +31,10 @@ instance Exception JobQueueException
 
 
 writeJobCtl :: (MonadHandler m, HandlerSite m ~ UniWorX) => JobCtl -> m ()
+-- | Pass an instruction to the `Job`-Workers
+--
+-- Instructions are assigned deterministically and pseudo-randomly to one specific worker.
+-- While this means that they might be executed later than desireable, rouge threads that queue the same instruction many times do not deny service to others
 writeJobCtl cmd = do
   tid <- liftIO myThreadId
   wMap <- getsYesod appJobCtl >>= liftIO . readTVarIO
@@ -39,6 +45,7 @@ writeJobCtl cmd = do
         liftIO . atomically $ writeTMChan chan cmd
 
 writeJobCtlBlock :: (MonadHandler m, HandlerSite m ~ UniWorX) => JobCtl -> ReaderT JobContext m ()
+-- | Pass an instruction to the `Job`-Workers and block until it was acted upon
 writeJobCtlBlock cmd = do
   getResVar <- asks jobConfirm
   resVar <- liftIO . atomically $ do
@@ -67,19 +74,30 @@ queueJobUnsafe job = do
   -- return jId
 
 queueJob :: (MonadHandler m, HandlerSite m ~ UniWorX) => Job -> m QueuedJobId
+-- ^ Queue a job for later execution
+--
+-- Makes no guarantees as to when it will be executed (`queueJob'`) and does not interact with any running database transactions (`runDBJobs`)
 queueJob = liftHandlerT . runDB . setSerializable . queueJobUnsafe
 
 queueJob' :: (MonadHandler m, HandlerSite m ~ UniWorX) => Job -> m ()
--- ^ `queueJob` followed by `JobCtlPerform`
+-- ^ `queueJob` followed by `writeJobCtl` `JobCtlPerform` to ensure, that it is executed asap
 queueJob' job = queueJob job >>= writeJobCtl . JobCtlPerform
 
+-- | Slightly modified Version of `YesodDB` for `runDBJobs`
 type YesodJobDB site = ReaderT (YesodPersistBackend site) (WriterT (Set QueuedJobId) (HandlerT site IO))
 
-queueDBJob :: Job -> ReaderT (YesodPersistBackend UniWorX) (WriterT (Set QueuedJobId) (HandlerT UniWorX IO)) ()
+queueDBJob :: Job -> YesodJobDB UniWorX ()
+-- | Queue a job as part of a database transaction and execute it after the transaction succeeds
 queueDBJob job = mapReaderT lift (queueJobUnsafe job) >>= tell . Set.singleton
 
-runDBJobs :: (MonadHandler m, HandlerSite m ~ UniWorX)
- => ReaderT (YesodPersistBackend UniWorX) (WriterT (Set QueuedJobId) (HandlerT UniWorX IO)) a -> m a
+sinkDBJobs :: Sink Job (YesodJobDB UniWorX) ()
+-- | Queue many jobs as part of a database transaction and execute them after the transaction passes
+sinkDBJobs = C.mapM_ queueDBJob
+
+runDBJobs :: (MonadHandler m, HandlerSite m ~ UniWorX) => YesodJobDB UniWorX a -> m a
+-- | Replacement for/Wrapper around `runDB` when jobs need to be queued as part of a database transaction
+--
+-- Jobs get immediately executed if the transaction succeeds
 runDBJobs act = do
   (ret, jIds) <- liftHandlerT . runDB $ mapReaderT runWriterT act
   forM_ jIds $ writeJobCtl . JobCtlPerform
diff --git a/src/Jobs/Types.hs b/src/Jobs/Types.hs
index a7b1c7c27..58fa39e48 100644
--- a/src/Jobs/Types.hs
+++ b/src/Jobs/Types.hs
@@ -1,6 +1,5 @@
 module Jobs.Types
   ( Job(..), Notification(..)
-  , Communication(..)
   , JobCtl(..)
   , JobContext(..)
   ) where
@@ -16,14 +15,22 @@ import Data.List.NonEmpty (NonEmpty)
 data Job = JobSendNotification { jRecipient :: UserId, jNotification :: Notification }
          | JobSendTestEmail { jEmail :: Email, jMailContext :: MailContext }
          | JobQueueNotification { jNotification :: Notification }
-         | JobHelpRequest { jSender :: Either (Maybe Address) UserId
+         | JobHelpRequest { jHelpSender :: Either (Maybe Address) UserId
                           , jRequestTime :: UTCTime
-                          , jHelpSubject :: Maybe Text
+                          , jSubject :: Maybe Text
                           , jHelpRequest :: Text
                           , jReferer :: Maybe Text
                           }
          | JobSetLogSettings { jInstance :: InstanceId, jLogSettings :: LogSettings }
          | JobDistributeCorrections { jSheet :: SheetId }
+         | JobSendCourseCommunication { jRecipientEmail :: Either UserEmail UserId
+                                      , jAllRecipientAddresses :: Set Address
+                                      , jCourse :: CourseId
+                                      , jSender :: UserId
+                                      , jMailObjectUUID :: UUID
+                                      , jSubject :: Maybe Text
+                                      , jMailContent :: Html
+                                      }
   deriving (Eq, Ord, Show, Read, Generic, Typeable)
 data Notification = NotificationSubmissionRated { nSubmission :: SubmissionId }
                   | NotificationSheetActive { nSheet :: SheetId }
@@ -52,19 +59,6 @@ deriveJSON defaultOptions
   } ''Notification
 
 
-data Communication = Communication
- { cRecipients :: Set (Either UserEmail UserId)
- , cSubject :: Maybe Text
- , cBody :: Html
- } deriving (Eq, Ord, Read, Show, Generic, Typeable)
-
-instance Hashable Communication
-
-deriveJSON defaultOptions
-  { fieldLabelModifier = camelToPathPiece' 1
-  } ''Communication
-
-
 data JobCtl = JobCtlFlush
             | JobCtlPerform QueuedJobId
             | JobCtlDetermineCrontab
diff --git a/src/Mail.hs b/src/Mail.hs
index 008af9987..68d798336 100644
--- a/src/Mail.hs
+++ b/src/Mail.hs
@@ -7,7 +7,9 @@ module Mail
     module Network.Mail.Mime
     -- * MailT
   , MailT, defMailT
-  , MailSmtpData(..), MailContext(..), MailLanguages(..)
+  , MailSmtpData(..)
+  , _MailSmtpDataSet
+  , MailContext(..), MailLanguages(..)
   , MonadMail(..)
   , getMailMessageRender, getMailMsgRenderer
     -- * YesodMail
@@ -24,7 +26,8 @@ module Mail
   , MailObjectId
   , replaceMailHeader, addMailHeader, removeMailHeader
   , replaceMailHeaderI, addMailHeaderI
-  , setSubjectI, setMailObjectId, setMailObjectId'
+  , setSubjectI
+  , setMailObjectUUID, setMailObjectIdRandom, setMailObjectIdCrypto, setMailObjectIdPseudorandom
   , setDate, setDateCurrent
   , setMailSmtpData
   , _mailFrom, _mailTo, _mailCc, _mailBcc, _mailHeaders, _mailHeader, _mailParts
@@ -60,18 +63,19 @@ import qualified Data.Text.Lazy as LT
 import qualified Data.Text.Lazy.Builder as LTB
 import qualified Data.ByteString.Lazy as LBS
 
-import Utils (MsgRendererS(..))
+import Utils (MsgRendererS(..), MonadSecretBox(..))
 import Utils.Lens.TH
 import Control.Lens hiding (from)
+import Control.Lens.Extras (is)
 
 import Text.Blaze.Renderer.Utf8
 
 import Data.UUID (UUID)
 import qualified Data.UUID as UUID
-import qualified Data.UUID.V4 as UUID
 import Data.UUID.Cryptographic.ImplicitNamespace
 
 import Data.Binary (Binary)
+import qualified Data.Binary as Binary
 
 import GHC.TypeLits (KnownSymbol)
 
@@ -104,6 +108,12 @@ import Control.Monad.Trans.Maybe (MaybeT(..))
 import Data.CaseInsensitive (CI)
 import qualified Data.CaseInsensitive as CI
   
+import Control.Monad.Random (MonadRandom(..), evalRand, mkStdGen)
+import qualified Crypto.Saltine.Class as Saltine (IsEncoding(..))
+import qualified Data.ByteArray as ByteArray (convert)
+import Crypto.MAC.HMAC (hmac, HMAC)
+import Crypto.Hash.Algorithms (SHAKE128)
+
 
 makeLenses_ ''Mail
 makeLenses_ ''Part
@@ -131,6 +141,13 @@ instance Monoid (MailSmtpData) where
   mempty = memptydefault
   mappend = mappenddefault
 
+_MailSmtpDataSet :: Getter MailSmtpData Bool
+_MailSmtpDataSet = to $ \MailSmtpData{..} -> none id
+  [ is (_Wrapped . _Nothing) smtpEnvelopeFrom
+  , Set.null smtpRecipients
+  ]
+
+
 newtype MailLanguages = MailLanguages { mailLanguages :: [Lang] }
   deriving (Eq, Ord, Show, Read, Generic, Typeable)
   deriving newtype (FromJSON, ToJSON, IsList)
@@ -424,20 +441,33 @@ setMailObjectUUID uuid = do
   replaceMailHeader oidHeader . Just $ "<" <> objectId <> ">"
   return objectId
 
-setMailObjectId :: ( MonadHeader m
-                   , YesodMail (HandlerSite m)
-                   ) => m MailObjectId
-setMailObjectId = setMailObjectUUID =<< liftIO UUID.nextRandom
+setMailObjectIdRandom :: ( MonadHeader m
+                         , YesodMail (HandlerSite m)
+                         ) => m MailObjectId
+setMailObjectIdRandom = setMailObjectUUID =<< liftIO getRandom
 
-setMailObjectId' :: ( MonadHeader m
-                    , YesodMail (HandlerSite m)
-                    , MonadCrypto m
-                    , HasCryptoUUID plain m
-                    , MonadCryptoKey m ~ CryptoIDKey
-                    , KnownSymbol (CryptoIDNamespace UUID plain)
-                    , Binary plain
-                    ) => plain -> m MailObjectId
-setMailObjectId' oid = setMailObjectUUID . ciphertext =<< encrypt oid
+setMailObjectIdCrypto :: ( MonadHeader m
+                         , YesodMail (HandlerSite m)
+                         , MonadCrypto m
+                         , HasCryptoUUID plain m
+                         , MonadCryptoKey m ~ CryptoIDKey
+                         , KnownSymbol (CryptoIDNamespace UUID plain)
+                         , Binary plain
+                         ) => plain -> m MailObjectId
+setMailObjectIdCrypto oid = setMailObjectUUID . ciphertext =<< encrypt oid
+
+setMailObjectIdPseudorandom :: ( MonadHeader m
+                               , YesodMail (HandlerSite m)
+                               , Binary obj
+                               , MonadSecretBox m
+                               ) => obj -> m MailObjectId
+-- | Designed to leak no information about the `secretBoxKey` or the given object
+setMailObjectIdPseudorandom obj = do
+  sbKey <- secretBoxKey
+  let
+    seed :: HMAC (SHAKE128 64)
+    seed = hmac (Saltine.encode sbKey) . toStrict $ Binary.encode obj
+  setMailObjectUUID . evalRand getRandom . mkStdGen $ hash (ByteArray.convert seed :: ByteString)
 
 
 setDateCurrent :: (MonadHandler m, YesodMail (HandlerSite m)) => MailT m ()
diff --git a/src/Utils/Parameters.hs b/src/Utils/Parameters.hs
index 5d5335a98..727dfa04f 100644
--- a/src/Utils/Parameters.hs
+++ b/src/Utils/Parameters.hs
@@ -1,10 +1,10 @@
 module Utils.Parameters
   ( GlobalGetParam(..)
-  , lookupGlobalGetParam, hasGlobalGetParam
+  , lookupGlobalGetParam, hasGlobalGetParam, lookupGlobalGetParams
   , lookupGlobalGetParamForm, hasGlobalGetParamForm
   , globalGetParamField
   , GlobalPostParam(..)
-  , lookupGlobalPostParam, hasGlobalPostParam
+  , lookupGlobalPostParam, hasGlobalPostParam, lookupGlobalPostParams
   , lookupGlobalPostParamForm, hasGlobalPostParamForm
   , globalPostParamField
   ) where
@@ -33,6 +33,9 @@ lookupGlobalGetParam ident = (>>= fromPathPiece) <$> lookupGetParam (toPathPiece
 hasGlobalGetParam :: MonadHandler m => GlobalGetParam -> m Bool
 hasGlobalGetParam ident = isJust <$> lookupGetParam (toPathPiece ident)
 
+lookupGlobalGetParams :: (MonadHandler m, PathPiece result) => GlobalGetParam -> m [result]
+lookupGlobalGetParams ident = mapMaybe fromPathPiece <$> lookupGetParams (toPathPiece ident)
+
 
 lookupGlobalGetParamForm :: (Monad m, PathPiece result) => GlobalGetParam -> MForm m (Maybe result)
 lookupGlobalGetParamForm ident = runMaybeT $ do
@@ -42,7 +45,7 @@ lookupGlobalGetParamForm ident = runMaybeT $ do
 hasGlobalGetParamForm :: Monad m => GlobalGetParam -> MForm m Bool
 hasGlobalGetParamForm ident = maybe False (Map.member $ toPathPiece ident) <$> askParams
 
-globalGetParamField :: Monad m => GlobalPostParam -> Field m a -> MForm m (Maybe a)
+globalGetParamField :: Monad m => GlobalGetParam -> Field m a -> MForm m (Maybe a)
 globalGetParamField ident Field{fieldParse} = runMaybeT $ do
   ts <- fromMaybe [] . Map.lookup (toPathPiece ident) <$> MaybeT askParams
   fs <- fromMaybe [] . Map.lookup (toPathPiece ident) <$> MaybeT askFiles
@@ -62,7 +65,11 @@ lookupGlobalPostParam ident = (>>= fromPathPiece) <$> lookupPostParam (toPathPie
 
 hasGlobalPostParam :: MonadHandler m => GlobalPostParam -> m Bool
 hasGlobalPostParam ident = isJust <$> lookupPostParam (toPathPiece ident)
+  
+lookupGlobalPostParams :: (MonadHandler m, PathPiece result) => GlobalPostParam -> m [result]
+lookupGlobalPostParams ident = mapMaybe fromPathPiece <$> lookupPostParams (toPathPiece ident)
 
+  
 lookupGlobalPostParamForm :: (Monad m, PathPiece result) => GlobalPostParam -> MForm m (Maybe result)
 lookupGlobalPostParamForm ident = runMaybeT $ do
   ps <- MaybeT askParams

From 898a7a0b75397a8a0a03656204f4b802a7bdc5d3 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 16 Apr 2019 21:41:22 +0200
Subject: [PATCH 088/238] Don't generate bogus coverage in hlint.sh

---
 hlint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hlint.sh b/hlint.sh
index 0dbb0fa1b..74a2a9fb7 100755
--- a/hlint.sh
+++ b/hlint.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-exec -- ./test.sh uniworx:test:hlint
+exec -- stack build --test --fast --flag uniworx:dev --flag uniworx:library-only uniworx:test:hlint

From 60e95e8ef7bfe05c4f795e94ad834a5e2e7a3294 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 17 Apr 2019 11:35:27 +0200
Subject: [PATCH 089/238] Cleanup & (maybe|require)BearerToken

---
 config/settings.yml                  |   1 +
 messages/uniworx/de.msg              |   2 +
 package.yaml                         |   1 +
 src/Data/Aeson/Types/Instances.hs    |  10 +-
 src/Data/HashMap/Strict/Instances.hs |  16 +++
 src/Data/HashSet/Instances.hs        |  17 +++
 src/Data/NonNull/Instances.hs        |   8 ++
 src/Data/Time/Clock/Instances.hs     |  26 ++++
 src/Data/Vector/Instances.hs         |  18 +++
 src/Foundation.hs                    |  78 +++++++-----
 src/Handler/Admin.hs                 |   7 +-
 src/Handler/Course.hs                |  12 +-
 src/Handler/Profile.hs               |  11 +-
 src/Handler/Utils/Tokens.hs          |  27 +++++
 src/Import.hs                        |   1 -
 src/Import/NoFoundation.hs           |   9 ++
 src/Language/Haskell/TH/Instances.hs |  14 +++
 src/Mail.hs                          |   2 +
 src/Model/{Token.hs => Tokens.hs}    | 147 +++-------------------
 src/Model/Types.hs                   |   9 +-
 src/Settings.hs                      |  21 +++-
 src/Utils.hs                         |  21 ++++
 src/Utils/Lens.hs                    |  12 +-
 src/Utils/Tokens.hs                  | 174 +++++++++++++++++++++++++++
 24 files changed, 447 insertions(+), 197 deletions(-)
 create mode 100644 src/Data/HashMap/Strict/Instances.hs
 create mode 100644 src/Data/HashSet/Instances.hs
 create mode 100644 src/Data/Time/Clock/Instances.hs
 create mode 100644 src/Data/Vector/Instances.hs
 create mode 100644 src/Handler/Utils/Tokens.hs
 create mode 100644 src/Language/Haskell/TH/Instances.hs
 rename src/Model/{Token.hs => Tokens.hs} (51%)
 create mode 100644 src/Utils/Tokens.hs

diff --git a/config/settings.yml b/config/settings.yml
index 9479d002a..287baf0b3 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -28,6 +28,7 @@ notification-collate-delay: 300
 notification-expiration: 259201
 session-timeout: 7200
 jwt-expiration: 604800
+jwt-encoding: HS256
 maximum-content-length: 52428800
 
 log-settings:
diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index fb521065d..c42f8cb0c 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -214,6 +214,8 @@ UnauthorizedTokenExpired: Ihr Authorisierungs-Token ist abgelaufen.
 UnauthorizedTokenNotStarted: Ihr Authorisierungs-Token ist noch nicht gültig.
 UnauthorizedTokenInvalid: Ihr Authorisierungs-Token konnte nicht verarbeitet werden.
 UnauthorizedTokenInvalidRoute: Ihr Authorisierungs-Token ist auf dieser Unterseite nicht gültig.
+UnauthorizedTokenInvalidAuthority: Ihr Authorisierungs-Token basiert auf den Rechten eines Nutzers, der nicht mehr existiert.
+UnauthorizedToken404: Authorisierungs-Tokens können nicht auf Fehlerseiten ausgewertet werden.
 UnauthorizedSiteAdmin: Sie sind kein System-weiter Administrator.
 UnauthorizedSchoolAdmin: Sie sind nicht als Administrator für dieses Institut eingetragen.
 UnauthorizedAdminEscalation: Sie sind nicht Administrator für alle Institute, für die dieser Nutzer Administrator oder Veranstalter ist.
diff --git a/package.yaml b/package.yaml
index f6d487376..47917503c 100644
--- a/package.yaml
+++ b/package.yaml
@@ -85,6 +85,7 @@ dependencies:
   - scientific
   - tz
   - system-locale
+  - th-lift
   - th-lift-instances
   - gitrev
   - Glob
diff --git a/src/Data/Aeson/Types/Instances.hs b/src/Data/Aeson/Types/Instances.hs
index f785576f2..66ff1df61 100644
--- a/src/Data/Aeson/Types/Instances.hs
+++ b/src/Data/Aeson/Types/Instances.hs
@@ -6,9 +6,17 @@ module Data.Aeson.Types.Instances
 
 import ClassyPrelude
 
-import Data.Aeson.Types (Parser)
+import Data.Aeson.Types (Parser, Value)
 import Control.Monad.Catch
 
+import Data.Binary (Binary)
+
+import Data.HashMap.Strict.Instances ()
+import Data.Vector.Instances ()
+
 
 instance MonadThrow Parser where
   throwM = fail . show
+
+
+instance Binary Value
diff --git a/src/Data/HashMap/Strict/Instances.hs b/src/Data/HashMap/Strict/Instances.hs
new file mode 100644
index 000000000..7d56f03a8
--- /dev/null
+++ b/src/Data/HashMap/Strict/Instances.hs
@@ -0,0 +1,16 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Data.HashMap.Strict.Instances
+  (
+  ) where
+
+import ClassyPrelude
+
+import Data.Binary (Binary(..))
+import Data.HashMap.Strict (HashMap)
+import qualified Data.HashMap.Strict as HashMap
+
+
+instance (Binary k, Binary v, Hashable k, Eq k) => Binary (HashMap k v) where
+  put = put . HashMap.toList
+  get = HashMap.fromList <$> get
diff --git a/src/Data/HashSet/Instances.hs b/src/Data/HashSet/Instances.hs
new file mode 100644
index 000000000..3fc16cd43
--- /dev/null
+++ b/src/Data/HashSet/Instances.hs
@@ -0,0 +1,17 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Data.HashSet.Instances
+  (
+  ) where
+
+import ClassyPrelude
+
+import Data.HashSet (HashSet)
+import qualified Data.HashSet as HashSet
+
+import Data.Binary (Binary(..))
+
+
+instance (Binary a, Hashable a, Eq a) => Binary (HashSet a) where
+  get = HashSet.fromList <$> get
+  put = put . HashSet.toList
diff --git a/src/Data/NonNull/Instances.hs b/src/Data/NonNull/Instances.hs
index 1a11a66d9..55981d6ff 100644
--- a/src/Data/NonNull/Instances.hs
+++ b/src/Data/NonNull/Instances.hs
@@ -8,6 +8,9 @@ import ClassyPrelude
 
 import Data.Aeson
 
+import Data.Binary (Binary)
+import qualified Data.Binary as Binary
+
 
 instance ToJSON a => ToJSON (NonNull a) where
   toJSON = toJSON . toNullable
@@ -18,3 +21,8 @@ instance (FromJSON a, MonoFoldable a) => FromJSON (NonNull a) where
 
 instance Hashable a => Hashable (NonNull a) where
   hashWithSalt s = hashWithSalt s . toNullable
+
+
+instance (Binary a, MonoFoldable a) => Binary (NonNull a) where
+  get = Binary.get >>= maybe (fail "Expected non-empty structure") return . fromNullable
+  put = Binary.put . toNullable
diff --git a/src/Data/Time/Clock/Instances.hs b/src/Data/Time/Clock/Instances.hs
new file mode 100644
index 000000000..1783ac465
--- /dev/null
+++ b/src/Data/Time/Clock/Instances.hs
@@ -0,0 +1,26 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Data.Time.Clock.Instances
+  (
+  ) where
+
+import ClassyPrelude
+
+import Data.Time.Clock
+
+import Data.Binary (Binary)
+import qualified Data.Binary as Binary
+
+
+deriving instance Generic UTCTime
+
+
+instance Binary Day where
+  get = ModifiedJulianDay <$> Binary.get
+  put = Binary.put . toModifiedJulianDay
+
+instance Binary DiffTime where
+  get = fromRational <$> Binary.get
+  put = Binary.put . toRational
+  
+instance Binary UTCTime
diff --git a/src/Data/Vector/Instances.hs b/src/Data/Vector/Instances.hs
new file mode 100644
index 000000000..953130328
--- /dev/null
+++ b/src/Data/Vector/Instances.hs
@@ -0,0 +1,18 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Data.Vector.Instances
+  (
+  ) where
+
+import ClassyPrelude
+
+import Data.Vector (Vector)
+import qualified Data.Vector as Vector
+
+import Data.Binary (Binary)
+import qualified Data.Binary as Binary
+
+
+instance Binary a => Binary (Vector a) where
+  get = Vector.fromList <$> Binary.get
+  put = Binary.put . Vector.toList
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 40dc1246c..cc919e8b4 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -15,7 +15,6 @@ import Auth.LDAP
 import Auth.PWHash
 import Auth.Dummy
 import Jobs.Types
-import Model.Token
 
 import qualified Network.Wai as W (pathInfo)
 
@@ -57,7 +56,7 @@ import Data.Conduit.List (sourceList)
 
 import qualified Database.Esqueleto as E
 
-import Control.Monad.Except (MonadError(..), runExceptT)
+import Control.Monad.Except (MonadError(..), ExceptT, runExceptT)
 import Control.Monad.Trans.Maybe (MaybeT(..))
 import Control.Monad.Trans.Reader (runReader, mapReaderT)
 import Control.Monad.Trans.Writer (WriterT(..), runWriterT)
@@ -152,7 +151,7 @@ mkYesodData "UniWorX" $(parseRoutesFile "routes")
 deriving instance Generic (Route UniWorX)
 
 -- | Convenient Type Synonyms:
-type DB a = YesodDB UniWorX a
+type DB = YesodDB UniWorX
 type Form x = Html -> MForm (HandlerT UniWorX IO) (FormResult x, Widget)
 type MsgRenderer = MsgRendererS UniWorX -- see Utils
 type MailM a = MailT (HandlerT UniWorX IO) a
@@ -403,12 +402,6 @@ newtype InvalidAuthTag = InvalidAuthTag Text
   deriving (Eq, Ord, Show, Read, Generic, Typeable)
 instance Exception InvalidAuthTag
 
-data SessionAuthTags = SessionActiveAuthTags | SessionInactiveAuthTags
-  deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic)
-instance Universe SessionAuthTags
-instance Finite SessionAuthTags
-nullaryPathPiece ''SessionAuthTags (camelToPathPiece' 1)
-
 
 data AccessPredicate
   = APPure     (Maybe (AuthId UniWorX) -> Route UniWorX -> Bool -> Reader MsgRenderer AuthResult)
@@ -453,6 +446,47 @@ trueAP  = APPure . const . const . const $ trueAR <$> ask
 falseAP = APPure . const . const . const $ falseAR <$> ask -- included for completeness
 
 
+askTokenUnsafe :: forall m.
+                  ( MonadHandler m
+                  , HandlerSite m ~ UniWorX
+                  , MonadLogger m
+                  , MonadCatch m
+                  )
+               => ExceptT AuthResult m (BearerToken (UniWorX))
+-- | This performs /no/ meaningful validation of the `BearerToken`
+--
+-- Use `Handler.Utils.Tokens.requireBearerToken` or `Handler.Utils.Tokens.maybeBearerToken` instead
+askTokenUnsafe = $cachedHere $ do
+  jwt <- maybeMExceptT (unauthorizedI MsgUnauthorizedNoToken) askJwt
+  catch (decodeToken jwt) $ \case
+    BearerTokenExpired -> throwError =<< unauthorizedI MsgUnauthorizedTokenExpired
+    BearerTokenNotStarted -> throwError =<< unauthorizedI MsgUnauthorizedTokenNotStarted
+    other -> do
+      $logWarnS "AuthToken" $ tshow other
+      throwError =<< unauthorizedI MsgUnauthorizedTokenInvalid
+
+validateToken :: Maybe (AuthId UniWorX) -> Route UniWorX -> Bool -> BearerToken UniWorX -> DB AuthResult
+validateToken mAuthId' route' isWrite' token' = runCachedMemoT $ for4 memo validateToken' mAuthId' route' isWrite' token'
+  where
+    validateToken' :: _ -> _ -> _ -> _ -> CachedMemoT (Maybe (AuthId UniWorX), Route UniWorX, Bool, BearerToken UniWorX) AuthResult DB AuthResult
+    validateToken' mAuthId route isWrite BearerToken{..} = lift . exceptT return return $ do
+      guardMExceptT (maybe True (HashSet.member route) tokenRoutes) (unauthorizedI MsgUnauthorizedTokenInvalidRoute)
+
+      User{userTokensIssuedAfter} <- maybeMExceptT (unauthorizedI MsgUnauthorizedTokenInvalidAuthority) $ get tokenAuthority
+      guardMExceptT (Just tokenIssuedAt >= userTokensIssuedAfter) (unauthorizedI MsgUnauthorizedTokenExpired)
+
+      authorityVal <- do
+        dnf <- either throwM return $ routeAuthTags route
+        fmap fst . runWriterT $ evalAuthTags (AuthTagActive $ (/=) AuthToken) dnf (Just tokenAuthority) route isWrite
+      guardExceptT (is _Authorized authorityVal) authorityVal
+
+      whenIsJust tokenAddAuth $ \addDNF -> do
+        additionalVal <- fmap fst . runWriterT $ evalAuthTags (AuthTagActive $ (/=) AuthToken) addDNF mAuthId route isWrite
+        guardExceptT (is _Authorized additionalVal) additionalVal
+
+      return Authorized
+
+
 tagAccessPredicate :: AuthTag -> AccessPredicate
 tagAccessPredicate AuthFree = trueAP
 tagAccessPredicate AuthAdmin = APDB $ \mAuthId route _ -> case route of
@@ -474,30 +508,8 @@ tagAccessPredicate AuthAdmin = APDB $ \mAuthId route _ -> case route of
     adrights <- lift $ selectFirst [UserAdminUser ==. authId] []
     guardMExceptT (isJust adrights) (unauthorizedI MsgUnauthorizedSiteAdmin)
     return Authorized
-tagAccessPredicate AuthToken = APDB $ \mAuthId route isWrite -> exceptT return return $ do
-  jwt <- maybeMExceptT (unauthorizedI MsgUnauthorizedNoToken) askJwt
-  BearerToken{..} <- catch (decodeToken jwt) $ \case
-    BearerTokenExpired -> throwError =<< unauthorizedI MsgUnauthorizedTokenExpired
-    BearerTokenNotStarted -> throwError =<< unauthorizedI MsgUnauthorizedTokenNotStarted
-    other -> do
-      $logWarnS "AuthToken" $ tshow other
-      throwError =<< unauthorizedI MsgUnauthorizedTokenInvalid
-
-  guardMExceptT (maybe True (HashSet.member route) tokenRoutes) (unauthorizedI MsgUnauthorizedTokenInvalidRoute)
-
-  User{userTokensIssuedAfter} <- lift $ get404 tokenAuthority
-  guardMExceptT (Just tokenIssuedAt >= userTokensIssuedAfter) (unauthorizedI MsgUnauthorizedTokenExpired)
-
-  authorityVal <- do
-    dnf <- either throwM return $ routeAuthTags route
-    fmap fst . runWriterT $ evalAuthTags (AuthTagActive $ (/=) AuthToken) dnf (Just tokenAuthority) route isWrite
-  guardExceptT (is _Authorized authorityVal) authorityVal
-
-  whenIsJust tokenAddAuth $ \addDNF -> do
-    additionalVal <- fmap fst . runWriterT $ evalAuthTags (AuthTagActive $ (/=) AuthToken) addDNF mAuthId route isWrite
-    guardExceptT (is _Authorized additionalVal) additionalVal
-
-  return Authorized
+tagAccessPredicate AuthToken = APDB $ \mAuthId route isWrite -> exceptT return return $
+  lift . validateToken mAuthId route isWrite =<< askTokenUnsafe
 tagAccessPredicate AuthNoEscalation = APDB $ \mAuthId route _ -> case route of
   AdminHijackUserR cID -> exceptT return return $ do
     myUid <- maybeExceptT AuthenticationRequired $ return mAuthId
diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs
index 4e4b07eee..32f8db822 100644
--- a/src/Handler/Admin.hs
+++ b/src/Handler/Admin.hs
@@ -286,9 +286,6 @@ instance Button UniWorX ButtonAdminStudyTerms where
   btnClasses BtnCandidatesDeleteAll       = [BCIsButton, BCDanger]
 -- END Button needed only here
 
-sessionKeyNewStudyTerms :: Text
-sessionKeyNewStudyTerms = "key-new-study-terms"
-
 getAdminFeaturesR, postAdminFeaturesR :: Handler Html
 getAdminFeaturesR = postAdminFeaturesR
 postAdminFeaturesR = do
@@ -304,7 +301,7 @@ postAdminFeaturesR = do
         unless (null infAmbiguous) . addMessageI Info . MsgAmbiguousCandidatesRemoved $ length infAmbiguous
         unless (null infRedundant) . addMessageI Info . MsgRedundantCandidatesRemoved $ length infRedundant
         let newKeys = map (StudyTermsKey' . fst) infAccepted
-        setSessionJson sessionKeyNewStudyTerms newKeys
+        setSessionJson SessionNewStudyTerms newKeys
         if  | null infAccepted
               -> addMessageI Info      MsgNoCandidatesInferred
             | otherwise
@@ -322,7 +319,7 @@ postAdminFeaturesR = do
         Candidates.conflicts
       _other -> runDB Candidates.conflicts
 
-    newStudyTermKeys <- fromMaybe [] <$> lookupSessionJson sessionKeyNewStudyTerms
+    newStudyTermKeys <- fromMaybe [] <$> lookupSessionJson SessionNewStudyTerms
     (   (degreeResult,degreeTable)
       , (studyTermsResult,studytermsTable)
       , ((), candidateTable)) <- runDB $ (,,)
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 848faf0e7..c084c139f 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -1104,26 +1104,18 @@ postCLecInviteR tid ssh csh email = do
     iRes <- getBy404 $ UniqueLecturerInvitation email cid
     return (cRes, iRes)
 
-  ((btnResult, btnInnerWidget), btnEncoding) <- runFormPost $ \csrf -> do
+  ((btnResult, btnInnerWidget), btnEncoding) <- runFormPost . formEmbedJwtPost $ \csrf -> do
     (ltRes, ltView) <- case lecturerInvitationType of
       Nothing -> mreq (selectField optionsFinite) "" Nothing
       Just lType -> mforced (selectField optionsFinite) "" lType
     (btnRes, btnWdgt) <- buttonForm mempty
     return ((,) <$> ltRes <*> btnRes, toWidget csrf <> fvInput ltView <> btnWdgt)
-  mJwt <- askJwt
 
-  let btnWidget = wrapForm btnInnerWidget' def
+  let btnWidget = wrapForm btnInnerWidget def
         { formEncoding = btnEncoding
         , formAction = Just . SomeRoute . CourseR tid ssh csh $ CLecInviteR email
         , formSubmit = FormNoSubmit
         }
-      btnInnerWidget'
-        = [whamlet|
-            $newline never
-            $maybe jwt <- mJwt
-              <input type=hidden name=#{toPathPiece PostBearer} value=#{toPathPiece jwt}>
-            ^{btnInnerWidget}
-          |]
 
   formResult btnResult $ \case
     (lType, BtnLecInvAccept) -> do
diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs
index 71e718da9..aa1593ea2 100644
--- a/src/Handler/Profile.hs
+++ b/src/Handler/Profile.hs
@@ -587,21 +587,14 @@ postUserNotificationR cID = do
   uid <- decrypt cID
   User{userNotificationSettings, userDisplayName} <- runDB $ get404 uid
 
-  ((nsRes, nsInnerWdgt), nsEnc) <- runFormPost . renderAForm FormStandard . notificationForm $ Just userNotificationSettings
+  ((nsRes, nsInnerWdgt), nsEnc) <- runFormPost . formEmbedJwtPost . renderAForm FormStandard . notificationForm $ Just userNotificationSettings
   mJwt <- askJwt
   isModal <- hasCustomHeader HeaderIsModal
-  let formWidget = wrapForm nsInnerWdgt' def
+  let formWidget = wrapForm nsInnerWdgt def
         { formAction = Just . SomeRoute $ UserNotificationR cID
         , formEncoding = nsEnc
         , formAttrs = [ ("data-ajax-submit", "") | isModal ]
         }
-      nsInnerWdgt'
-        = [whamlet|
-            $newline never
-            $maybe jwt <- mJwt
-              <input type=hidden name=#{toPathPiece PostBearer} value=#{toPathPiece jwt}>
-            ^{nsInnerWdgt}
-          |]
 
   formResultModal nsRes (UserNotificationR cID, [ (toPathPiece GetBearer, toPathPiece jwt) | Just jwt <- pure mJwt ]) $ \ns -> do
     lift . runDB $ update uid [ UserNotificationSettings =. ns ]
diff --git a/src/Handler/Utils/Tokens.hs b/src/Handler/Utils/Tokens.hs
new file mode 100644
index 000000000..00a0cdbe7
--- /dev/null
+++ b/src/Handler/Utils/Tokens.hs
@@ -0,0 +1,27 @@
+module Handler.Utils.Tokens
+  ( maybeBearerToken, requireBearerToken
+  ) where
+
+import Import
+
+import Utils.Lens
+
+import Control.Monad.Trans.Maybe (runMaybeT)
+
+
+maybeBearerToken :: (MonadHandler m, HandlerSite m ~ UniWorX, MonadCatch m) => m (Maybe (BearerToken UniWorX))
+maybeBearerToken = runMaybeT $ catchIfMaybeT cPred requireBearerToken
+  where
+    cPred err = any ($ err)
+      [ is $ _HCError . _PermissionDenied
+      , is $ _HCError . _NotAuthenticated
+      ]
+
+requireBearerToken :: (MonadHandler m, HandlerSite m ~ UniWorX) => m (BearerToken UniWorX)
+requireBearerToken = liftHandlerT $ do
+  token <- exceptT (guardAuthResult >=> error "askToken should not throw `Authorized`") return $ askTokenUnsafe
+  mAuthId <- maybeAuthId
+  currentRoute <- maybe (permissionDeniedI MsgUnauthorizedToken404) return =<< getCurrentRoute
+  isWrite <- isWriteRequest currentRoute
+  guardAuthResult <=< runDB $ validateToken mAuthId currentRoute isWrite token
+  return token
diff --git a/src/Import.hs b/src/Import.hs
index 9743e86ac..27dc6e5df 100644
--- a/src/Import.hs
+++ b/src/Import.hs
@@ -6,4 +6,3 @@ import Foundation            as Import
 import Import.NoFoundation   as Import
 
 import Utils.SystemMessage   as Import
-import Model.Token           as Import
diff --git a/src/Import/NoFoundation.hs b/src/Import/NoFoundation.hs
index 2c89df2a1..9b7114837 100644
--- a/src/Import/NoFoundation.hs
+++ b/src/Import/NoFoundation.hs
@@ -9,6 +9,7 @@ import Model.Types.JSON       as Import
 import Model.Migration        as Import
 import Model.Rating           as Import
 import Model.Submission       as Import
+import Model.Tokens           as Import
 import Settings               as Import
 import Settings.StaticFiles   as Import
 import Yesod.Auth             as Import
@@ -20,6 +21,10 @@ import Utils.Frontend.I18n    as Import
 import Yesod.Core.Json        as Import (provideJson)
 import Yesod.Core.Types.Instances as Import (CachedMemoT(..))
 
+import Language.Haskell.TH.Instances as Import ()
+
+import Utils.Tokens           as Import
+
 
 import Data.Fixed             as Import
 
@@ -49,6 +54,10 @@ import Data.Text.Encoding.Error as Import(UnicodeException(..))
 import Data.Semigroup         as Import (Semigroup)
 import Data.Monoid            as Import (Last(..), First(..))
 import Data.Monoid.Instances  as Import ()
+import Data.HashMap.Strict.Instances as Import ()
+import Data.HashSet.Instances as Import ()
+import Data.Vector.Instances  as Import ()
+import Data.Time.Clock.Instances as Import ()
 
 import Data.Binary            as Import (Binary)
 
diff --git a/src/Language/Haskell/TH/Instances.hs b/src/Language/Haskell/TH/Instances.hs
new file mode 100644
index 000000000..48c419705
--- /dev/null
+++ b/src/Language/Haskell/TH/Instances.hs
@@ -0,0 +1,14 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Language.Haskell.TH.Instances
+  (
+  ) where
+
+import Language.Haskell.TH
+import Language.Haskell.TH.Lift (deriveLift)
+import Data.Binary (Binary)
+
+
+instance Binary Loc
+
+deriveLift ''Loc
diff --git a/src/Mail.hs b/src/Mail.hs
index 008af9987..283de2deb 100644
--- a/src/Mail.hs
+++ b/src/Mail.hs
@@ -27,6 +27,7 @@ module Mail
   , setSubjectI, setMailObjectId, setMailObjectId'
   , setDate, setDateCurrent
   , setMailSmtpData
+  , _addressName, _addressEmail
   , _mailFrom, _mailTo, _mailCc, _mailBcc, _mailHeaders, _mailHeader, _mailParts
   , _partType, _partEncoding, _partFilename, _partHeaders, _partContent
   ) where
@@ -105,6 +106,7 @@ import Data.CaseInsensitive (CI)
 import qualified Data.CaseInsensitive as CI
   
 
+makeLenses_ ''Address
 makeLenses_ ''Mail
 makeLenses_ ''Part
 
diff --git a/src/Model/Token.hs b/src/Model/Tokens.hs
similarity index 51%
rename from src/Model/Token.hs
rename to src/Model/Tokens.hs
index e3b3148cf..2b445eb99 100644
--- a/src/Model/Token.hs
+++ b/src/Model/Tokens.hs
@@ -1,28 +1,23 @@
 {-# LANGUAGE UndecidableInstances #-}
 
-module Model.Token
+module Model.Tokens
   ( BearerToken(..)
   , _tokenIdentifier, _tokenAuthority, _tokenRoutes, _tokenAddAuth, _tokenRestrictions, _tokenRestrictionIx, _tokenRestrictionAt, _tokenIssuedAt, _tokenIssuedBy, _tokenExpiresAt, _tokenStartsAt
   , tokenRestrict
-  , bearerToken
-  , encodeToken, BearerTokenException(..), decodeToken, jwtEncoding
-  , tokenToJSON, tokenParseJSON, tokenParseJSON'
-  , askJwt
+  , tokenToJSON, tokenParseJSON
   ) where
 
 import ClassyPrelude.Yesod
+import Yesod.Core.Instances ()
+  
 import Model
-import Settings
-import Utils (NTop(..), hoistMaybe, assertM')
+import Utils (assertM')
 import Utils.Lens hiding ((.=))
 import Data.Aeson.Lens (AsJSON(..))
-import Utils.Parameters
 
 import Yesod.Auth (AuthId)
 
-import qualified Jose.Jwa as Jose
-import Jose.Jwk (JwkSet(..))
-import Jose.Jwt (Jwt(..), IntDate(..))
+import Jose.Jwt (IntDate(..))
 import qualified Jose.Jwt as Jose
 
 import Jose.Jwt.Instances ()
@@ -31,21 +26,20 @@ import Data.Aeson.Types.Instances ()
 import Data.HashSet (HashSet)
 
 import qualified Data.HashMap.Strict as HashMap
+import Data.HashMap.Strict.Instances ()
+import Data.HashSet.Instances ()
+import Data.Time.Clock.Instances ()
 
-import Data.Aeson.Types (Parser, (.:?), (.:), (.!=))
+import Data.Aeson.Types (Parser, (.:?), (.:), (.!=), (.=))
 import qualified Data.Aeson as JSON
 import qualified Data.Aeson.Types as JSON
-import qualified Data.Aeson.Parser as JSON
-import qualified Data.Aeson.Parser.Internal as JSON (jsonEOF')
-import qualified Data.Aeson.Internal as JSON (iparse, formatError)
 
 import CryptoID
 
-import Data.Time.Clock
 import Data.Time.Clock.POSIX
 
-import Control.Monad.Random (MonadRandom(..))
-import Control.Monad.Trans.Maybe (MaybeT(..))
+import Data.Binary (Binary)
+
 
 
 -- | Presenting a `BearerToken` transfers some authorisation from `tokenAuthority` to /whoever/ presents the token
@@ -72,6 +66,8 @@ deriving instance (Eq (AuthId site), Eq (Route site)) => Eq (BearerToken site)
 deriving instance (Read (AuthId site), Eq (Route site), Hashable (Route site), Read (Route site)) => Read (BearerToken site)
 deriving instance (Show (AuthId site), Show (Route site)) => Show (BearerToken site)
 
+instance (Binary (AuthId site), Binary (Route site), Hashable (Route site), Eq (Route site)) => Binary (BearerToken site)
+
 makeLenses_ ''BearerToken
 
 _tokenRestrictionIx :: (FromJSON a, ToJSON a, Hashable (Route site), Eq (Route site)) => Route site -> Traversal' (BearerToken site) a
@@ -130,7 +126,7 @@ tokenParseJSON :: forall site.
 --
 -- Monadic context is needed because `AuthId`s are encrypted during encoding
 --
--- It's usually easier to use `tokenParseJSON'`
+-- It's usually easier to use `Utils.Tokens.tokenParseJSON'`
 tokenParseJSON v@(Object o) = do
   tokenAuthority' <- lift (o .: "authority") :: ReaderT CryptoIDKey Parser (CryptoUUID (AuthId site))
   tokenAuthority <- decrypt tokenAuthority'
@@ -151,116 +147,3 @@ tokenParseJSON v@(Object o) = do
   return BearerToken{..}
 tokenParseJSON v = lift $ JSON.typeMismatch "BearerToken" v
 
-tokenParseJSON' :: forall m.
-                  ( HasCryptoUUID (AuthId (HandlerSite m)) (ReaderT CryptoIDKey Parser)
-                  , ParseRoute (HandlerSite m)
-                  , Hashable (Route (HandlerSite m))
-                  , MonadHandler m
-                  , MonadCrypto m
-                  , MonadCryptoKey m ~ CryptoIDKey
-                  )
-               => m (Value -> Parser (BearerToken (HandlerSite m)))
--- ^ Read `CryptoIDKey` from monadic context and construct a `Parser` for `BearerToken`s
-tokenParseJSON' = do
-  cidKey <- cryptoIDKey return
-  return $ flip runReaderT cidKey . tokenParseJSON
-
-
-bearerToken :: forall m.
-               ( MonadHandler m
-               , HasInstanceID (HandlerSite m) InstanceId
-               , HasCryptoUUID (AuthId (HandlerSite m)) m
-               , HasAppSettings (HandlerSite m)
-               )
-            => AuthId (HandlerSite m)
-            -> Maybe (HashSet (Route (HandlerSite m)))
-            -> Maybe AuthDNF
-            -> Maybe (Maybe UTCTime) -- ^ @Nothing@ determines default expiry time automatically
-            -> Maybe UTCTime -- ^ @Nothing@ means token starts to be valid immediately
-            -> m (BearerToken (HandlerSite m))
--- ^ Smart constructor for `BearerToken`, does not set route restrictions (due to polymorphism), use `tokenRestrict`
-bearerToken tokenAuthority tokenRoutes tokenAddAuth mTokenExpiresAt tokenStartsAt = do
-  tokenIdentifier <- liftIO getRandom
-  tokenIssuedAt <- liftIO getCurrentTime
-  tokenIssuedBy <- getsYesod $ view instanceID
-
-  defaultExpiration <- getsYesod $ view _appJWTExpiration
-  
-  let tokenExpiresAt
-        | Just t <- mTokenExpiresAt
-        = t
-        | Just tDiff <- defaultExpiration
-        = Just $ tDiff `addUTCTime` fromMaybe tokenIssuedAt tokenStartsAt
-        | otherwise
-        = Nothing
-      tokenRestrictions = HashMap.empty
-
-  return BearerToken{..}
-
-
-jwtEncoding :: Jose.JwtEncoding
--- ^ How should `Jwt`s be signed and/or encrypted?
-jwtEncoding = Jose.JwsEncoding Jose.HS256
-
-
-encodeToken :: forall m.
-               ( MonadHandler m
-               , HasJSONWebKeySet (HandlerSite m) JwkSet
-               , HasInstanceID (HandlerSite m) InstanceId
-               , HasCryptoUUID (AuthId (HandlerSite m)) m
-               , RenderRoute (HandlerSite m)
-               )
-            => BearerToken (HandlerSite m) -> m Jwt
--- ^ Call `tokenToJSON` and encode the result as a `Jwt` according to `jwtEncoding`
-encodeToken token = do
-  payload <- Jose.Claims . toStrict . JSON.encode <$> tokenToJSON token
-  JwkSet jwks <- getsYesod $ view jsonWebKeySet
-  either throwM return =<< liftIO (Jose.encode jwks jwtEncoding payload)
-
-
-data BearerTokenException
-  = BearerTokenJwtError Jose.JwtError -- ^ An Error occurred in the underlying `Jwt`-Implementation
-  | BearerTokenUnsecured -- ^ `Jwt` is insufficiently secured (unsigned and not encrypted)
-  | BearerTokenInvalidFormat String -- ^ Content of the `Jwt` could not be parsed as a `BearerToken`
-  | BearerTokenExpired | BearerTokenNotStarted
-  deriving (Eq, Show, Generic, Typeable)
-
-instance Exception BearerTokenException
-
-decodeToken :: forall m.
-               ( MonadHandler m
-               , HasJSONWebKeySet (HandlerSite m) JwkSet
-               , HasCryptoUUID (AuthId (HandlerSite m)) (ReaderT CryptoIDKey Parser)
-               , MonadCryptoKey m ~ CryptoIDKey
-               , MonadCrypto m
-               , MonadThrow m
-               , ParseRoute (HandlerSite m)
-               , Hashable (Route (HandlerSite m))
-               )
-            => Jwt -> m (BearerToken (HandlerSite m))
--- ^ Decode a `Jwt` according to `jwtEncoding` and call `tokenParseJSON`
-decodeToken (Jwt bs) = do
-  JwkSet jwks <- getsYesod $ view jsonWebKeySet
-  content <- either (throwM . BearerTokenJwtError) return =<< liftIO (Jose.decode jwks Nothing bs)
-  content' <- case content of
-    Jose.Unsecured _ -> throwM BearerTokenUnsecured
-    Jose.Jws (_header, payload) -> return payload
-    Jose.Jwe (_header, payload) -> return payload
-  parser <- tokenParseJSON'
-  token@BearerToken{..} <- either (throwM . BearerTokenInvalidFormat . uncurry JSON.formatError) return $ JSON.eitherDecodeStrictWith JSON.jsonEOF' (JSON.iparse parser) content'
-  now <- liftIO getCurrentTime
-  unless (NTop tokenExpiresAt > NTop (Just now)) $
-    throwM BearerTokenExpired
-  unless (tokenStartsAt <= Just now) $
-    throwM BearerTokenNotStarted
-  return token
-
-
-askJwt :: forall m. ( MonadHandler m )
-       => m (Maybe Jwt)
--- ^ Retrieve current `Jwt` from HTTP-Header, POST-Parameter, or GET-Parameter
-askJwt = runMaybeT $ asum
-  [ MaybeT lookupBearerAuth >>= hoistMaybe . fromPathPiece
-  , MaybeT $ lookupGlobalPostParam PostBearer
-  , MaybeT $ lookupGlobalGetParam GetBearer
-  ]
diff --git a/src/Model/Types.hs b/src/Model/Types.hs
index 00bda42a1..3978399b4 100644
--- a/src/Model/Types.hs
+++ b/src/Model/Types.hs
@@ -81,6 +81,7 @@ import Model.Types.Wordlist
 import Data.Text.Metrics (damerauLevenshtein)
 
 import Data.Binary (Binary)
+import qualified Data.Binary as Binary
   
 
 instance PathPiece UUID where
@@ -795,6 +796,8 @@ instance PathPiece a => PathPiece (PredLiteral a) where
   fromPathPiece t = PLVariable <$> fromPathPiece t
                 <|> PLNegated <$> (Text.stripPrefix "¬" t >>= fromPathPiece)
 
+instance Binary a => Binary (PredLiteral a)
+
 
 newtype PredDNF a = PredDNF { dnfTerms :: Set (NonNull (Set (PredLiteral a))) }
   deriving (Eq, Ord, Read, Show, Generic, Typeable)
@@ -802,11 +805,15 @@ newtype PredDNF a = PredDNF { dnfTerms :: Set (NonNull (Set (PredLiteral a))) }
 
 $(return [])
 
-instance (Ord a, ToJSON a) => ToJSON (PredDNF a) where
+instance ToJSON a => ToJSON (PredDNF a) where
   toJSON = $(mkToJSON predNFAesonOptions ''PredDNF)
 instance (Ord a, FromJSON a) => FromJSON (PredDNF a) where
   parseJSON = $(mkParseJSON predNFAesonOptions ''PredDNF)
 
+instance (Ord a, Binary a) => Binary (PredDNF a) where
+  get = PredDNF <$> Binary.get
+  put = Binary.put . dnfTerms
+
 type AuthLiteral = PredLiteral AuthTag
 
 type AuthDNF = PredDNF AuthTag
diff --git a/src/Settings.hs b/src/Settings.hs
index ae2ce4b30..47e0b25e8 100644
--- a/src/Settings.hs
+++ b/src/Settings.hs
@@ -63,6 +63,9 @@ import Control.Monad.Trans.Maybe (MaybeT(..))
 
 import qualified System.FilePath as FilePath
 
+import Jose.Jwt (JwtEncoding(..))
+
+
 -- | Runtime settings to configure this application. These settings can be
 -- loaded from various sources: defaults, environment variables, config files,
 -- theoretically even a database.
@@ -100,7 +103,8 @@ data AppSettings = AppSettings
     , appNotificationExpiration :: NominalDiffTime
     , appSessionTimeout         :: NominalDiffTime
     , appMaximumContentLength   :: Maybe Word64
-    , appJWTExpiration          :: Maybe NominalDiffTime
+    , appJwtExpiration          :: Maybe NominalDiffTime
+    , appJwtEncoding            :: JwtEncoding
 
     , appInitialLogSettings     :: LogSettings
 
@@ -311,6 +315,18 @@ deriveFromJSON
     }
   ''SmtpAuthConf
 
+instance FromJSON JwtEncoding where
+  parseJSON v@(String _) = JwsEncoding <$> parseJSON v
+  parseJSON v = flip (withObject "JwtEncoding") v $ \obj -> asum
+    [ do
+        alg <- obj .: "alg"
+        return $ JwsEncoding alg
+    , do
+        alg <- obj .: "alg"
+        enc <- obj .: "enc"
+        return $ JweEncoding alg enc
+    ]
+
 
 instance FromJSON AppSettings where
     parseJSON = withObject "AppSettings" $ \o -> do
@@ -353,7 +369,8 @@ instance FromJSON AppSettings where
         appNotificationRateLimit  <- o .:  "notification-rate-limit"
         appNotificationCollateDelay <- o .: "notification-collate-delay"
         appNotificationExpiration <- o .: "notification-expiration"
-        appJWTExpiration          <- o .:? "jwt-expiration"
+        appJwtExpiration          <- o .:? "jwt-expiration"
+        appJwtEncoding            <- o .: "jwt-encoding"
 
         appSessionTimeout         <- o .: "session-timeout"
 
diff --git a/src/Utils.hs b/src/Utils.hs
index a95cb7bfc..68906d803 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -52,6 +52,7 @@ import Control.Monad.Catch hiding (throwM)
 import qualified Database.Esqueleto as E (Value, unValue)
 
 import Language.Haskell.TH
+import Language.Haskell.TH.Instances ()
 import Instances.TH.Lift ()
 
 import Text.Shakespeare.Text (st)
@@ -69,6 +70,8 @@ import qualified Crypto.Data.PKCS7 as PKCS7
 import Data.Fixed (Centi)
 import Data.Ratio ((%))
 
+import qualified Data.Binary as Binary
+
 {-# ANN choice ("HLint: ignore Use asum" :: String) #-}
 
 
@@ -607,6 +610,15 @@ choice = foldr (<|>) empty
 -- Sessions --
 --------------
 
+data SessionKey = SessionActiveAuthTags | SessionInactiveAuthTags
+                | SessionNewStudyTerms
+                | SessionBearer
+  deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
+instance Universe SessionKey
+instance Finite SessionKey
+
+nullaryPathPiece ''SessionKey $ camelToPathPiece' 1
+
 setSessionJson :: (PathPiece k, ToJSON v, MonadHandler m) => k -> v -> m ()
 setSessionJson (toPathPiece -> key) (LBS.toStrict . Aeson.encode -> val) = setSessionBS key val
 
@@ -731,3 +743,12 @@ encodedSecretBoxOpen :: ( FromJSON a, MonadError EncodedSecretBoxException m, Mo
 encodedSecretBoxOpen ciphertext = do
   sKey <- secretBoxKey
   encodedSecretBoxOpen' sKey ciphertext
+
+-------------
+-- Caching --
+-------------
+
+cachedHere :: Q Exp
+cachedHere = do
+  loc <- location
+  [e| cachedBy (toStrict $ Binary.encode loc) |]
diff --git a/src/Utils/Lens.hs b/src/Utils/Lens.hs
index 4493dc612..05261e95b 100644
--- a/src/Utils/Lens.hs
+++ b/src/Utils/Lens.hs
@@ -1,12 +1,16 @@
 module Utils.Lens ( module Utils.Lens ) where
 
-import Import.NoFoundation
+import ClassyPrelude.Yesod hiding ((.=))
+import Model
 import Control.Lens as Utils.Lens hiding ((<.>))
 import Control.Lens.Extras as Utils.Lens (is)
 import Utils.Lens.TH as Utils.Lens (makeLenses_, makeClassyFor_)
 
+import Yesod.Core.Types (HandlerContents(..), ErrorResponse(..))
+
 import qualified Database.Esqueleto as E (Value(..),InnerJoin(..))
 
+
 _unValue :: Lens' (E.Value a) a
 _unValue f (E.Value a) = E.Value <$> f a
 
@@ -70,8 +74,6 @@ hasEntityUser = hasEntity
 --   hasUser = _entityVal . hasUser
 
 
-makeLenses_ ''Address
-
 makeLenses_ ''SheetCorrector
 
 makeLenses_ ''SubmissionGroup
@@ -92,6 +94,10 @@ makeLenses_ ''StudyTerms
 
 makeLenses_ ''StudyTermCandidate
 
+makePrisms ''HandlerContents
+
+makePrisms ''ErrorResponse
+
 
 -- makeClassy_ ''Load
 
diff --git a/src/Utils/Tokens.hs b/src/Utils/Tokens.hs
new file mode 100644
index 000000000..f6533120d
--- /dev/null
+++ b/src/Utils/Tokens.hs
@@ -0,0 +1,174 @@
+module Utils.Tokens
+  ( bearerToken
+  , encodeToken, BearerTokenException(..), decodeToken
+  , tokenParseJSON'
+  , askJwt
+  , formEmbedJwtPost, formEmbedJwtGet
+  ) where
+
+import ClassyPrelude.Yesod
+
+import Yesod.Auth (AuthId)
+
+import Utils (NTop(..), hoistMaybe, SessionKey(..))
+import Utils.Parameters
+import Utils.Lens hiding ((.=))
+
+import Model
+import Model.Tokens
+
+import Jose.Jwk (JwkSet(..))
+import Jose.Jwt (Jwt(..))
+import qualified Jose.Jwt as Jose
+
+import Data.Aeson.Types (Parser)
+import qualified Data.Aeson as JSON
+import qualified Data.Aeson.Parser as JSON
+import qualified Data.Aeson.Parser.Internal as JSON (jsonEOF')
+import qualified Data.Aeson.Internal as JSON (iparse, formatError)
+
+import qualified Data.HashMap.Strict as HashMap
+
+import Data.Time.Clock
+
+import Control.Monad.Random (MonadRandom(..))
+import Control.Monad.Trans.Maybe (MaybeT(..))
+
+import Settings
+
+import CryptoID
+
+import Text.Blaze (Markup)
+
+
+tokenParseJSON' :: forall m.
+                  ( HasCryptoUUID (AuthId (HandlerSite m)) (ReaderT CryptoIDKey Parser)
+                  , ParseRoute (HandlerSite m)
+                  , Hashable (Route (HandlerSite m))
+                  , MonadHandler m
+                  , MonadCrypto m
+                  , MonadCryptoKey m ~ CryptoIDKey
+                  )
+               => m (Value -> Parser (BearerToken (HandlerSite m)))
+-- ^ Read `CryptoIDKey` from monadic context and construct a `Parser` for `BearerToken`s
+tokenParseJSON' = do
+  cidKey <- cryptoIDKey return
+  return $ flip runReaderT cidKey . tokenParseJSON
+
+
+bearerToken :: forall m.
+               ( MonadHandler m
+               , HasInstanceID (HandlerSite m) InstanceId
+               , HasCryptoUUID (AuthId (HandlerSite m)) m
+               , HasAppSettings (HandlerSite m)
+               )
+            => AuthId (HandlerSite m)
+            -> Maybe (HashSet (Route (HandlerSite m)))
+            -> Maybe AuthDNF
+            -> Maybe (Maybe UTCTime) -- ^ @Nothing@ determines default expiry time automatically
+            -> Maybe UTCTime -- ^ @Nothing@ means token starts to be valid immediately
+            -> m (BearerToken (HandlerSite m))
+-- ^ Smart constructor for `BearerToken`, does not set route restrictions (due to polymorphism), use `tokenRestrict`
+bearerToken tokenAuthority tokenRoutes tokenAddAuth mTokenExpiresAt tokenStartsAt = do
+  tokenIdentifier <- liftIO getRandom
+  tokenIssuedAt <- liftIO getCurrentTime
+  tokenIssuedBy <- getsYesod $ view instanceID
+
+  defaultExpiration <- getsYesod $ view _appJwtExpiration
+  
+  let tokenExpiresAt
+        | Just t <- mTokenExpiresAt
+        = t
+        | Just tDiff <- defaultExpiration
+        = Just $ tDiff `addUTCTime` fromMaybe tokenIssuedAt tokenStartsAt
+        | otherwise
+        = Nothing
+      tokenRestrictions = HashMap.empty
+
+  return BearerToken{..}
+
+
+encodeToken :: forall m.
+               ( MonadHandler m
+               , HasJSONWebKeySet (HandlerSite m) JwkSet
+               , HasInstanceID (HandlerSite m) InstanceId
+               , HasAppSettings (HandlerSite m)
+               , HasCryptoUUID (AuthId (HandlerSite m)) m
+               , RenderRoute (HandlerSite m)
+               )
+            => BearerToken (HandlerSite m) -> m Jwt
+-- ^ Call `tokenToJSON` and encode the result as a `Jwt` according to `appJwtEncoding`
+encodeToken token = do
+  payload <- Jose.Claims . toStrict . JSON.encode <$> tokenToJSON token
+  JwkSet jwks <- getsYesod $ view jsonWebKeySet
+  jwtEncoding <- getsYesod $ view _appJwtEncoding
+  either throwM return =<< liftIO (Jose.encode jwks jwtEncoding payload)
+
+
+data BearerTokenException
+  = BearerTokenJwtError Jose.JwtError -- ^ An Error occurred in the underlying `Jwt`-Implementation
+  | BearerTokenUnsecured -- ^ `Jwt` is insufficiently secured (unsigned and not encrypted)
+  | BearerTokenInvalidFormat String -- ^ Content of the `Jwt` could not be parsed as a `BearerToken`
+  | BearerTokenExpired | BearerTokenNotStarted
+  deriving (Eq, Show, Generic, Typeable)
+
+instance Exception BearerTokenException
+
+decodeToken :: forall m.
+               ( MonadHandler m
+               , HasJSONWebKeySet (HandlerSite m) JwkSet
+               , HasCryptoUUID (AuthId (HandlerSite m)) (ReaderT CryptoIDKey Parser)
+               , MonadCryptoKey m ~ CryptoIDKey
+               , MonadCrypto m
+               , MonadThrow m
+               , ParseRoute (HandlerSite m)
+               , Hashable (Route (HandlerSite m))
+               )
+            => Jwt -> m (BearerToken (HandlerSite m))
+-- ^ Decode a `Jwt` and call `tokenParseJSON`
+--
+-- Throws `bearerTokenException`s
+decodeToken (Jwt bs) = do
+  JwkSet jwks <- getsYesod $ view jsonWebKeySet
+  content <- either (throwM . BearerTokenJwtError) return =<< liftIO (Jose.decode jwks Nothing bs)
+  content' <- case content of
+    Jose.Unsecured _ -> throwM BearerTokenUnsecured
+    Jose.Jws (_header, payload) -> return payload
+    Jose.Jwe (_header, payload) -> return payload
+  parser <- tokenParseJSON'
+  token@BearerToken{..} <- either (throwM . BearerTokenInvalidFormat . uncurry JSON.formatError) return $ JSON.eitherDecodeStrictWith JSON.jsonEOF' (JSON.iparse parser) content'
+  now <- liftIO getCurrentTime
+  unless (NTop tokenExpiresAt > NTop (Just now)) $
+    throwM BearerTokenExpired
+  unless (tokenStartsAt <= Just now) $
+    throwM BearerTokenNotStarted
+  return token
+
+
+askJwt :: forall m. ( MonadHandler m )
+       => m (Maybe Jwt)
+-- ^ Retrieve current `Jwt` from HTTP-Header, POST-Parameter, or GET-Parameter
+askJwt = runMaybeT $ asum
+  [ MaybeT lookupBearerAuth >>= hoistMaybe . fromPathPiece
+  , MaybeT $ lookupGlobalPostParam PostBearer
+  , MaybeT $ lookupGlobalGetParam GetBearer
+  , fmap Jwt . MaybeT $ lookupSessionBS (toPathPiece SessionBearer)
+  ]
+
+formEmbedJwtPost, formEmbedJwtGet :: MonadHandler m => (Markup -> m a) -> (Markup -> m a)
+formEmbedJwtPost f fragment = do
+  mJwt <- askJwt
+  f [shamlet|
+       $newline never
+       $maybe jwt <- mJwt
+         <input type=hidden name=#{toPathPiece PostBearer} value=#{toPathPiece jwt}>
+       #{fragment}
+    |]
+formEmbedJwtGet f fragment = do
+  mJwt <- askJwt
+  f [shamlet|
+       $newline never
+       $maybe jwt <- mJwt
+         <input type=hidden name=#{toPathPiece GetBearer} value=#{toPathPiece jwt}>
+       #{fragment}
+    |]

From 9f5406d284beb29caae5d145a0beb5725160e9f8 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 17 Apr 2019 14:06:41 +0200
Subject: [PATCH 090/238] Custom styling for massInput

---
 src/Handler/Admin.hs                          |  2 +-
 src/Handler/Course.hs                         | 30 ++++------
 src/Handler/Utils/Form/MassInput.hs           | 56 +++++++++++++------
 templates/course/lecturerMassInput/add.hamlet |  6 ++
 .../lecturerMassInput/cellInvitation.hamlet   | 12 ++++
 .../course/lecturerMassInput/cellKnown.hamlet |  6 ++
 .../course/lecturerMassInput/layout.hamlet    | 11 ++++
 .../widgets/massinput/list/layout.hamlet      | 14 +++++
 8 files changed, 101 insertions(+), 36 deletions(-)
 create mode 100644 templates/course/lecturerMassInput/add.hamlet
 create mode 100644 templates/course/lecturerMassInput/cellInvitation.hamlet
 create mode 100644 templates/course/lecturerMassInput/cellKnown.hamlet
 create mode 100644 templates/course/lecturerMassInput/layout.hamlet
 create mode 100644 templates/widgets/massinput/list/layout.hamlet

diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs
index 32f8db822..a47cce3b7 100644
--- a/src/Handler/Admin.hs
+++ b/src/Handler/Admin.hs
@@ -205,7 +205,7 @@ postAdminTestR = do
 
   -- The actual call to @massInput@ is comparatively simple:
 
-  ((miResult, fvInput -> miForm), miEnc) <- runFormPost . identifyForm ("massinput" :: Text) $ massInput (MassInput mkAddForm mkCellForm deleteCell allowAdd buttonAction) "" True Nothing
+  ((miResult, fvInput -> miForm), miEnc) <- runFormPost . identifyForm ("massinput" :: Text) $ massInput (MassInput mkAddForm mkCellForm deleteCell allowAdd buttonAction defaultMiLayout) "" True Nothing
 
 
   let locallyDefinedPageHeading = [whamlet|Admin TestPage for Uni2work|]
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index c084c139f..3b9dd0790 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -27,6 +27,7 @@ import Data.Monoid (Last(..))
 
 import Data.Maybe (fromJust)
 import qualified Data.Set as Set
+import Data.Map ((!))
 import qualified Data.Map as Map
 
 import qualified Database.Esqueleto as E
@@ -637,34 +638,18 @@ makeCourseForm miButtonAction template = identifyForm FIDcourse $ \html -> do
                         | otherwise -> FormSuccess $ Map.singleton (maybe 0 succ . fmap fst $ Map.lookupMax prev) new
                 FormFailure errs -> FormFailure errs
                 FormMissing -> FormMissing
-              addView'  = toWidget csrf >> fvInput addView >> fvInput btn
+              addView' = $(widgetFile "course/lecturerMassInput/add")
           return (addRes'', addView')
 
         miCell :: ListPosition -> Either UserEmail UserId -> Maybe (Maybe LecturerType) -> (Text -> Text) -> Form (Maybe LecturerType)
         miCell _ (Right lid) defType nudge = \csrf -> do
           (lrwRes,lrwView) <- mreq (selectField optionsFinite) ("" & addName (nudge "lecturer-type")) (join defType)
           User{userEmail, userDisplayName, userSurname} <- liftHandlerT . runDB $ get404 lid
-          let lrwView' = [whamlet|$newline never
-                  #{csrf}
-                  ^{nameEmailWidget userEmail userDisplayName userSurname} #
-                  ^{fvInput lrwView}
-                |]
+          let lrwView' = $(widgetFile "course/lecturerMassInput/cellKnown")
           return (Just <$> lrwRes,lrwView')
         miCell _ (Left lEmail) defType nudge = \csrf -> do
           (lrwRes,lrwView) <- mopt (selectField optionsFinite) ("" & addName (nudge "lecturer-type")) defType
-          let lrwView' = [whamlet|
-                           $newline never
-                           #{csrf}
-                           <span style="font-family:monospace">
-                             #{lEmail}
-                            #
-                           <div .tooltip>
-                             <div .tooltip__handle>
-                             <div .tooltip__content>
-                               _{MsgEmailInvitationWarning}
-                            #
-                           ^{fvInput lrwView}
-                         |]
+          let lrwView' = $(widgetFile "course/lecturerMassInput/cellInvitation")
           return (lrwRes,lrwView')
 
         miDelete :: ListLength   -- ^ Current shape
@@ -675,6 +660,13 @@ makeCourseForm miButtonAction template = identifyForm FIDcourse $ \html -> do
         miAllowAdd :: ListPosition -> Natural -> ListLength -> Bool
         miAllowAdd _ _ _ = True
 
+        miLayout :: ListLength
+                 -> Map ListPosition Widget -- ^ Cell widgets
+                 -> Map ListPosition (FieldView UniWorX) -- ^ Deletion buttons
+                 -> Map (Natural, ListPosition) Widget -- ^ Addition widgets
+                 -> Widget
+        miLayout lLength cellWdgts delButtons addWdgts = $(widgetFile "course/lecturerMassInput/layout")
+
 
         lecturerForm :: AForm Handler [Either (UserEmail, Maybe LecturerType) (UserId, LecturerType)]
         lecturerForm = formToAForm . over (mapped._2) pure . over (mapped._1.mapped) (map liftEither . Map.elems) $ massInput
diff --git a/src/Handler/Utils/Form/MassInput.hs b/src/Handler/Utils/Form/MassInput.hs
index d1c403ec7..a30c5010b 100644
--- a/src/Handler/Utils/Form/MassInput.hs
+++ b/src/Handler/Utils/Form/MassInput.hs
@@ -2,6 +2,7 @@
 
 module Handler.Utils.Form.MassInput
   ( MassInput(..)
+  , defaultMiLayout
   , massInput
   , massInputList
   , BoxDimension(..)
@@ -24,6 +25,7 @@ import Text.Blaze (Markup)
 import qualified Data.Text as Text
 
 import qualified Data.Set as Set
+import Data.Map ((!))
 import qualified Data.Map as Map
 import qualified Data.Foldable as Fold
 import Data.List (genericLength, genericIndex, iterate)
@@ -206,6 +208,11 @@ data MassInput handler liveliness cellData cellResult = MassInput
                -> liveliness
                -> Bool -- ^ Decide whether an addition-operation should be permitted
   , miButtonAction :: forall p. PathPiece p => p -> Maybe (SomeRoute UniWorX) -- ^ Override form-tag route for `massInput`-Buttons to keep the user closer to the Widget, the `PathPiece` Argument is to be used for constructiong a `Fragment`
+  , miLayout :: liveliness
+             -> Map (BoxCoord liveliness) Widget -- ^ Cell Widgets
+             -> Map (BoxCoord liveliness) (FieldView UniWorX) -- ^ Delete buttons
+             -> Map (Natural, BoxCoord liveliness) Widget -- ^ Addition forms
+             -> Widget
   }
 
 massInput :: forall handler cellData cellResult liveliness.
@@ -342,22 +349,12 @@ massInput MassInput{..} FieldSettings{..} fvRequired initialResult csrf = do
         guard $ not shapeChanged
         for cellResults $ \(cData, (cResult, _)) -> (cData, ) <$> cResult
 
-  let miWidget' :: BoxCoord liveliness -> [(Natural, BoxDimension (BoxCoord liveliness))] -> Widget
-      miWidget' _ [] = mempty
-      miWidget' miCoord ((dimIx, BoxDimension dim) : remDims) =
-        let coords = takeWhile (\c -> review (liveCoord c) liveliness) $ iterate (over dim succ) miCoord
-            cells
-              | [] <- remDims = do
-                  coord <- coords
-                  Just (_data, (_cellRes, cellWdgt)) <- return $ Map.lookup coord cellResults 
-                  let deleteButton = snd <$> Map.lookup coord delResults
-                  return (coord, $(widgetFile "widgets/massinput/cell"))
-              | otherwise =
-                  [ (coord, miWidget' coord remDims) | coord <- coords ]
-            addWidget = (\(_, mWgt) -> mWgt <* guard (miAllowAdd miCoord dimIx liveliness)) =<< Map.lookup (dimIx, miCoord) addResults
-         in $(widgetFile "widgets/massinput/row")
-
-      miWidget = miWidget' boxOrigin $ zip [0..] boxDimensions
+  let miWidget
+        = miLayout
+          liveliness
+          (fmap (view $ _2 . _2) cellResults)
+          (fmap (view _2) delResults)
+          (Map.mapMaybeWithKey (\(dimIx, miCoord) (_, wdgt) -> wdgt <* guard (miAllowAdd miCoord dimIx liveliness)) addResults)
 
   MsgRenderer mr <- getMsgRenderer
   
@@ -368,6 +365,31 @@ massInput MassInput{..} FieldSettings{..} fvRequired initialResult csrf = do
     fvErrors = Nothing
     in return (result, FieldView{..})
 
+defaultMiLayout :: forall liveliness.
+                   Liveliness liveliness
+                => liveliness
+                -> Map (BoxCoord liveliness) Widget
+                -> Map (BoxCoord liveliness) (FieldView UniWorX)
+                -> Map (Natural, BoxCoord liveliness) Widget
+                -> Widget
+-- | Generic `miLayout` using recursively nested lists
+defaultMiLayout liveliness cellResults delResults addResults = miWidget' boxOrigin $ zip [0..] boxDimensions
+  where
+    miWidget' :: BoxCoord liveliness -> [(Natural, BoxDimension (BoxCoord liveliness))] -> Widget
+    miWidget' _ [] = mempty
+    miWidget' miCoord ((dimIx, BoxDimension dim) : remDims) =
+      let coords = takeWhile (\c -> review (liveCoord c) liveliness) $ iterate (over dim succ) miCoord
+          cells
+            | [] <- remDims = do
+                coord <- coords
+                Just cellWdgt <- return $ Map.lookup coord cellResults 
+                let deleteButton = Map.lookup coord delResults
+                return (coord, $(widgetFile "widgets/massinput/cell"))
+            | otherwise =
+                [ (coord, miWidget' coord remDims) | coord <- coords ]
+          addWidget = Map.lookup (dimIx, miCoord) addResults
+       in $(widgetFile "widgets/massinput/row")
+
 
 -- | Wrapper around `massInput` for the common case, that we just want an arbitrary list of single fields without any constraints
 massInputList :: forall handler cellResult.
@@ -389,6 +411,8 @@ massInputList field fieldSettings miButtonAction miSettings miRequired miPrevRes
             , miDelete = miDeleteList
             , miAllowAdd = \_ _ _ -> True
             , miButtonAction
+            , miLayout = \lLength cellWdgts delButtons addWdgts
+              -> $(widgetFile "widgets/massinput/list/layout")
             }
   miSettings
   miRequired
diff --git a/templates/course/lecturerMassInput/add.hamlet b/templates/course/lecturerMassInput/add.hamlet
new file mode 100644
index 000000000..da5411bc4
--- /dev/null
+++ b/templates/course/lecturerMassInput/add.hamlet
@@ -0,0 +1,6 @@
+$newline never
+<td colspan=3>
+  #{csrf}
+  ^{fvInput addView}
+<td>
+  ^{fvInput btn}
diff --git a/templates/course/lecturerMassInput/cellInvitation.hamlet b/templates/course/lecturerMassInput/cellInvitation.hamlet
new file mode 100644
index 000000000..523d9577b
--- /dev/null
+++ b/templates/course/lecturerMassInput/cellInvitation.hamlet
@@ -0,0 +1,12 @@
+ $newline never
+ <td>
+   #{csrf}
+   <span style="font-family: monospace">
+     #{lEmail}
+ <td>
+   <div .tooltip>
+     <div .tooltip__handle>
+     <div .tooltip__content>
+       _{MsgEmailInvitationWarning}
+ <td>
+   ^{fvInput lrwView}
diff --git a/templates/course/lecturerMassInput/cellKnown.hamlet b/templates/course/lecturerMassInput/cellKnown.hamlet
new file mode 100644
index 000000000..0b55c7902
--- /dev/null
+++ b/templates/course/lecturerMassInput/cellKnown.hamlet
@@ -0,0 +1,6 @@
+$newline never
+<td colspan=2>
+  #{csrf}
+  ^{nameEmailWidget userEmail userDisplayName userSurname} #
+<td>
+  ^{fvInput lrwView}
diff --git a/templates/course/lecturerMassInput/layout.hamlet b/templates/course/lecturerMassInput/layout.hamlet
new file mode 100644
index 000000000..8dc00bc90
--- /dev/null
+++ b/templates/course/lecturerMassInput/layout.hamlet
@@ -0,0 +1,11 @@
+$newline never
+<table>
+  <tbody>
+    $forall coord <- review liveCoords lLength
+      <tr .massinput--cell>
+        ^{cellWdgts ! coord}
+        <td>
+          ^{fvInput (delButtons ! coord)}
+  <tfoot>
+    <tr .massinput--add>
+      ^{addWdgts ! (0, 0)}
diff --git a/templates/widgets/massinput/list/layout.hamlet b/templates/widgets/massinput/list/layout.hamlet
new file mode 100644
index 000000000..5f5676bb6
--- /dev/null
+++ b/templates/widgets/massinput/list/layout.hamlet
@@ -0,0 +1,14 @@
+$newline never
+<table>
+  <tbody>
+    <tr .massinput--cell>
+      $forall coord <- review liveCoords lLength
+        <td>
+          ^{cellWdgts ! coord}
+        <td>
+          ^{fvInput (delButtons ! coord)}
+  <tfoot>
+    <tr>
+      <td>
+      <td .massinput--add>
+        ^{addWdgts ! (0, 0)}

From 7bae03b4c056a8e99596307c4a9dce6558f36f13 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 17 Apr 2019 14:23:20 +0200
Subject: [PATCH 091/238] Use available constant in interactive fieldset
 utility

---
 static/js/utils/form.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index 9c577725a..d4f97bb4a 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -3,6 +3,10 @@
 
   var formUtilities = [];
 
+  var FORM_GROUP_SELECTOR = '.form-group';
+  var FORM_GROUP_WITH_ERRORS_CLASS = 'form-group--has-error';
+
+
   /**
    *
    * Reactive Submit Button Utility
@@ -172,7 +176,7 @@
       }
       conditionalValue = element.dataset.conditionalValue;
 
-      formGroup = element.closest('.form-group');
+      formGroup = element.closest(FORM_GROUP_SELECTOR);
       if (!formGroup) {
         throw new Error('Interactive Fieldset needs a .form-group ancestor!');
       }
@@ -263,9 +267,6 @@
   var FORM_ERROR_REMOVER_INITIALIZED_CLASS = 'form-error-remover--initialized';
   var FORM_ERROR_REMOVER_INPUTS_SELECTOR = 'input:not([type="hidden"]), textarea, select';
 
-  var FORM_GROUP_SELECTOR = '.form-group';
-  var FORM_GROUP_WITH_ERRORS_CLASS = 'form-group--has-error';
-
   var formErrorRemoverUtil = function(element) {
     var formGroups;
 

From 76f984420f4f7f94523c77c1a1a18b45287184e8 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 17 Apr 2019 14:06:41 +0200
Subject: [PATCH 092/238] Custom styling for massInput

---
 src/Handler/Admin.hs                          |  2 +-
 src/Handler/Course.hs                         | 30 ++++------
 src/Handler/Utils/Communication.hs            |  1 +
 src/Handler/Utils/Form/MassInput.hs           | 56 +++++++++++++------
 templates/course/lecturerMassInput/add.hamlet |  6 ++
 .../lecturerMassInput/cellInvitation.hamlet   | 12 ++++
 .../course/lecturerMassInput/cellKnown.hamlet |  6 ++
 .../course/lecturerMassInput/layout.hamlet    | 11 ++++
 .../widgets/massinput/list/layout.hamlet      | 14 +++++
 9 files changed, 102 insertions(+), 36 deletions(-)
 create mode 100644 templates/course/lecturerMassInput/add.hamlet
 create mode 100644 templates/course/lecturerMassInput/cellInvitation.hamlet
 create mode 100644 templates/course/lecturerMassInput/cellKnown.hamlet
 create mode 100644 templates/course/lecturerMassInput/layout.hamlet
 create mode 100644 templates/widgets/massinput/list/layout.hamlet

diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs
index 32f8db822..a47cce3b7 100644
--- a/src/Handler/Admin.hs
+++ b/src/Handler/Admin.hs
@@ -205,7 +205,7 @@ postAdminTestR = do
 
   -- The actual call to @massInput@ is comparatively simple:
 
-  ((miResult, fvInput -> miForm), miEnc) <- runFormPost . identifyForm ("massinput" :: Text) $ massInput (MassInput mkAddForm mkCellForm deleteCell allowAdd buttonAction) "" True Nothing
+  ((miResult, fvInput -> miForm), miEnc) <- runFormPost . identifyForm ("massinput" :: Text) $ massInput (MassInput mkAddForm mkCellForm deleteCell allowAdd buttonAction defaultMiLayout) "" True Nothing
 
 
   let locallyDefinedPageHeading = [whamlet|Admin TestPage for Uni2work|]
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 79525232d..1a866936e 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -28,6 +28,7 @@ import Data.Monoid (Last(..))
 
 import Data.Maybe (fromJust)
 import qualified Data.Set as Set
+import Data.Map ((!))
 import qualified Data.Map as Map
 
 import qualified Database.Esqueleto as E
@@ -638,34 +639,18 @@ makeCourseForm miButtonAction template = identifyForm FIDcourse $ \html -> do
                         | otherwise -> FormSuccess $ Map.singleton (maybe 0 succ . fmap fst $ Map.lookupMax prev) new
                 FormFailure errs -> FormFailure errs
                 FormMissing -> FormMissing
-              addView'  = toWidget csrf >> fvInput addView >> fvInput btn
+              addView' = $(widgetFile "course/lecturerMassInput/add")
           return (addRes'', addView')
 
         miCell :: ListPosition -> Either UserEmail UserId -> Maybe (Maybe LecturerType) -> (Text -> Text) -> Form (Maybe LecturerType)
         miCell _ (Right lid) defType nudge = \csrf -> do
           (lrwRes,lrwView) <- mreq (selectField optionsFinite) ("" & addName (nudge "lecturer-type")) (join defType)
           User{userEmail, userDisplayName, userSurname} <- liftHandlerT . runDB $ get404 lid
-          let lrwView' = [whamlet|$newline never
-                  #{csrf}
-                  ^{nameEmailWidget userEmail userDisplayName userSurname} #
-                  ^{fvInput lrwView}
-                |]
+          let lrwView' = $(widgetFile "course/lecturerMassInput/cellKnown")
           return (Just <$> lrwRes,lrwView')
         miCell _ (Left lEmail) defType nudge = \csrf -> do
           (lrwRes,lrwView) <- mopt (selectField optionsFinite) ("" & addName (nudge "lecturer-type")) defType
-          let lrwView' = [whamlet|
-                           $newline never
-                           #{csrf}
-                           <span style="font-family:monospace">
-                             #{lEmail}
-                            #
-                           <div .tooltip>
-                             <div .tooltip__handle>
-                             <div .tooltip__content>
-                               _{MsgEmailInvitationWarning}
-                            #
-                           ^{fvInput lrwView}
-                         |]
+          let lrwView' = $(widgetFile "course/lecturerMassInput/cellInvitation")
           return (lrwRes,lrwView')
 
         miDelete :: ListLength   -- ^ Current shape
@@ -676,6 +661,13 @@ makeCourseForm miButtonAction template = identifyForm FIDcourse $ \html -> do
         miAllowAdd :: ListPosition -> Natural -> ListLength -> Bool
         miAllowAdd _ _ _ = True
 
+        miLayout :: ListLength
+                 -> Map ListPosition Widget -- ^ Cell widgets
+                 -> Map ListPosition (FieldView UniWorX) -- ^ Deletion buttons
+                 -> Map (Natural, ListPosition) Widget -- ^ Addition widgets
+                 -> Widget
+        miLayout lLength cellWdgts delButtons addWdgts = $(widgetFile "course/lecturerMassInput/layout")
+
 
         lecturerForm :: AForm Handler [Either (UserEmail, Maybe LecturerType) (UserId, LecturerType)]
         lecturerForm = formToAForm . over (mapped._2) pure . over (mapped._1.mapped) (map liftEither . Map.elems) $ massInput
diff --git a/src/Handler/Utils/Communication.hs b/src/Handler/Utils/Communication.hs
index 88dbccf55..6d4527402 100644
--- a/src/Handler/Utils/Communication.hs
+++ b/src/Handler/Utils/Communication.hs
@@ -126,6 +126,7 @@ commR CommunicationRoute{..} =  do
           miAllowAdd _ _ _ = True
           miButtonAction :: forall p . PathPiece p => p -> Maybe (SomeRoute UniWorX)
           miButtonAction anchor = SomeRoute . (:#: anchor) <$> mbCurrentRoute
+          miLayout = defaultMiLayout
           postProcess :: Map ListPosition (Either UserEmail UserId, ()) -> Set (Either UserEmail UserId)
           postProcess = Set.fromList . map fst . Map.elems
 
diff --git a/src/Handler/Utils/Form/MassInput.hs b/src/Handler/Utils/Form/MassInput.hs
index 41402396f..ca23fd041 100644
--- a/src/Handler/Utils/Form/MassInput.hs
+++ b/src/Handler/Utils/Form/MassInput.hs
@@ -2,6 +2,7 @@
 
 module Handler.Utils.Form.MassInput
   ( MassInput(..)
+  , defaultMiLayout
   , massInput
   , BoxDimension(..)
   , IsBoxCoord(..), boxDimension
@@ -25,6 +26,7 @@ import Text.Blaze (Markup)
 import qualified Data.Text as Text
 
 import qualified Data.Set as Set
+import Data.Map ((!))
 import qualified Data.Map as Map
 import qualified Data.Foldable as Fold
 import Data.List (genericLength, genericIndex, iterate)
@@ -206,6 +208,11 @@ data MassInput handler liveliness cellData cellResult = MassInput
                -> liveliness
                -> Bool -- ^ Decide whether an addition-operation should be permitted
   , miButtonAction :: forall p. PathPiece p => p -> Maybe (SomeRoute UniWorX) -- ^ Override form-tag route for `massInput`-Buttons to keep the user closer to the Widget, the `PathPiece` Argument is to be used for constructiong a `Fragment`
+  , miLayout :: liveliness
+             -> Map (BoxCoord liveliness) Widget -- ^ Cell Widgets
+             -> Map (BoxCoord liveliness) (FieldView UniWorX) -- ^ Delete buttons
+             -> Map (Natural, BoxCoord liveliness) Widget -- ^ Addition forms
+             -> Widget
   }
 
 massInput :: forall handler cellData cellResult liveliness.
@@ -342,22 +349,12 @@ massInput MassInput{..} FieldSettings{..} fvRequired initialResult csrf = do
         guard $ not shapeChanged
         for cellResults $ \(cData, (cResult, _)) -> (cData, ) <$> cResult
 
-  let miWidget' :: BoxCoord liveliness -> [(Natural, BoxDimension (BoxCoord liveliness))] -> Widget
-      miWidget' _ [] = mempty
-      miWidget' miCoord ((dimIx, BoxDimension dim) : remDims) =
-        let coords = takeWhile (\c -> review (liveCoord c) liveliness) $ iterate (over dim succ) miCoord
-            cells
-              | [] <- remDims = do
-                  coord <- coords
-                  Just (_data, (_cellRes, cellWdgt)) <- return $ Map.lookup coord cellResults
-                  let deleteButton = snd <$> Map.lookup coord delResults
-                  return (coord, $(widgetFile "widgets/massinput/cell"))
-              | otherwise =
-                  [ (coord, miWidget' coord remDims) | coord <- coords ]
-            addWidget = (\(_, mWgt) -> mWgt <* guard (miAllowAdd miCoord dimIx liveliness)) =<< Map.lookup (dimIx, miCoord) addResults
-         in $(widgetFile "widgets/massinput/row")
-
-      miWidget = miWidget' boxOrigin $ zip [0..] boxDimensions
+  let miWidget
+        = miLayout
+          liveliness
+          (fmap (view $ _2 . _2) cellResults)
+          (fmap (view _2) delResults)
+          (Map.mapMaybeWithKey (\(dimIx, miCoord) (_, wdgt) -> wdgt <* guard (miAllowAdd miCoord dimIx liveliness)) addResults)
 
   MsgRenderer mr <- getMsgRenderer
 
@@ -368,6 +365,31 @@ massInput MassInput{..} FieldSettings{..} fvRequired initialResult csrf = do
     fvErrors = Nothing
     in return (result, FieldView{..})
 
+defaultMiLayout :: forall liveliness.
+                   Liveliness liveliness
+                => liveliness
+                -> Map (BoxCoord liveliness) Widget
+                -> Map (BoxCoord liveliness) (FieldView UniWorX)
+                -> Map (Natural, BoxCoord liveliness) Widget
+                -> Widget
+-- | Generic `miLayout` using recursively nested lists
+defaultMiLayout liveliness cellResults delResults addResults = miWidget' boxOrigin $ zip [0..] boxDimensions
+  where
+    miWidget' :: BoxCoord liveliness -> [(Natural, BoxDimension (BoxCoord liveliness))] -> Widget
+    miWidget' _ [] = mempty
+    miWidget' miCoord ((dimIx, BoxDimension dim) : remDims) =
+      let coords = takeWhile (\c -> review (liveCoord c) liveliness) $ iterate (over dim succ) miCoord
+          cells
+            | [] <- remDims = do
+                coord <- coords
+                Just cellWdgt <- return $ Map.lookup coord cellResults 
+                let deleteButton = Map.lookup coord delResults
+                return (coord, $(widgetFile "widgets/massinput/cell"))
+            | otherwise =
+                [ (coord, miWidget' coord remDims) | coord <- coords ]
+          addWidget = Map.lookup (dimIx, miCoord) addResults
+       in $(widgetFile "widgets/massinput/row")
+
 
 -- | Wrapper around `massInput` for the common case, that we just want an arbitrary list of single fields without any constraints
 massInputList :: forall handler cellResult.
@@ -389,6 +411,8 @@ massInputList field fieldSettings miButtonAction miSettings miRequired miPrevRes
             , miDelete = miDeleteList
             , miAllowAdd = \_ _ _ -> True
             , miButtonAction
+            , miLayout = \lLength cellWdgts delButtons addWdgts
+              -> $(widgetFile "widgets/massinput/list/layout")
             }
   miSettings
   miRequired
diff --git a/templates/course/lecturerMassInput/add.hamlet b/templates/course/lecturerMassInput/add.hamlet
new file mode 100644
index 000000000..da5411bc4
--- /dev/null
+++ b/templates/course/lecturerMassInput/add.hamlet
@@ -0,0 +1,6 @@
+$newline never
+<td colspan=3>
+  #{csrf}
+  ^{fvInput addView}
+<td>
+  ^{fvInput btn}
diff --git a/templates/course/lecturerMassInput/cellInvitation.hamlet b/templates/course/lecturerMassInput/cellInvitation.hamlet
new file mode 100644
index 000000000..523d9577b
--- /dev/null
+++ b/templates/course/lecturerMassInput/cellInvitation.hamlet
@@ -0,0 +1,12 @@
+ $newline never
+ <td>
+   #{csrf}
+   <span style="font-family: monospace">
+     #{lEmail}
+ <td>
+   <div .tooltip>
+     <div .tooltip__handle>
+     <div .tooltip__content>
+       _{MsgEmailInvitationWarning}
+ <td>
+   ^{fvInput lrwView}
diff --git a/templates/course/lecturerMassInput/cellKnown.hamlet b/templates/course/lecturerMassInput/cellKnown.hamlet
new file mode 100644
index 000000000..0b55c7902
--- /dev/null
+++ b/templates/course/lecturerMassInput/cellKnown.hamlet
@@ -0,0 +1,6 @@
+$newline never
+<td colspan=2>
+  #{csrf}
+  ^{nameEmailWidget userEmail userDisplayName userSurname} #
+<td>
+  ^{fvInput lrwView}
diff --git a/templates/course/lecturerMassInput/layout.hamlet b/templates/course/lecturerMassInput/layout.hamlet
new file mode 100644
index 000000000..8dc00bc90
--- /dev/null
+++ b/templates/course/lecturerMassInput/layout.hamlet
@@ -0,0 +1,11 @@
+$newline never
+<table>
+  <tbody>
+    $forall coord <- review liveCoords lLength
+      <tr .massinput--cell>
+        ^{cellWdgts ! coord}
+        <td>
+          ^{fvInput (delButtons ! coord)}
+  <tfoot>
+    <tr .massinput--add>
+      ^{addWdgts ! (0, 0)}
diff --git a/templates/widgets/massinput/list/layout.hamlet b/templates/widgets/massinput/list/layout.hamlet
new file mode 100644
index 000000000..5f5676bb6
--- /dev/null
+++ b/templates/widgets/massinput/list/layout.hamlet
@@ -0,0 +1,14 @@
+$newline never
+<table>
+  <tbody>
+    <tr .massinput--cell>
+      $forall coord <- review liveCoords lLength
+        <td>
+          ^{cellWdgts ! coord}
+        <td>
+          ^{fvInput (delButtons ! coord)}
+  <tfoot>
+    <tr>
+      <td>
+      <td .massinput--add>
+        ^{addWdgts ! (0, 0)}

From 11d2cc46a8ab3d3703bc7c49123ee9aa0c50f2f2 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 18 Apr 2019 16:07:21 +0200
Subject: [PATCH 093/238] Minor refactor

---
 src/Handler/Utils/Form/MassInput.hs           | 76 +++++++++++--------
 .../Utils/Form/MassInput/Liveliness.hs        | 45 +++++++++++
 2 files changed, 91 insertions(+), 30 deletions(-)
 create mode 100644 src/Handler/Utils/Form/MassInput/Liveliness.hs

diff --git a/src/Handler/Utils/Form/MassInput.hs b/src/Handler/Utils/Form/MassInput.hs
index ca23fd041..e30c061ee 100644
--- a/src/Handler/Utils/Form/MassInput.hs
+++ b/src/Handler/Utils/Form/MassInput.hs
@@ -4,18 +4,18 @@ module Handler.Utils.Form.MassInput
   ( MassInput(..)
   , defaultMiLayout
   , massInput
-  , BoxDimension(..)
-  , IsBoxCoord(..), boxDimension
-  , Liveliness(..)
+  , module Handler.Utils.Form.MassInput.Liveliness
   , massInputA
   , massInputList
   , ListLength(..), ListPosition(..), miDeleteList
+  , EnumLiveliness(..), EnumPosition(..)
   ) where
 
 import Import
 import Utils.Form
 import Utils.Lens
 import Handler.Utils.Form (secretJsonField)
+import Handler.Utils.Form.MassInput.Liveliness
 
 import Data.Aeson
 
@@ -26,37 +26,15 @@ import Text.Blaze (Markup)
 import qualified Data.Text as Text
 
 import qualified Data.Set as Set
+import qualified Data.IntSet as IntSet
 import Data.Map ((!))
 import qualified Data.Map as Map
 import qualified Data.Foldable as Fold
-import Data.List (genericLength, genericIndex, iterate)
+import Data.List (iterate)
 
 import Control.Monad.Reader.Class (MonadReader(local))
 
 
-data BoxDimension x = forall n. (Enum n, Num n) => BoxDimension (Lens' x n)
-
-class (PathPiece x, ToJSONKey x, FromJSONKey x, Eq x, Ord x) => IsBoxCoord x where
-  boxDimensions :: [BoxDimension x]
-  boxOrigin :: x
-
-boxDimension :: IsBoxCoord x => Natural -> BoxDimension x
-boxDimension n
-  | n < genericLength dims = genericIndex dims n
-  | otherwise = error "boxDimension: insufficient dimensions"
-  where
-    dims = boxDimensions
-
--- zeroDimension :: IsBoxCoord x => Natural -> x -> x
--- zeroDimension (boxDimension -> BoxDimension dim) = set dim $ boxOrigin ^. dim
-
-class (IsBoxCoord (BoxCoord a), Lattice a, BoundedJoinSemiLattice a) => Liveliness a where
-  type BoxCoord a :: *
-  liveCoords :: Prism' (Set (BoxCoord a)) a
-  liveCoord :: BoxCoord a -> Prism' Bool a
-  liveCoord bC = prism' (\l -> bC `Set.member` review liveCoords l) (bool (Just bottom) (preview liveCoords $ Set.singleton bC))
-
-
 newtype ListLength = ListLength { unListLength :: Natural }
   deriving newtype (Num, Integral, Real, Enum, PathPiece)
   deriving (Eq, Ord, Generic, Typeable, Read, Show)
@@ -78,7 +56,7 @@ newtype ListPosition = ListPosition { unListPosition :: Natural }
 makeWrapped ''ListPosition
 
 instance IsBoxCoord ListPosition where
-  boxDimensions = [BoxDimension id]
+  boxDimensions = [BoxDimension _Wrapped]
   boxOrigin = 0
 
 instance Liveliness ListLength where
@@ -96,7 +74,42 @@ instance Liveliness ListLength where
         = Nothing
         where
           max' = Set.lookupMax ns
-  liveCoord (ListPosition n) = prism' (\(ListLength l) -> n < l) (bool (Just 0) (1 <$ guard (n == 0)))
+  liveCoord (ListPosition n) = prism' (\(ListLength l) -> n < l) (bool (Just bottom) (1 <$ guard (n == 0)))
+
+
+newtype EnumLiveliness enum = EnumLiveliness { unEnumLiveliness :: IntSet }
+  deriving (Eq, Ord, Generic, Typeable, Read, Show)
+
+makeWrapped ''EnumLiveliness
+
+instance JoinSemiLattice (EnumLiveliness enum) where
+  (EnumLiveliness a) \/ (EnumLiveliness b) = EnumLiveliness $ a `IntSet.union` b
+instance MeetSemiLattice (EnumLiveliness enum) where
+  (EnumLiveliness a) /\ (EnumLiveliness b) = EnumLiveliness $ a `IntSet.intersection` b
+instance Lattice (EnumLiveliness enum)
+instance BoundedJoinSemiLattice (EnumLiveliness enum) where
+  bottom = EnumLiveliness IntSet.empty
+instance (Enum enum, Bounded enum) => BoundedMeetSemiLattice (EnumLiveliness enum) where
+  top = EnumLiveliness . IntSet.fromList $ map (fromEnum :: enum -> Int) [minBound..maxBound]
+instance (Enum enum, Bounded enum) => BoundedLattice (EnumLiveliness enum)
+
+
+newtype EnumPosition enum = EnumPosition { unEnumPosition :: enum }
+  deriving newtype (Enum, Bounded, PathPiece, ToJSONKey, FromJSONKey)
+  deriving (Eq, Ord, Generic, Typeable, Read, Show)
+
+makeWrapped ''EnumPosition
+
+instance (Enum enum, Bounded enum, PathPiece enum, ToJSONKey enum, FromJSONKey enum, Eq enum, Ord enum) => IsBoxCoord (EnumPosition enum) where
+  boxDimensions = [BoxDimension _Wrapped]
+  boxOrigin = minBound
+
+instance (Enum enum, Bounded enum, PathPiece enum, ToJSONKey enum, FromJSONKey enum, Eq enum, Ord enum) => Liveliness (EnumLiveliness enum) where
+  type BoxCoord (EnumLiveliness enum) = EnumPosition enum
+  liveCoords = iso fromSet toSet
+    where
+      toSet = Set.fromList . map toEnum . IntSet.toList . unEnumLiveliness
+      fromSet = EnumLiveliness . IntSet.fromList . map fromEnum . Set.toList
 
 
 miDeleteList :: Applicative m => ListLength -> ListPosition -> m (Map ListPosition ListPosition)
@@ -270,7 +283,10 @@ massInput MassInput{..} FieldSettings{..} fvRequired initialResult csrf = do
               [] -> return dimRes'
               ((_, BoxDimension dim) : _) -> do
                 let
-                  miCoords = Set.fromList . takeWhile (\c -> review (liveCoord c) sentLiveliness) $ iterate (over dim succ) miCoord
+                  miCoords
+                    = Set.fromList
+                    . takeWhile (\c -> review (liveCoord c) sentLiveliness)
+                    $ set dim <$> enumFrom (miCoord ^. dim) <*> pure miCoord
                 dimRess <- sequence $ Map.fromSet (\c -> addForm' c remDims) miCoords
                 return $ dimRes' `Map.union` fold dimRess
 
diff --git a/src/Handler/Utils/Form/MassInput/Liveliness.hs b/src/Handler/Utils/Form/MassInput/Liveliness.hs
new file mode 100644
index 000000000..53c33d236
--- /dev/null
+++ b/src/Handler/Utils/Form/MassInput/Liveliness.hs
@@ -0,0 +1,45 @@
+module Handler.Utils.Form.MassInput.Liveliness
+  ( BoxDimension(..)
+  , IsBoxCoord(..)
+  , boxDimension
+  , Liveliness(..)
+  ) where
+
+import ClassyPrelude
+
+import Web.PathPieces(PathPiece)
+import Data.Aeson (ToJSONKey, FromJSONKey)
+
+import Numeric.Natural
+
+import Utils.Lens
+
+import Algebra.Lattice
+
+import qualified Data.Set as Set
+import Data.List (genericLength, genericIndex)
+
+
+data BoxDimension x = forall n. Enum n => BoxDimension (Lens' x n)
+
+class (PathPiece x, ToJSONKey x, FromJSONKey x, Eq x, Ord x) => IsBoxCoord x where
+  boxDimensions :: [BoxDimension x]
+  boxOrigin :: x
+
+boxDimension :: IsBoxCoord x => Natural -> BoxDimension x
+boxDimension n
+  | n < genericLength dims = genericIndex dims n
+  | otherwise = error "boxDimension: insufficient dimensions"
+  where
+    dims = boxDimensions
+
+-- zeroDimension :: IsBoxCoord x => Natural -> x -> x
+-- zeroDimension (boxDimension -> BoxDimension dim) = set dim $ boxOrigin ^. dim
+
+class (IsBoxCoord (BoxCoord a), Lattice a, BoundedJoinSemiLattice a) => Liveliness a where
+  type BoxCoord a :: *
+  liveCoords :: Prism' (Set (BoxCoord a)) a
+  liveCoord :: BoxCoord a -> Prism' Bool a
+  liveCoord bC = prism' (\l -> bC `Set.member` review liveCoords l) (bool (Just bottom) (preview liveCoords $ Set.singleton bC))
+
+

From e4acc2653a480ef7604875376dcae6c269f5fa41 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Thu, 18 Apr 2019 21:05:43 +0200
Subject: [PATCH 094/238] make interactive fieldsets js util work with
 checkboxes

---
 static/js/utils/form.js | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index cb7cdd9f9..e7e6401aa 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -124,8 +124,10 @@
    *    Selector for the input that this fieldset watches for changes
    *  data-conditional-value: string
    *    The value the conditional input needs to be set to for this fieldset to be shown
+   *    Can be omitted if conditionalInput is a checkbox
    *
    * Example usage:
+   * ## example with text input
    *  <input id="input-0" type="text">
    *  <fieldset uw-interactive-fieldset data-conditional-input="#input-0" data-conditional-value="yes">...</fieldset>
    *  <fieldset uw-interactive-fieldset data-conditional-input="#input-0" data-conditional-value="no">...</fieldset>
@@ -135,6 +137,11 @@
    *    <option value="1">One
    *  <fieldset uw-interactive-fieldset data-conditional-input="#select-0" data-conditional-value="0">...</fieldset>
    *  <fieldset uw-interactive-fieldset data-conditional-input="#select-0" data-conditional-value="1">...</fieldset>
+   * ## example with checkbox
+   *  <input id="checkbox-0" type="checkbox">
+   *  <input id="checkbox-1" type="checkbox">
+   *  <fieldset uw-interactive-fieldset data-conditional-input="#checkbox-0">...</fieldset>
+   *  <fieldset uw-interactive-fieldset data-conditional-input="#checkbox-1">...</fieldset>
    */
 
   var INTERACTIVE_FIELDSET_UTIL_NAME = 'interactiveFieldset';
@@ -166,7 +173,7 @@
       }
 
       // param conditionalValue
-      if (!element.dataset.conditionalValue) {
+      if (!element.dataset.conditionalValue && !isCheckbox()) {
         throw new Error('Interactive Fieldset needs a conditional value!');
       }
       conditionalValue = element.dataset.conditionalValue;
@@ -188,7 +195,19 @@
     }
 
     function updateVisibility() {
-      element.classList.toggle('hidden', conditionalInput.value !== conditionalValue);
+      element.classList.toggle('hidden', matchesConditionalValue());
+    }
+
+    function matchesConditionalValue() {
+      if (isCheckbox()) {
+        return conditionalInput.checked === true;
+      }
+
+      return conditionalInput.value === conditionalValue;
+    }
+
+    function isCheckbox() {
+      return conditionalInput.getAttribute('type') === 'checkbox';
     }
 
     return init();

From 90061db0769122363444d1cebc070b1a15ddf7a0 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Fri, 19 Apr 2019 21:52:57 +0200
Subject: [PATCH 095/238] fix inverted interactive fieldset hiding logic for
 checkboxes

---
 static/js/utils/form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index e7e6401aa..80673f382 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -195,7 +195,7 @@
     }
 
     function updateVisibility() {
-      element.classList.toggle('hidden', matchesConditionalValue());
+      element.classList.toggle('hidden', !matchesConditionalValue());
     }
 
     function matchesConditionalValue() {

From 2191272c43135bc87f2217b7300cbd63164335f4 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 20 Apr 2019 00:21:30 +0200
Subject: [PATCH 096/238] Restructure recipient form

---
 messages/uniworx/de.msg                       |   7 +-
 src/Data/Universe/TH.hs                       |  69 ++++++++
 src/Handler/Course.hs                         |   6 +-
 src/Handler/Utils/Communication.hs            | 166 +++++++++++-------
 src/Handler/Utils/Form/MassInput.hs           |  58 ++++--
 .../Utils/Form/MassInput/Liveliness.hs        |   8 +-
 src/Handler/Utils/Form/MassInput/TH.hs        |  39 ++++
 src/Handler/Utils/Mail.hs                     |   2 +-
 src/Import/NoFoundation.hs                    |   2 +
 src/Utils/Lens.hs                             |   2 +-
 src/Utils/PathPiece.hs                        |  33 ++++
 src/Web/PathPieces/Instances.hs               |  12 ++
 src/Yesod/Core/Instances.hs                   |   2 +-
 .../widgets/communication/recipientAdd.hamlet |   5 +
 .../communication/recipientEmail.hamlet       |   7 +
 .../communication/recipientLayout.hamlet      |  13 ++
 .../communication/recipientName.hamlet        |   6 +
 17 files changed, 346 insertions(+), 91 deletions(-)
 create mode 100644 src/Data/Universe/TH.hs
 create mode 100644 src/Handler/Utils/Form/MassInput/TH.hs
 create mode 100644 src/Web/PathPieces/Instances.hs
 create mode 100644 templates/widgets/communication/recipientAdd.hamlet
 create mode 100644 templates/widgets/communication/recipientEmail.hamlet
 create mode 100644 templates/widgets/communication/recipientLayout.hamlet
 create mode 100644 templates/widgets/communication/recipientName.hamlet

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index fc0aa2c0d..49184101c 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -763,16 +763,13 @@ NavigationFavourites: Favoriten
 CommSubject: Betreff
 CommBody: Nachricht
 CommRecipients: Empfänger
-CommRecipientsTip: Sie können die Liste von Empfängern beliebig bearbeiten, bevor Sie die Nachricht verschicken. Sie selbst erhalten immer eine Kopie der Nachricht.
-CommRecipientsSelectBy: Auswahl nach
-CommRecipientsSelectByTip: Mögliche Empfänger sind in verschiedene Gruppen unterteilt; sie können sowohl ganze Empfängergruppen als auch einzelne Mitglieder von Empfängergruppen hinzufügen
+CommRecipientsTip: Sie selbst erhalten immer eine Kopie der Nachricht.
 CommDuplicateRecipients n@Int: #{tshow n} #{pluralDE n "doppelter" "doppelte"} Empfänger ignoriert
 CommSuccess n@Int: Nachricht wurde an #{tshow n} Empfänger versandt
 
 CommCourseHeading: Kursmitteilung
 
-AddRecipientGroups: Empfängergruppen
-AddRecipientCustom: Weitere Empfänger
+RecipientCustom: Weitere Empfänger
 
 RGCourseParticipants: Kursteilnehmer
 RGCourseLecturers: Kursverwalter
diff --git a/src/Data/Universe/TH.hs b/src/Data/Universe/TH.hs
new file mode 100644
index 000000000..1dd097e9f
--- /dev/null
+++ b/src/Data/Universe/TH.hs
@@ -0,0 +1,69 @@
+module Data.Universe.TH
+  ( finiteEnum
+  , deriveUniverse
+  , deriveFinite
+  ) where
+
+import Prelude
+
+import Language.Haskell.TH
+import Language.Haskell.TH.Datatype
+
+import Data.Universe
+import Data.Universe.Helpers (interleave)
+
+import Control.Monad (unless)
+
+import Data.List (elemIndex)
+
+
+finiteEnum :: Name -> DecsQ
+-- ^ Declare generic `Enum`- and `Bounded`-Instances given `Finite`- and `Eq`-Instances
+finiteEnum tName = do
+  DatatypeInfo{..} <- reifyDatatype tName
+
+  let datatype = foldl appT (conT datatypeName) $ map pure datatypeVars
+      tUniverse = [e|universeF :: [$(datatype)]|]
+  
+  [d|
+    instance Bounded $(datatype) where
+      minBound = head $(tUniverse)
+      maxBound = last $(tUniverse)
+
+    instance Enum $(datatype) where
+      toEnum n
+        | n >= 0
+        , n < length $(tUniverse)
+        = $(tUniverse) !! n
+        | otherwise = error $ "toEnum " ++ $(stringE $ nameBase tName) ++ ": out of bounds"
+      fromEnum = fromMaybe (error $ "fromEnum " ++ $(stringE $ nameBase tName) ++ ": invalid `universeF`") . flip elemIndex $(tUniverse)
+
+      enumFrom x = map toEnum [fromEnum x .. fromEnum (maxBound :: $(datatype))]
+      enumFromThen x y = map toEnum [fromEnum x, fromEnum y .. fromEnum (maxBound :: $(datatype))]
+    |]
+
+deriveUniverse, deriveFinite :: Name -> DecsQ
+deriveUniverse = deriveUniverse' [e|interleave|] [e|universe|]
+deriveFinite tName = fmap concat . sequence $
+  [ deriveUniverse' [e|concat|] [e|universeF|] tName
+  , do
+      DatatypeInfo{..} <- reifyDatatype tName
+      [d|instance Finite $(foldl appT (conT datatypeName) $ map pure datatypeVars)|]
+  ]
+
+deriveUniverse' :: ExpQ -> ExpQ -> Name -> DecsQ
+deriveUniverse' interleaveExp universeExp tName = do
+  DatatypeInfo{..} <- reifyDatatype tName
+
+  let datatype = foldl appT (conT datatypeName) $ map pure datatypeVars
+      consUniverse ConstructorInfo{..} = do
+        unless (null constructorVars) $
+          fail "Constructors with variables no supported"
+
+        foldl (\f t -> [e|ap|] `appE` f `appE` sigE universeExp (listT `appT` t)) [e|pure $(conE constructorName)|] $ map pure constructorFields
+
+  pure <$> instanceD (cxt []) [t|Universe $(datatype)|]
+    [ funD 'universe
+      [ clause [] (normalB . appE interleaveExp . listE $ map consUniverse datatypeCons) []
+      ]
+    ]
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 1a866936e..b02252f36 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -662,11 +662,12 @@ makeCourseForm miButtonAction template = identifyForm FIDcourse $ \html -> do
         miAllowAdd _ _ _ = True
 
         miLayout :: ListLength
+                 -> Map ListPosition (Either UserEmail UserId, FormResult (Maybe LecturerType)) -- ^ massInput state
                  -> Map ListPosition Widget -- ^ Cell widgets
                  -> Map ListPosition (FieldView UniWorX) -- ^ Deletion buttons
                  -> Map (Natural, ListPosition) Widget -- ^ Addition widgets
                  -> Widget
-        miLayout lLength cellWdgts delButtons addWdgts = $(widgetFile "course/lecturerMassInput/layout")
+        miLayout lLength _ cellWdgts delButtons addWdgts = $(widgetFile "course/lecturerMassInput/layout")
 
 
         lecturerForm :: AForm Handler [Either (UserEmail, Maybe LecturerType) (UserId, LecturerType)]
@@ -1120,6 +1121,9 @@ postCCommR tid ssh csh = do
             return user
         )
       ]
+    , crRecipientAuth = Just $ \uid -> do
+        cID <- encrypt uid
+        evalAccessDB (CourseR tid ssh csh $ CUserR cID) False
     }
 
  
diff --git a/src/Handler/Utils/Communication.hs b/src/Handler/Utils/Communication.hs
index 6d4527402..47e3eb0e2 100644
--- a/src/Handler/Utils/Communication.hs
+++ b/src/Handler/Utils/Communication.hs
@@ -17,9 +17,15 @@ import Control.Monad.Trans.Reader (mapReaderT)
 
 import qualified Database.Esqueleto as E
 import qualified Data.CaseInsensitive as CI
+import Data.Map ((!), (!?))
 import qualified Data.Map as Map
 import qualified Data.Set as Set
 
+import Data.Aeson.TH
+import Data.Aeson.Types (ToJSONKey(..), FromJSONKey(..), toJSONKeyText, FromJSONKeyFunction(..))
+
+import Data.List (nub)
+
 
 data RecipientGroup = RGCourseParticipants | RGCourseLecturers | RGCourseCorrectors
   deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
@@ -29,43 +35,51 @@ instance Finite RecipientGroup
 nullaryPathPiece ''RecipientGroup $ camelToPathPiece' 1
 embedRenderMessage ''UniWorX ''RecipientGroup id
 
+deriveJSON defaultOptions
+  { constructorTagModifier = camelToPathPiece' 1
+  } ''RecipientGroup
 
-data RecipientAddOption
-  = AddRecipientGroups
-  | AddRecipientGroup RecipientGroup
-  | AddRecipientCustom
+
+data RecipientCategory
+  = RecipientGroup RecipientGroup
+  | RecipientCustom
   deriving (Eq, Ord, Read, Show, Generic, Typeable)
 
-instance Universe RecipientAddOption where
-  universe = concat
-    [ pure AddRecipientGroups
-    , [ AddRecipientGroup g | g <- universe ]
-    , pure AddRecipientCustom
-    ]
-instance Finite RecipientAddOption
+deriveFinite ''RecipientCategory
+finiteEnum ''RecipientCategory
 
-instance PathPiece RecipientAddOption where
-  toPathPiece AddRecipientGroups    = "recipient-groups"
-  toPathPiece AddRecipientCustom    = "recipient-custom"
-  toPathPiece (AddRecipientGroup g) = toPathPiece g
+deriveJSON defaultOptions
+  { constructorTagModifier = camelToPathPiece' 1
+  , unwrapUnaryRecords = True
+  , sumEncoding = UntaggedValue
+  } ''RecipientCategory
+
+instance ToJSONKey RecipientCategory where
+  toJSONKey = toJSONKeyText toPathPiece
+instance FromJSONKey RecipientCategory where
+  fromJSONKey = FromJSONKeyTextParser $ maybe (fail "Could not pars RecipientCategory") return . fromPathPiece
+
+instance PathPiece RecipientCategory where
+  toPathPiece RecipientCustom    = "custom"
+  toPathPiece (RecipientGroup g) = toPathPiece g
 
   fromPathPiece = finiteFromPathPiece
 
-instance RenderMessage UniWorX RecipientAddOption where
+instance RenderMessage UniWorX RecipientCategory where
   renderMessage foundation ls = \case
-    AddRecipientGroups  -> renderMessage' MsgAddRecipientGroups
-    AddRecipientCustom  -> renderMessage' MsgAddRecipientCustom
-    AddRecipientGroup g -> renderMessage' g
+    RecipientCustom  -> renderMessage' MsgRecipientCustom
+    RecipientGroup g -> renderMessage' g
     where
       renderMessage' :: forall msg. RenderMessage UniWorX msg => msg -> Text
       renderMessage' = renderMessage foundation ls
 
 
 data CommunicationRoute = CommunicationRoute
-  { crRecipients :: Map RecipientGroup (E.SqlQuery (E.SqlExpr (Entity User)))
-  , crJobs       :: Communication -> Source (YesodDB UniWorX) Job
-  , crHeading    :: SomeMessage UniWorX
-  , crUltDest    :: SomeRoute UniWorX
+  { crRecipients    :: Map RecipientGroup (E.SqlQuery (E.SqlExpr (Entity User)))
+  , crRecipientAuth :: Maybe (UserId -> DB AuthResult)
+  , crJobs          :: Communication -> Source (YesodDB UniWorX) Job
+  , crHeading       :: SomeMessage UniWorX
+  , crUltDest       :: SomeRoute UniWorX
   }
 
 data Communication = Communication
@@ -77,58 +91,80 @@ data Communication = Communication
 
 commR :: CommunicationRoute -> Handler Html
 commR CommunicationRoute{..} =  do
-  uid <- maybeAuthId
+  cUser <- maybeAuth
   
   MsgRenderer mr <- getMsgRenderer
   mbCurrentRoute <- getCurrentRoute
 
-  suggestedRecipients' <- runDB $ traverse E.select crRecipients
-  suggestedRecipients <- forM suggestedRecipients' . mapM $ \ent@(Entity rid _) -> (,) <$> (encrypt rid :: Handler CryptoUUIDUser) <*> pure ent
+  (suggestedRecipients, chosenRecipients) <- runDB $ do
+    suggested <- for crRecipients $ \user -> E.select user
 
-  chosenRecipients <- fmap (maybe id cons uid) $ mapM (decrypt :: CryptoUUIDUser -> Handler UserId) =<< lookupGlobalGetParams GetRecipient
+    let
+      decrypt' :: CryptoUUIDUser -> DB (Maybe (Entity User))
+      decrypt' cID = do
+        uid <- decrypt cID
+        whenIsJust crRecipientAuth $ guardAuthResult <=< ($ uid)
+        getEntity uid
+
+    chosen' <- fmap (maybe id cons cUser . catMaybes) $ mapM decrypt' =<< lookupGlobalGetParams GetRecipient
+
+    return (suggested, chosen')
+
+  let
+    lookupUser :: UserId -> User
+    lookupUser lId
+      = entityVal . unsafeHead . filter ((== lId) . entityKey) $ (concat $ Map.elems suggestedRecipients) ++ chosenRecipients
+
+  let chosenRecipients' = Map.fromList $
+        [ ( (EnumPosition $ RecipientGroup g, pos)
+          , (Right recp, recp `elem` map entityKey chosenRecipients)
+          )
+        | (g, recps) <- Map.toList suggestedRecipients
+        , (pos, recp) <- zip [0..] $ map entityKey recps
+        ] ++
+        [ ( (EnumPosition   RecipientCustom, pos)
+          , (Right recp, True)
+          )
+        | (pos, recp) <- zip [0..] . Set.toList $ Set.fromList (map entityKey chosenRecipients) \\ Set.fromList (concatMap (map entityKey) $ Map.elems suggestedRecipients)
+        ]
+      activeCategories = map RecipientGroup (Map.keys suggestedRecipients) `snoc` RecipientCustom
 
   let recipientAForm :: AForm Handler (Set (Either UserEmail UserId))
-      recipientAForm = postProcess <$> massInputA MassInput{..} (fslI MsgCommRecipients & setTooltip MsgCommRecipientsTip) True (Just . Map.fromList . zip [0..] $ map ((, ()) . Right) chosenRecipients)
+      recipientAForm = postProcess <$> massInputA MassInput{..} (fslI MsgCommRecipients & setTooltip MsgCommRecipientsTip) True (Just chosenRecipients')
         where
-          miAdd _ _ nudge submitView = Just $ \csrf -> do
-            let addOptions :: Map RecipientAddOption (AForm Handler (Set (Either UserEmail UserId)))
-                addOptions = Map.fromList . concat $
-                  [ pure ( AddRecipientGroups
-                         , Set.unions <$> apreq (multiSelectField . return $ mkOptionList
-                                                   [ Option (mr g) (Set.fromList $ map (Right . entityKey . snd) recs) (toPathPiece g) | (g,recs) <- Map.toList suggestedRecipients ]
-                                                ) (fslI AddRecipientGroups & addName (nudge . toPathPiece $ AddRecipientGroups) & setTooltip MsgMultiSelectFieldTip) Nothing
-                         )
-                  , do
-                      (g, recs) <- Map.toList suggestedRecipients
-                      guard . not $ null recs
-                      return ( AddRecipientGroup g
-                             , Set.unions <$> apreq (multiSelectField . return $ mkOptionList
-                                                       [ Option userDisplayName (Set.singleton $ Right rid) (toPathPiece cid) | (cid, Entity rid User{..}) <- recs ]
-                                                    ) (fslI (AddRecipientGroup g) & addName (nudge . toPathPiece $ AddRecipientGroup g) & setTooltip MsgMultiSelectFieldTip) Nothing
-                             )
-                  , pure ( AddRecipientCustom
-                         , Set.fromList . map (Left . CI.mk) <$> apreq multiEmailField (fslI AddRecipientCustom & addName (nudge $ toPathPiece AddRecipientCustom) & setTooltip MsgMultiEmailFieldTip) Nothing )
-                  ]
-            (addRes, addWdgt) <- multiActionM addOptions (fslI MsgCommRecipientsSelectBy & addName (nudge "select") & setTooltip MsgCommRecipientsSelectByTip) Nothing csrf
-            let addRes'  = addRes <&> \newSet oldMap ->
-                  let freshSet = newSet `Set.difference` Set.fromList (Map.elems oldMap)
-                  in  FormSuccess . Map.fromList . zip [maybe 0 (succ . fst) (Map.lookupMax oldMap)..] $ Set.toList freshSet
-                addWdgt' = mconcat [ toWidget csrf, addWdgt, fvInput submitView ]
-            return (addRes', addWdgt')
-
-          miCell _ (Left email) _ _nudge csrf
-            = return (pure (), toWidget csrf <> toWidget (mailtoHtml email))
-          miCell _ (Right rid) _ _nudge csrf = do
-            User{..} <- liftHandlerT . runDB $ getJust rid
-            return (pure (), toWidget csrf <> nameEmailWidget userEmail userDisplayName userSurname)
-          miDelete :: ListLength -> ListPosition -> MaybeT (MForm Handler) (Map ListPosition ListPosition) -- This type signature is needed, so GHC can infer the type of @MassInput{..}@, above
-          miDelete = miDeleteList -- default for lists suffices, since there are no restrictions
-          miAllowAdd _ _ _ = True
+          miAdd (EnumPosition RecipientCustom, 0) 1 nudge submitView = Just $ \csrf -> do
+            (addRes, addView) <- mpreq multiEmailField (fslpI MsgEMail (mr MsgEMail) & setTooltip MsgMultiEmailFieldTip & addName (nudge "email")) Nothing
+            let
+              addRes' = addRes <&> \(nub . map CI.mk -> nEmails) (maybe 0 (succ . snd . fst) . Map.lookupMax . Map.filterWithKey (\(EnumPosition c, _) _ -> c == RecipientCustom) -> kStart) -> FormSuccess . Map.fromList $ zip (map (EnumPosition RecipientCustom, ) [kStart..]) (map Left nEmails)
+            return (addRes', $(widgetFile "widgets/communication/recipientAdd"))
+          miAdd _ _ _ _ = Nothing
+          miCell _ (Left (CI.original -> email)) initRes nudge csrf = do
+            (tickRes, tickView) <- mpreq checkBoxField ("" & addName (nudge "tick")) initRes
+            return (tickRes, $(widgetFile "widgets/communication/recipientEmail"))
+          miCell _ (Right (lookupUser -> User{..})) initRes nudge csrf = do 
+            (tickRes, tickView) <- mpreq checkBoxField ("" & addName (nudge "tick")) initRes
+            return (tickRes, $(widgetFile "widgets/communication/recipientName"))
+          miAllowAdd (EnumPosition RecipientCustom, 0) 1 _ = True
+          miAllowAdd _ _ _ = False
           miButtonAction :: forall p . PathPiece p => p -> Maybe (SomeRoute UniWorX)
           miButtonAction anchor = SomeRoute . (:#: anchor) <$> mbCurrentRoute
-          miLayout = defaultMiLayout
-          postProcess :: Map ListPosition (Either UserEmail UserId, ()) -> Set (Either UserEmail UserId)
-          postProcess = Set.fromList . map fst . Map.elems
+          miLayout :: MapLiveliness (EnumLiveliness RecipientCategory) ListLength
+                   -> Map (EnumPosition RecipientCategory, ListPosition) (_, FormResult Bool)
+                   -> Map (EnumPosition RecipientCategory, ListPosition) Widget
+                   -> Map (EnumPosition RecipientCategory, ListPosition) (FieldView UniWorX)
+                   -> Map (Natural, (EnumPosition RecipientCategory, ListPosition)) Widget
+                   -> Widget
+          miLayout liveliness state cellWdgts _delButtons addWdgts = do
+            checkedIdentBase <- newIdent
+            let checkedCategories = Set.mapMonotonic (unEnumPosition . fst) . Set.filter (\k' -> Map.foldrWithKey (\k (_, checkState) -> (||) $ k == k' && checkState /= FormSuccess False && checkState /= FormMissing) False state) $ Map.keysSet state
+                checkedIdent c = checkedIdentBase <> "-" <> toPathPiece c
+                categoryIndices c = Set.filter ((== c) . unEnumPosition . fst) $ review liveCoords liveliness
+            $(widgetFile "widgets/communication/recipientLayout")
+          miDelete :: MapLiveliness (EnumLiveliness RecipientCategory) ListLength -> (EnumPosition RecipientCategory, ListPosition) -> MaybeT (MForm Handler) (Map (EnumPosition RecipientCategory, ListPosition) (EnumPosition RecipientCategory, ListPosition))
+          -- miDelete liveliness@(MapLiveliness lMap) (EnumPosition RecipientCustom, delPos) = mappend (Map.fromSet id . Set.filter (\(EnumPosition c, _) -> c /= RecipientCustom) $ review liveCoords liveliness) . fmap (EnumPosition RecipientCustom, ) . Map.mapKeysMonotonic (EnumPosition RecipientCustom, ) <$> miDeleteList (lMap ! EnumPosition RecipientCustom) delPos
+          miDelete _ _ = mzero
+          postProcess :: Map (EnumPosition RecipientCategory, ListPosition) (Either UserEmail UserId, Bool) -> Set (Either UserEmail UserId)
+          postProcess = Set.fromList . map fst . filter snd . Map.elems
 
   ((commRes,commWdgt),commEncoding) <- runFormPost . identifyForm FIDCommunication . renderAForm FormStandard $ Communication
     <$> recipientAForm
diff --git a/src/Handler/Utils/Form/MassInput.hs b/src/Handler/Utils/Form/MassInput.hs
index e30c061ee..3b7087e7b 100644
--- a/src/Handler/Utils/Form/MassInput.hs
+++ b/src/Handler/Utils/Form/MassInput.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 
 module Handler.Utils.Form.MassInput
@@ -9,6 +10,7 @@ module Handler.Utils.Form.MassInput
   , massInputList
   , ListLength(..), ListPosition(..), miDeleteList
   , EnumLiveliness(..), EnumPosition(..)
+  , MapLiveliness(..)
   ) where
 
 import Import
@@ -16,6 +18,7 @@ import Utils.Form
 import Utils.Lens
 import Handler.Utils.Form (secretJsonField)
 import Handler.Utils.Form.MassInput.Liveliness
+import Handler.Utils.Form.MassInput.TH
 
 import Data.Aeson
 
@@ -30,11 +33,13 @@ import qualified Data.IntSet as IntSet
 import Data.Map ((!))
 import qualified Data.Map as Map
 import qualified Data.Foldable as Fold
-import Data.List (iterate)
 
 import Control.Monad.Reader.Class (MonadReader(local))
 
 
+$(mapM tupleBoxCoord [2..4])
+
+
 newtype ListLength = ListLength { unListLength :: Natural }
   deriving newtype (Num, Integral, Real, Enum, PathPiece)
   deriving (Eq, Ord, Generic, Typeable, Read, Show)
@@ -50,7 +55,7 @@ instance BoundedJoinSemiLattice ListLength where
   bottom = 0
 
 newtype ListPosition = ListPosition { unListPosition :: Natural }
-  deriving newtype (Num, Integral, Real, Enum, PathPiece, ToJSONKey, FromJSONKey)
+  deriving newtype (Num, Integral, Real, Enum, PathPiece, ToJSON, FromJSON, ToJSONKey, FromJSONKey)
   deriving (Eq, Ord, Generic, Typeable, Read, Show)
 
 makeWrapped ''ListPosition
@@ -95,16 +100,16 @@ instance (Enum enum, Bounded enum) => BoundedLattice (EnumLiveliness enum)
 
 
 newtype EnumPosition enum = EnumPosition { unEnumPosition :: enum }
-  deriving newtype (Enum, Bounded, PathPiece, ToJSONKey, FromJSONKey)
+  deriving newtype (Enum, Bounded, PathPiece, ToJSON, FromJSON, ToJSONKey, FromJSONKey)
   deriving (Eq, Ord, Generic, Typeable, Read, Show)
 
 makeWrapped ''EnumPosition
 
-instance (Enum enum, Bounded enum, PathPiece enum, ToJSONKey enum, FromJSONKey enum, Eq enum, Ord enum) => IsBoxCoord (EnumPosition enum) where
+instance (Enum enum, Bounded enum, PathPiece enum, ToJSON enum, FromJSON enum, ToJSONKey enum, FromJSONKey enum, Eq enum, Ord enum) => IsBoxCoord (EnumPosition enum) where
   boxDimensions = [BoxDimension _Wrapped]
   boxOrigin = minBound
 
-instance (Enum enum, Bounded enum, PathPiece enum, ToJSONKey enum, FromJSONKey enum, Eq enum, Ord enum) => Liveliness (EnumLiveliness enum) where
+instance (Enum enum, Bounded enum, PathPiece enum, ToJSON enum, FromJSON enum, ToJSONKey enum, FromJSONKey enum, Eq enum, Ord enum) => Liveliness (EnumLiveliness enum) where
   type BoxCoord (EnumLiveliness enum) = EnumPosition enum
   liveCoords = iso fromSet toSet
     where
@@ -112,6 +117,30 @@ instance (Enum enum, Bounded enum, PathPiece enum, ToJSONKey enum, FromJSONKey e
       fromSet = EnumLiveliness . IntSet.fromList . map fromEnum . Set.toList
 
 
+newtype MapLiveliness l1 l2 = MapLiveliness { unMapLiveliness :: Map (BoxCoord l1) l2 }
+  deriving (Generic, Typeable)
+
+makeWrapped ''MapLiveliness
+
+deriving instance (Ord (BoxCoord l1), JoinSemiLattice l2) => JoinSemiLattice (MapLiveliness l1 l2)
+deriving instance (Ord (BoxCoord l1), MeetSemiLattice l2) => MeetSemiLattice (MapLiveliness l1 l2)
+deriving instance (Ord (BoxCoord l1), Lattice l2) => Lattice (MapLiveliness l1 l2)
+deriving instance (Ord (BoxCoord l1), BoundedJoinSemiLattice l2) => BoundedJoinSemiLattice (MapLiveliness l1 l2)
+deriving instance (Ord (BoxCoord l1), Finite (BoxCoord l1), BoundedMeetSemiLattice l2) => BoundedMeetSemiLattice (MapLiveliness l1 l2)
+deriving instance (Ord (BoxCoord l1), Finite (BoxCoord l1), BoundedLattice l2) => BoundedLattice (MapLiveliness l1 l2)
+deriving instance (Eq (BoxCoord l1), Eq l2) => Eq (MapLiveliness l1 l2)
+deriving instance (Ord (BoxCoord l1), Ord l2) => Ord (MapLiveliness l1 l2)
+deriving instance (Ord (BoxCoord l1), Read (BoxCoord l1), Read l2) => Read (MapLiveliness l1 l2)
+deriving instance (Show (BoxCoord l1), Show l2) => Show (MapLiveliness l1 l2)
+
+instance (Liveliness l1, Liveliness l2) => Liveliness (MapLiveliness l1 l2) where
+  type BoxCoord (MapLiveliness l1 l2) = (BoxCoord l1, BoxCoord l2)
+  liveCoords = prism'
+    (Set.fromList . concatMap (\(k, v) -> (k, ) <$> Set.toAscList (review liveCoords v)) . Map.toAscList . unMapLiveliness)
+    (\ts -> let ks = Set.mapMonotonic fst ts in fmap MapLiveliness . sequence $ Map.fromSet (\k -> preview liveCoords . Set.mapMonotonic snd $ Set.filter ((== k) . fst) ts) ks)
+
+
+
 miDeleteList :: Applicative m => ListLength -> ListPosition -> m (Map ListPosition ListPosition)
 miDeleteList l pos
     -- Close gap left by deleted position with values from further down the list; try prohibiting certain deletions by utilising `guard`
@@ -222,6 +251,7 @@ data MassInput handler liveliness cellData cellResult = MassInput
                -> Bool -- ^ Decide whether an addition-operation should be permitted
   , miButtonAction :: forall p. PathPiece p => p -> Maybe (SomeRoute UniWorX) -- ^ Override form-tag route for `massInput`-Buttons to keep the user closer to the Widget, the `PathPiece` Argument is to be used for constructiong a `Fragment`
   , miLayout :: liveliness
+             -> Map (BoxCoord liveliness) (cellData, FormResult cellResult)
              -> Map (BoxCoord liveliness) Widget -- ^ Cell Widgets
              -> Map (BoxCoord liveliness) (FieldView UniWorX) -- ^ Delete buttons
              -> Map (Natural, BoxCoord liveliness) Widget -- ^ Addition forms
@@ -368,6 +398,7 @@ massInput MassInput{..} FieldSettings{..} fvRequired initialResult csrf = do
   let miWidget
         = miLayout
           liveliness
+          (fmap (view _1 &&& view (_2 . _1)) cellResults)
           (fmap (view $ _2 . _2) cellResults)
           (fmap (view _2) delResults)
           (Map.mapMaybeWithKey (\(dimIx, miCoord) (_, wdgt) -> wdgt <* guard (miAllowAdd miCoord dimIx liveliness)) addResults)
@@ -381,20 +412,21 @@ massInput MassInput{..} FieldSettings{..} fvRequired initialResult csrf = do
     fvErrors = Nothing
     in return (result, FieldView{..})
 
-defaultMiLayout :: forall liveliness.
+defaultMiLayout :: forall liveliness cellData cellResult.
                    Liveliness liveliness
                 => liveliness
+                -> Map (BoxCoord liveliness) (cellData, FormResult cellResult)
                 -> Map (BoxCoord liveliness) Widget
                 -> Map (BoxCoord liveliness) (FieldView UniWorX)
                 -> Map (Natural, BoxCoord liveliness) Widget
                 -> Widget
 -- | Generic `miLayout` using recursively nested lists
-defaultMiLayout liveliness cellResults delResults addResults = miWidget' boxOrigin $ zip [0..] boxDimensions
+defaultMiLayout liveliness _ cellResults delResults addResults = miWidget' boxOrigin [] $ zip [0..] boxDimensions
   where
-    miWidget' :: BoxCoord liveliness -> [(Natural, BoxDimension (BoxCoord liveliness))] -> Widget
-    miWidget' _ [] = mempty
-    miWidget' miCoord ((dimIx, BoxDimension dim) : remDims) =
-      let coords = takeWhile (\c -> review (liveCoord c) liveliness) $ iterate (over dim succ) miCoord
+    miWidget' :: BoxCoord liveliness -> [(Natural, BoxDimension (BoxCoord liveliness))] -> [(Natural, BoxDimension (BoxCoord liveliness))] -> Widget
+    miWidget' _ _ [] = mempty
+    miWidget' miCoord pDims (dim'@(dimIx, BoxDimension dim) : remDims) =
+      let coords = Set.toList . Set.map (\c -> miCoord & dim .~ (c ^. dim)) . Set.filter (\c -> and [ ((==) `on` view pDim) miCoord c | (_, BoxDimension pDim) <- pDims ]) $ review liveCoords liveliness
           cells
             | [] <- remDims = do
                 coord <- coords
@@ -402,7 +434,7 @@ defaultMiLayout liveliness cellResults delResults addResults = miWidget' boxOrig
                 let deleteButton = Map.lookup coord delResults
                 return (coord, $(widgetFile "widgets/massinput/cell"))
             | otherwise =
-                [ (coord, miWidget' coord remDims) | coord <- coords ]
+                [ (coord, miWidget' coord (pDims `snoc` dim') remDims) | coord <- coords ]
           addWidget = Map.lookup (dimIx, miCoord) addResults
        in $(widgetFile "widgets/massinput/row")
 
@@ -427,7 +459,7 @@ massInputList field fieldSettings miButtonAction miSettings miRequired miPrevRes
             , miDelete = miDeleteList
             , miAllowAdd = \_ _ _ -> True
             , miButtonAction
-            , miLayout = \lLength cellWdgts delButtons addWdgts
+            , miLayout = \lLength _ cellWdgts delButtons addWdgts
               -> $(widgetFile "widgets/massinput/list/layout")
             }
   miSettings
diff --git a/src/Handler/Utils/Form/MassInput/Liveliness.hs b/src/Handler/Utils/Form/MassInput/Liveliness.hs
index 53c33d236..9891350d8 100644
--- a/src/Handler/Utils/Form/MassInput/Liveliness.hs
+++ b/src/Handler/Utils/Form/MassInput/Liveliness.hs
@@ -7,8 +7,8 @@ module Handler.Utils.Form.MassInput.Liveliness
 
 import ClassyPrelude
 
-import Web.PathPieces(PathPiece)
-import Data.Aeson (ToJSONKey, FromJSONKey)
+import Web.PathPieces (PathPiece)
+import Data.Aeson (ToJSON, FromJSON, ToJSONKey, FromJSONKey)
 
 import Numeric.Natural
 
@@ -20,9 +20,9 @@ import qualified Data.Set as Set
 import Data.List (genericLength, genericIndex)
 
 
-data BoxDimension x = forall n. Enum n => BoxDimension (Lens' x n)
+data BoxDimension x = forall n. (Enum n, Eq n) => BoxDimension (Lens' x n)
 
-class (PathPiece x, ToJSONKey x, FromJSONKey x, Eq x, Ord x) => IsBoxCoord x where
+class (ToJSON x, FromJSON x, ToJSONKey x, FromJSONKey x, PathPiece x, Eq x, Ord x) => IsBoxCoord x where
   boxDimensions :: [BoxDimension x]
   boxOrigin :: x
 
diff --git a/src/Handler/Utils/Form/MassInput/TH.hs b/src/Handler/Utils/Form/MassInput/TH.hs
new file mode 100644
index 000000000..b495a244b
--- /dev/null
+++ b/src/Handler/Utils/Form/MassInput/TH.hs
@@ -0,0 +1,39 @@
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+
+module Handler.Utils.Form.MassInput.TH
+  ( tupleBoxCoord
+  ) where
+
+import Prelude
+import Handler.Utils.Form.MassInput.Liveliness
+
+import Language.Haskell.TH
+
+import Control.Lens
+
+import Data.List ((!!))
+
+
+tupleBoxCoord :: Int -> DecQ
+tupleBoxCoord tupleDim = do
+  cs <- sequence . replicate tupleDim $ newName "c"
+
+  let tupleType = foldl appT (tupleT tupleDim) $ map varT cs
+      tCxt = cxt $ concat
+        [ [ [t|IsBoxCoord $(varT c)|] | c <- cs ]
+        ]
+      fieldLenses =
+        [ [e|_1|]
+        , [e|_2|]
+        , [e|_3|]
+        , [e|_4|]
+        ]
+
+  instanceD tCxt ([t|IsBoxCoord|] `appT` tupleType)
+    [ funD 'boxDimensions
+      [ clause [] (normalB . foldr1 (\ds1 ds2 -> [e|(++)|] `appE` ds1 `appE` ds2) . map (\field -> [e|map (\(BoxDimension dim) -> BoxDimension $ $(field) . dim) boxDimensions|]) $ map (fieldLenses !!) [0..pred tupleDim]) []
+      ]
+    , funD 'boxOrigin
+      [ clause [] (normalB . tupE $ replicate tupleDim [e|boxOrigin|]) []
+      ]
+    ]
diff --git a/src/Handler/Utils/Mail.hs b/src/Handler/Utils/Mail.hs
index 02af114b7..211923159 100644
--- a/src/Handler/Utils/Mail.hs
+++ b/src/Handler/Utils/Mail.hs
@@ -7,7 +7,7 @@ module Handler.Utils.Mail
 
 import Import
 
-import Utils.Lens hiding (snoc)
+import Utils.Lens
 
 import qualified Data.CaseInsensitive as CI
 
diff --git a/src/Import/NoFoundation.hs b/src/Import/NoFoundation.hs
index 0a7f4f126..51de48a1e 100644
--- a/src/Import/NoFoundation.hs
+++ b/src/Import/NoFoundation.hs
@@ -36,6 +36,7 @@ import Text.Lucius            as Import
 import Text.Shakespeare.Text  as Import hiding (text, stext)
 
 import Data.Universe          as Import
+import Data.Universe.TH       as Import
 import Data.Pool              as Import (Pool)
 import Network.HaskellNet.SMTP as Import (SMTPConnection)
 
@@ -83,6 +84,7 @@ import Control.Monad.Random.Class as Import (MonadRandom(..))
 
 import Text.Blaze.Instances as Import ()
 import Jose.Jwt.Instances as Import ()
+import Web.PathPieces.Instances as Import ()
 
 
 import Control.Monad.Trans.RWS (RWST)
diff --git a/src/Utils/Lens.hs b/src/Utils/Lens.hs
index c71790d31..f83e91b59 100644
--- a/src/Utils/Lens.hs
+++ b/src/Utils/Lens.hs
@@ -2,7 +2,7 @@ module Utils.Lens ( module Utils.Lens ) where
 
 import ClassyPrelude.Yesod hiding ((.=))
 import Model
-import Control.Lens as Utils.Lens hiding ((<.>), universe)
+import Control.Lens as Utils.Lens hiding ((<.>), universe, snoc)
 import Control.Lens.Extras as Utils.Lens (is)
 import Utils.Lens.TH as Utils.Lens (makeLenses_, makeClassyFor_)
 
diff --git a/src/Utils/PathPiece.hs b/src/Utils/PathPiece.hs
index 5e0dd8621..7f2e0bd78 100644
--- a/src/Utils/PathPiece.hs
+++ b/src/Utils/PathPiece.hs
@@ -4,6 +4,7 @@ module Utils.PathPiece
   , nullaryPathPiece
   , splitCamel
   , camelToPathPiece, camelToPathPiece'
+  , tuplePathPiece
   ) where
 
 import ClassyPrelude.Yesod
@@ -17,6 +18,9 @@ import qualified Data.Char as Char
 
 import Numeric.Natural
 
+import Data.List (foldl)
+  
+
 finiteFromPathPiece :: (PathPiece a, Finite a) => Text -> Maybe a
 finiteFromPathPiece text = case filter (\c -> toPathPiece c == text) universeF of
   [x] -> Just x
@@ -63,3 +67,32 @@ camelToPathPiece' dropN = intercalate "-" . map toLower . drop (fromIntegral dro
 
 camelToPathPiece :: Textual t => t -> t
 camelToPathPiece = camelToPathPiece' 0
+
+
+tuplePathPiece :: Int -> DecQ
+tuplePathPiece tupleDim = do
+  let
+    tupleSeparator :: Text
+    tupleSeparator = ","
+  
+  xs <- sequence . replicate tupleDim $ newName "x" :: Q [Name]
+  xs' <- sequence . replicate tupleDim $ newName "x'" :: Q [Name]
+
+  let tupleType = foldl appT (tupleT tupleDim) $ map varT xs
+      tCxt = cxt
+        [ [t|PathPiece $(varT x)|] | x <- xs ]
+
+  t <- newName "t"
+
+  instanceD tCxt [t|PathPiece $(tupleType)|]
+    [ funD 'toPathPiece
+      [ clause [tupP $ map varP xs] (normalB [e|Text.intercalate tupleSeparator $(listE $ map (appE [e|toPathPiece|] . varE) xs)|]) []
+      ]
+    , funD 'fromPathPiece
+      [ clause [varP t] (normalB . doE $ concat
+                         [ pure $ bindS (listP $ map varP xs) [e|return $ Text.splitOn tupleSeparator $(varE t)|]
+                         , [ bindS (varP x') [e|fromPathPiece $(varE x)|] | (x, x') <- zip xs xs' ]
+                         , pure $ noBindS [e|return $(tupE $ map varE xs')|]
+                         ]) []
+      ]
+    ]
diff --git a/src/Web/PathPieces/Instances.hs b/src/Web/PathPieces/Instances.hs
new file mode 100644
index 000000000..a47711a8e
--- /dev/null
+++ b/src/Web/PathPieces/Instances.hs
@@ -0,0 +1,12 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Web.PathPieces.Instances
+  (
+  ) where
+
+import Prelude
+
+import Utils.PathPiece
+
+
+$(mapM tuplePathPiece [2..4])
diff --git a/src/Yesod/Core/Instances.hs b/src/Yesod/Core/Instances.hs
index 50b37679b..153cbec8e 100644
--- a/src/Yesod/Core/Instances.hs
+++ b/src/Yesod/Core/Instances.hs
@@ -102,4 +102,4 @@ instance Extend FormResult where
   duplicated  FormMissing       = FormMissing
   duplicated (FormFailure errs) = FormFailure errs
 
-
+deriving instance Eq a => Eq (FormResult a)
diff --git a/templates/widgets/communication/recipientAdd.hamlet b/templates/widgets/communication/recipientAdd.hamlet
new file mode 100644
index 000000000..6f992e6bd
--- /dev/null
+++ b/templates/widgets/communication/recipientAdd.hamlet
@@ -0,0 +1,5 @@
+$newline never
+<div .category__entry-add>
+  #{csrf}
+  ^{fvInput addView}
+  ^{fvInput submitView}
diff --git a/templates/widgets/communication/recipientEmail.hamlet b/templates/widgets/communication/recipientEmail.hamlet
new file mode 100644
index 000000000..ed3964879
--- /dev/null
+++ b/templates/widgets/communication/recipientEmail.hamlet
@@ -0,0 +1,7 @@
+$newline never
+<div .category__option>
+  #{csrf}
+  ^{fvInput tickView}
+  <label for=#{fvId tickView}>
+    <span style="font-family: monospace">
+      #{email}
diff --git a/templates/widgets/communication/recipientLayout.hamlet b/templates/widgets/communication/recipientLayout.hamlet
new file mode 100644
index 000000000..ef3053f4a
--- /dev/null
+++ b/templates/widgets/communication/recipientLayout.hamlet
@@ -0,0 +1,13 @@
+$newline never
+$forall category <- activeCategories
+  <div .category>
+    <input type=checkbox id=#{checkedIdent category} :elem category checkedCategories:checked>
+    <label for=#{checkedIdent category}>
+      _{category}
+
+    <fieldset uw-interactive-fieldset data-conditional-input=#{checkedIdent category}>
+      $forall optIx <- categoryIndices category
+        ^{cellWdgts ! optIx}
+
+      $maybe addWdgt <- addWdgts !? (0, (EnumPosition category, 0))
+        ^{addWdgt}
diff --git a/templates/widgets/communication/recipientName.hamlet b/templates/widgets/communication/recipientName.hamlet
new file mode 100644
index 000000000..1da8a7fe3
--- /dev/null
+++ b/templates/widgets/communication/recipientName.hamlet
@@ -0,0 +1,6 @@
+$newline never
+<div .category__option>
+  #{csrf}
+  ^{fvInput tickView}
+  <label for=#{fvId tickView}>
+    #{nameHtml userDisplayName userSurname}

From feee06e80aa117bcf2a6606301f7ec1dd5aeb466 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 20 Apr 2019 12:20:35 +0200
Subject: [PATCH 097/238] Rework recipient UI

---
 src/Handler/Admin.hs                          |  2 +-
 src/Handler/Course.hs                         |  3 +++
 src/Handler/Utils/Communication.hs            |  8 ++++---
 src/Handler/Utils/Form/MassInput.hs           | 23 +++++++++++--------
 static/js/utils/form.js                       | 16 +++++++++----
 templates/widgets/aform/aform.hamlet          |  2 +-
 .../communication/recipientLayout.hamlet      |  4 ++--
 7 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs
index a47cce3b7..aba016f41 100644
--- a/src/Handler/Admin.hs
+++ b/src/Handler/Admin.hs
@@ -205,7 +205,7 @@ postAdminTestR = do
 
   -- The actual call to @massInput@ is comparatively simple:
 
-  ((miResult, fvInput -> miForm), miEnc) <- runFormPost . identifyForm ("massinput" :: Text) $ massInput (MassInput mkAddForm mkCellForm deleteCell allowAdd buttonAction defaultMiLayout) "" True Nothing
+  ((miResult, fvInput -> miForm), miEnc) <- runFormPost . identifyForm ("massinput" :: Text) $ massInput (MassInput mkAddForm mkCellForm deleteCell allowAdd (\_ _ _ -> Set.empty) buttonAction defaultMiLayout) "" True Nothing
 
 
   let locallyDefinedPageHeading = [whamlet|Admin TestPage for Uni2work|]
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index b02252f36..593b08f7d 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -661,6 +661,9 @@ makeCourseForm miButtonAction template = identifyForm FIDcourse $ \html -> do
         miAllowAdd :: ListPosition -> Natural -> ListLength -> Bool
         miAllowAdd _ _ _ = True
 
+        miAddEmpty :: ListPosition -> Natural -> ListLength -> Set ListPosition
+        miAddEmpty _ _ _ = Set.empty
+
         miLayout :: ListLength
                  -> Map ListPosition (Either UserEmail UserId, FormResult (Maybe LecturerType)) -- ^ massInput state
                  -> Map ListPosition Widget -- ^ Cell widgets
diff --git a/src/Handler/Utils/Communication.hs b/src/Handler/Utils/Communication.hs
index 47e3eb0e2..fa63708df 100644
--- a/src/Handler/Utils/Communication.hs
+++ b/src/Handler/Utils/Communication.hs
@@ -139,13 +139,15 @@ commR CommunicationRoute{..} =  do
             return (addRes', $(widgetFile "widgets/communication/recipientAdd"))
           miAdd _ _ _ _ = Nothing
           miCell _ (Left (CI.original -> email)) initRes nudge csrf = do
-            (tickRes, tickView) <- mpreq checkBoxField ("" & addName (nudge "tick")) initRes
+            (tickRes, tickView) <- mpreq checkBoxField ("" & addName (nudge "tick")) $ initRes <|> Just True
             return (tickRes, $(widgetFile "widgets/communication/recipientEmail"))
           miCell _ (Right (lookupUser -> User{..})) initRes nudge csrf = do 
-            (tickRes, tickView) <- mpreq checkBoxField ("" & addName (nudge "tick")) initRes
+            (tickRes, tickView) <- mpreq checkBoxField ("" & addName (nudge "tick")) $ initRes <|> Just True
             return (tickRes, $(widgetFile "widgets/communication/recipientName"))
           miAllowAdd (EnumPosition RecipientCustom, 0) 1 _ = True
           miAllowAdd _ _ _ = False
+          miAddEmpty _ 0 _ = Set.singleton (EnumPosition RecipientCustom, 0)
+          miAddEmpty _ _ _ = Set.empty
           miButtonAction :: forall p . PathPiece p => p -> Maybe (SomeRoute UniWorX)
           miButtonAction anchor = SomeRoute . (:#: anchor) <$> mbCurrentRoute
           miLayout :: MapLiveliness (EnumLiveliness RecipientCategory) ListLength
@@ -156,7 +158,7 @@ commR CommunicationRoute{..} =  do
                    -> Widget
           miLayout liveliness state cellWdgts _delButtons addWdgts = do
             checkedIdentBase <- newIdent
-            let checkedCategories = Set.mapMonotonic (unEnumPosition . fst) . Set.filter (\k' -> Map.foldrWithKey (\k (_, checkState) -> (||) $ k == k' && checkState /= FormSuccess False && checkState /= FormMissing) False state) $ Map.keysSet state
+            let checkedCategories = Set.mapMonotonic (unEnumPosition . fst) . Set.filter (\k' -> Map.foldrWithKey (\k (_, checkState) -> (||) $ k == k' && checkState /= FormSuccess False && (checkState /= FormMissing || fromMaybe True (fmap snd $ chosenRecipients' !? k))) False state) $ Map.keysSet state
                 checkedIdent c = checkedIdentBase <> "-" <> toPathPiece c
                 categoryIndices c = Set.filter ((== c) . unEnumPosition . fst) $ review liveCoords liveliness
             $(widgetFile "widgets/communication/recipientLayout")
diff --git a/src/Handler/Utils/Form/MassInput.hs b/src/Handler/Utils/Form/MassInput.hs
index 3b7087e7b..9ee5e07d2 100644
--- a/src/Handler/Utils/Form/MassInput.hs
+++ b/src/Handler/Utils/Form/MassInput.hs
@@ -249,6 +249,10 @@ data MassInput handler liveliness cellData cellResult = MassInput
                -> Natural
                -> liveliness
                -> Bool -- ^ Decide whether an addition-operation should be permitted
+  , miAddEmpty :: BoxCoord liveliness
+               -> Natural
+               -> liveliness
+               -> Set (BoxCoord liveliness) -- ^ Usually addition widgets are only provided for dimension 0 and all _lines_ that have at least one live coordinate. `miAddEmpty` allows specifying when to provide additional widgets
   , miButtonAction :: forall p. PathPiece p => p -> Maybe (SomeRoute UniWorX) -- ^ Override form-tag route for `massInput`-Buttons to keep the user closer to the Widget, the `PathPiece` Argument is to be used for constructiong a `Fragment`
   , miLayout :: liveliness
              -> Map (BoxCoord liveliness) (cellData, FormResult cellResult)
@@ -293,10 +297,10 @@ massInput MassInput{..} FieldSettings{..} fvRequired initialResult csrf = do
   sentLiveliness <- maybe (throwM MassInputInvalidShape) return $ Map.keysSet sentShape' ^? liveCoords :: MForm handler liveliness
 
   let addForm :: [BoxDimension (BoxCoord liveliness)] -> MForm handler (Map (Natural, BoxCoord liveliness) (FormResult (Maybe (Map (BoxCoord liveliness) cellData -> FormResult (Map (BoxCoord liveliness) cellData))), Maybe Widget))
-      addForm = addForm' boxOrigin . zip [0..]
+      addForm = addForm' boxOrigin [] . zip [0..]
         where
-          addForm' _ [] = return Map.empty
-          addForm' miCoord ((dimIx, _) : remDims) = do
+          addForm' _ _ [] = return Map.empty
+          addForm' miCoord pDims (dim''@(dimIx, _) : remDims) = do
             let nudgeAddWidgetName :: Text -> Text
                 nudgeAddWidgetName miAddWidgetField = toPathPiece MassInputAddWidget{..}
             (btnRes', btnView) <- mopt (buttonField $ MassInputAddDimension dimIx miCoord) ("" & addName MassInputAddButton{..} & addFormAction) Nothing
@@ -312,12 +316,12 @@ massInput MassInput{..} FieldSettings{..} fvRequired initialResult csrf = do
             case remDims of
               [] -> return dimRes'
               ((_, BoxDimension dim) : _) -> do
-                let
-                  miCoords
-                    = Set.fromList
-                    . takeWhile (\c -> review (liveCoord c) sentLiveliness)
-                    $ set dim <$> enumFrom (miCoord ^. dim) <*> pure miCoord
-                dimRess <- sequence $ Map.fromSet (\c -> addForm' c remDims) miCoords
+                let miCoords
+                      = Set.union (miAddEmpty miCoord dimIx sentLiveliness)
+                      . Set.map (\c -> miCoord & dim .~ (c ^. dim))
+                      . Set.filter (\c -> and [ ((==) `on` view pDim) miCoord c | (_, BoxDimension pDim) <- pDims `snoc` dim'' ])
+                      $ review liveCoords sentLiveliness
+                dimRess <- sequence $ Map.fromSet (\c -> addForm' c (pDims `snoc` dim'') remDims) miCoords
                 return $ dimRes' `Map.union` fold dimRess
 
   addResults <- addForm boxDimensions
@@ -458,6 +462,7 @@ massInputList field fieldSettings miButtonAction miSettings miRequired miPrevRes
                 over _2 (\FieldView{..} -> $(widgetFile "widgets/massinput/list/cell")) <$> mreq field (fieldSettings pos & addName (nudge "field")) iRes
             , miDelete = miDeleteList
             , miAllowAdd = \_ _ _ -> True
+            , miAddEmpty = \_ _ _ -> Set.empty
             , miButtonAction
             , miLayout = \lLength _ cellWdgts delButtons addWdgts
               -> $(widgetFile "widgets/massinput/list/layout")
diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index 957d349a3..1f2c87c6c 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -150,13 +150,14 @@
 
   var INTERACTIVE_FIELDSET_UTIL_NAME = 'interactiveFieldset';
   var INTERACTIVE_FIELDSET_UTIL_SELECTOR = '[uw-interactive-fieldset]';
+  var INTERACTIVE_FIELDSET_UTIL_TARGET_SELECTOR = '.interactive-fieldset--target';
 
   var INTERACTIVE_FIELDSET_INITIALIZED_CLASS = 'interactive-fieldset--initialized';
 
   var interactiveFieldsetUtil = function(element) {
     var conditionalInput;
     var conditionalValue;
-    var formGroup;
+    var target;
 
     function init() {
       if (!element) {
@@ -183,9 +184,14 @@
       }
       conditionalValue = element.dataset.conditionalValue;
 
-      formGroup = element.closest(FORM_GROUP_SELECTOR);
-      if (!formGroup) {
-        throw new Error('Interactive Fieldset needs a .form-group ancestor!');
+      if (element.matches(INTERACTIVE_FIELDSET_UTIL_TARGET_SELECTOR)) {
+        target = element;
+      }
+      if (!target) {
+        target = element.closest(INTERACTIVE_FIELDSET_UTIL_TARGET_SELECTOR);
+      }
+      if (!target) {
+        throw new Error('Interactive Fieldset needs to be a target or have a target-ancestor!');
       }
 
       // add event listener
@@ -205,7 +211,7 @@
     }
 
     function updateVisibility() {
-      element.classList.toggle('hidden', !matchesConditionalValue());
+      target.classList.toggle('hidden', !matchesConditionalValue());
     }
 
     function matchesConditionalValue() {
diff --git a/templates/widgets/aform/aform.hamlet b/templates/widgets/aform/aform.hamlet
index 91ebc2b93..00f8755f2 100644
--- a/templates/widgets/aform/aform.hamlet
+++ b/templates/widgets/aform/aform.hamlet
@@ -11,7 +11,7 @@ $case formLayout
         <h3 .form-section-title>
           ^{fvLabel view}
       $else
-        <div .form-group :fvRequired view:.form-group--required :not $ fvRequired view:.form-group--optional :isJust $ fvErrors view:.form-group--has-error>
+        <div .form-group .interactive-fieldset--target :fvRequired view:.form-group--required :not $ fvRequired view:.form-group--optional :isJust $ fvErrors view:.form-group--has-error>
           $if not (Blaze.null $ fvLabel view)
             <label .form-group-label for=#{fvId view}>
               <span .form-group-label__caption>
diff --git a/templates/widgets/communication/recipientLayout.hamlet b/templates/widgets/communication/recipientLayout.hamlet
index ef3053f4a..9f0ff360f 100644
--- a/templates/widgets/communication/recipientLayout.hamlet
+++ b/templates/widgets/communication/recipientLayout.hamlet
@@ -5,9 +5,9 @@ $forall category <- activeCategories
     <label for=#{checkedIdent category}>
       _{category}
 
-    <fieldset uw-interactive-fieldset data-conditional-input=#{checkedIdent category}>
+    <fieldset uw-interactive-fieldset data-conditional-input=#{checkedIdent category} .interactive-fieldset--target>
       $forall optIx <- categoryIndices category
         ^{cellWdgts ! optIx}
 
-      $maybe addWdgt <- addWdgts !? (0, (EnumPosition category, 0))
+      $maybe addWdgt <- addWdgts !? (1, (EnumPosition category, 0))
         ^{addWdgt}

From 38e8106852cb11d96173746fc80e3e4ae78c5aa1 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 20 Apr 2019 12:33:07 +0200
Subject: [PATCH 098/238] Disable inputs hidden by interactive-fieldset

---
 static/js/utils/form.js | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index 1f2c87c6c..b2a449e2a 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -3,10 +3,6 @@
 
   var formUtilities = [];
 
-  var FORM_GROUP_SELECTOR = '.form-group';
-  var FORM_GROUP_WITH_ERRORS_CLASS = 'form-group--has-error';
-
-
   /**
    *
    * Reactive Submit Button Utility
@@ -153,11 +149,13 @@
   var INTERACTIVE_FIELDSET_UTIL_TARGET_SELECTOR = '.interactive-fieldset--target';
 
   var INTERACTIVE_FIELDSET_INITIALIZED_CLASS = 'interactive-fieldset--initialized';
+  var INTERACTIVE_FIELDSET_CHILD_SELECTOR = 'input:not([disabled])';
 
   var interactiveFieldsetUtil = function(element) {
     var conditionalInput;
     var conditionalValue;
     var target;
+    var childInputs;
 
     function init() {
       if (!element) {
@@ -194,6 +192,8 @@
         throw new Error('Interactive Fieldset needs to be a target or have a target-ancestor!');
       }
 
+      childInputs = Array.from(element.querySelectorAll(INTERACTIVE_FIELDSET_CHILD_SELECTOR));
+
       // add event listener
       conditionalInput.addEventListener('input', updateVisibility);
 
@@ -211,7 +211,13 @@
     }
 
     function updateVisibility() {
-      target.classList.toggle('hidden', !matchesConditionalValue());
+      var active = matchesConditionalValue();
+      
+      target.classList.toggle('hidden', !active);
+
+      childInputs.forEach(function(el) {
+        el.toggleAttribute('disabled', !active);
+      });
     }
 
     function matchesConditionalValue() {
@@ -292,6 +298,10 @@
   var FORM_ERROR_REMOVER_INITIALIZED_CLASS = 'form-error-remover--initialized';
   var FORM_ERROR_REMOVER_INPUTS_SELECTOR = 'input:not([type="hidden"]), textarea, select';
 
+  var FORM_GROUP_SELECTOR = '.form-group';
+  var FORM_GROUP_WITH_ERRORS_CLASS = 'form-group--has-error';
+
+
   var formErrorRemoverUtil = function(element) {
     var formGroups;
 

From 0541b1e216a60c746f9731fc59bc496084723a2c Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 20 Apr 2019 12:45:30 +0200
Subject: [PATCH 099/238] Remove margin from fieldsets in accordance with new
 usage

---
 static/css/utils/form.scss | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/static/css/utils/form.scss b/static/css/utils/form.scss
index b1d6b22c3..6612beeb1 100644
--- a/static/css/utils/form.scss
+++ b/static/css/utils/form.scss
@@ -1,16 +1,13 @@
 fieldset {
   border: 0;
-  margin: 20px 0 30px;
+  margin: 0;
+  padding: 0;
 
   legend {
     display: none;
   }
 }
 
-.form-group__input > fieldset {
-  margin-bottom: 0;
-}
-
 @media (min-width: 769px) {
   .form-group__input {
     grid-column: 2;

From bd98f11ad5b7c238882284e32919a19174a0dfd4 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 20 Apr 2019 21:21:20 +0200
Subject: [PATCH 100/238] Overhaul corrector interface

---
 messages/uniworx/de.msg                   |  19 +-
 models/sheets                             |   7 +
 routes                                    |   1 +
 src/Handler/Course.hs                     |   1 +
 src/Handler/Sheet.hs                      | 305 ++++++++++++----------
 src/Handler/Utils.hs                      |   2 +-
 src/Handler/Utils/Communication.hs        |   6 +-
 src/Handler/Utils/Form.hs                 |  69 ++++-
 src/Handler/Utils/Form/MassInput.hs       |  16 +-
 src/Handler/Utils/Sheet.hs                |  13 +-
 src/Jobs.hs                               |   1 +
 src/Jobs/Handler/CorrectorInvitation.hs   |  42 +++
 src/Jobs/Types.hs                         |   3 +
 src/Model.hs                              |   1 +
 src/Model/Types.hs                        |   5 +-
 src/Utils/Form.hs                         |   3 +
 src/Utils/Lens.hs                         |   2 +
 static/js/utils/checkAll.js               |   4 +-
 static/js/utils/inputs.js                 |   2 +-
 templates/mail/correctorInvitation.hamlet |  11 +
 templates/mail/lecturerInvitation.hamlet  |   2 +-
 templates/sheetCorrInvite.hamlet          |   3 +
 templates/sheetCorrectors/add.hamlet      |   6 +
 templates/sheetCorrectors/cell.hamlet     |  20 ++
 templates/sheetCorrectors/layout.hamlet   |  18 ++
 templates/widgets/email.hamlet            |   2 +
 26 files changed, 407 insertions(+), 157 deletions(-)
 create mode 100644 src/Jobs/Handler/CorrectorInvitation.hs
 create mode 100644 templates/mail/correctorInvitation.hamlet
 create mode 100644 templates/sheetCorrInvite.hamlet
 create mode 100644 templates/sheetCorrectors/add.hamlet
 create mode 100644 templates/sheetCorrectors/cell.hamlet
 create mode 100644 templates/sheetCorrectors/layout.hamlet
 create mode 100644 templates/widgets/email.hamlet

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 49184101c..0c3465350 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -13,6 +13,8 @@ BtnCandidatesDeleteAll: Alle Beobachtungen löschen
 BtnResetTokens: Authorisierungs-Tokens invalidieren
 BtnLecInvAccept: Annehmen
 BtnLecInvDecline: Ablehnen
+BtnCorrInvAccept: Annehmen
+BtnCorrInvDecline: Ablehnen
 
 Aborted: Abgebrochen
 Remarks: Hinweise
@@ -253,7 +255,7 @@ NotAParticipant email@UserEmail tid@TermId csh@CourseShorthand: #{email} ist nic
 TooManyParticipants: Es wurden zu viele Mitabgebende angegeben
 
 AddCorrector: Zusätzlicher Korrektor
-CorrectorExists email@UserEmail: #{email} ist bereits als Korrektor eingetragen
+CorrectorExists: Nutzer ist bereits als Korrektor eingetragen
 SheetCorrectorsTitle tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName: Korrektoren für #{display tid}-#{display ssh}-#{csh} #{sheetName}
 CountTutProp: Tutorien zählen gegen Proportion
 AutoAssignCorrs: Korrekturen nach Ablauf des Abgabezeitraums automatisch zuteilen
@@ -533,7 +535,9 @@ MailSubjectSupportCustom customSubject@Text: [Support] #{customSubject}
 
 CommCourseSubject: Kursmitteilung
 MailSubjectLecturerInvitation tid@TermId ssh@SchoolId csh@CourseShorthand: [#{display tid}-#{display ssh}-#{csh}] Einladung zum Kursverwalter
-CourseLecturerInvitationAcceptDecline: Einladung annehmen/ablehnen
+InvitationAcceptDecline: Einladung annehmen/ablehnen
+
+MailSubjectCorrectorInvitation tid@TermId ssh@SchoolId csh@CourseShorthand shn@SheetName: [#{display tid}-#{display ssh}-#{csh}] Einladung zum Korrektor für #{shn}
 
 SheetGrading: Bewertung
 SheetGradingPoints maxPoints@Points: #{tshow maxPoints} Punkte
@@ -753,7 +757,7 @@ DeleteCopyStringIfSure n@Int: Wenn Sie sich sicher sind, dass Sie #{pluralDE n "
 DeleteConfirmation: Bestätigung
 DeleteConfirmationWrong: Bestätigung muss genau dem angezeigten Text entsprechen.
 
-DBTIRowsMissing n@Int: #{pluralDE n "Eine Zeile ist" "Einige Zeile sind"} aus der Datenbank verschwunden, seit das Formular für Sie generiert wurde
+DBTIRowsMissing n@Int: #{pluralDE n "Eine Zeile ist" "Einige Zeilen sind"} aus der Datenbank verschwunden, seit das Formular für Sie generiert wurde
 
 MassInputAddDimension: Hinzufügen
 MassInputDeleteCell: Entfernen
@@ -763,7 +767,7 @@ NavigationFavourites: Favoriten
 CommSubject: Betreff
 CommBody: Nachricht
 CommRecipients: Empfänger
-CommRecipientsTip: Sie selbst erhalten immer eine Kopie der Nachricht.
+CommRecipientsTip: Sie selbst erhalten immer eine Kopie der Nachricht
 CommDuplicateRecipients n@Int: #{tshow n} #{pluralDE n "doppelter" "doppelte"} Empfänger ignoriert
 CommSuccess n@Int: Nachricht wurde an #{tshow n} Empfänger versandt
 
@@ -776,10 +780,15 @@ RGCourseLecturers: Kursverwalter
 RGCourseCorrectors: Korrektoren
 
 MultiSelectFieldTip: Mehrfach-Auswahl ist möglich (Umschalt bzw. Strg)
-MultiEmailFieldTip: Je nach Browser sind mehrere komma-separierte E-Mail-Addressen möglich
+MultiEmailFieldTip: Es sind mehrere, Komma-separierte, E-Mail-Addressen möglich
 EmailInvitationWarning: Dem System ist kein Nutzer mit dieser Addresse bekannt. Es wird eine Einladung per E-Mail versandt.
 
 LecturerInvitationAccepted lType@Text csh@CourseShorthand: Sie wurden als #{lType} für #{csh} eingetragen
 LecturerInvitationDeclined csh@CourseShorthand: Sie haben die Einladung, Kursverwalter für #{csh} zu werden, abgelehnt
 CourseLecInviteHeading courseName@Text: Einladung zum Kursverwalter für #{courseName}
 CourseLecInviteExplanation: Sie wurden eingeladen, Verwalter für einen Kurs zu sein.
+
+CorrectorInvitationAccepted shn@SheetName: Sie wurden als Korrektor für #{shn} eingetragen
+CorrectorInvitationDeclined shn@SheetName: Sie haben die Einladung, Korrektor für #{shn} zu werden, abgelehnt
+SheetCorrInviteHeading shn@SheetName: Einladung zum Korrektor für #{shn}
+SheetCorrInviteExplanation: Sie wurden eingeladen, Korrektor für ein Übungsblatt zu sein.
\ No newline at end of file
diff --git a/models/sheets b/models/sheets
index e13fc2d47..8f6d623db 100644
--- a/models/sheets
+++ b/models/sheets
@@ -36,6 +36,13 @@ SheetCorrector                -- grant corrector role to user for a sheet
     state           CorrectorState default='CorrectorNormal' -- whether a corrector is assigned his load this time (e.g. in case of sickness)
     UniqueSheetCorrector user sheet
     deriving Show Eq Ord
+SheetCorrectorInvitation json
+    email           UserEmail
+    sheet           SheetId
+    load            Load
+    state           CorrectorState
+    UniqueSheetCorrectorInvitation email sheet
+    deriving Show Read Eq Ord Generic Typeable
 SheetFile                     -- a file that is part of an exercise sheet
     sheet           SheetId
     file            FileId
diff --git a/routes b/routes
index 161383a7e..0e801e22b 100644
--- a/routes
+++ b/routes
@@ -104,6 +104,7 @@
       !/#SubmissionFileType/*FilePath SubDownloadR           GET      !owner !corrector
     /correctors                 SCorrR        GET POST
     /pseudonym                  SPseudonymR   GET POST        !registeredANDcorrector-submissions
+    /corrector-invite/#UserEmail SCorrInviteR     GET POST
     !/#SheetFileType/*FilePath  SFileR        GET             !timeANDregistered !timeANDmaterials !corrector
 
 
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 593b08f7d..5697b7bd4 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -545,6 +545,7 @@ courseEditHandler miButtonAction mbCourseForm = do
                   (Just _) -> addMessageI Warning (MsgCourseEditDupShort tid ssh csh) $> False
                   Nothing  -> do
                     deleteWhere [LecturerCourse ==. cid]
+                    deleteWhere [LecturerInvitationCourse ==. cid, LecturerInvitationEmail /<-. toListOf (folded . _Left . _1) (cfLecturers res)]
                     forM_ (cfLecturers res) $ \case
                       Right (lid, lty) -> insert_  $ Lecturer lid cid lty
                       Left (lEmail, mLTy) -> do
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index cc5bc7718..cf3f36b09 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -1,6 +1,9 @@
 module Handler.Sheet where
 
 import Import
+
+import Jobs.Queue
+  
 import System.FilePath (takeFileName)
 
 import Utils.Sheet
@@ -9,20 +12,19 @@ import Handler.Utils
 import Handler.Utils.Table.Cells
 import Handler.Utils.SheetType
 import Handler.Utils.Delete
+import Handler.Utils.Form.MassInput
 
 -- import Data.Time
 -- import qualified Data.Text as T
 -- import Data.Function ((&))
 --
 -- import Colonnade hiding (fromMaybe, singleton, bool)
-import qualified Yesod.Colonnade as Yesod
-import Text.Blaze (text)
 --
 -- import qualified Data.UUID.Cryptographic as UUID
 import qualified Data.Conduit.List as C
 
 -- import Data.CaseInsensitive (CI)
-import qualified Data.CaseInsensitive as CI
+-- import qualified Data.CaseInsensitive as CI
 
 import qualified Database.Esqueleto as E
 -- import qualified Database.Esqueleto.Internal.Sql as E
@@ -42,7 +44,7 @@ import Data.Set (Set)
 import qualified Data.Set as Set
 import qualified Data.Map as Map
 
-import Data.Map (Map, (!?))
+import Data.Map (Map, (!))
 
 import Data.Monoid (Any(..))
 
@@ -614,7 +616,7 @@ data CorrectorForm = CorrectorForm
   , cfViewByTut, cfViewProp, cfViewDel, cfViewState :: FieldView UniWorX
   }
 
-type Loads = Map UserId (CorrectorState, Load)
+type Loads = Map (Either UserEmail UserId) (CorrectorState, Load)
 
 defaultLoads :: SheetId -> DB Loads
 -- ^ Generate `Loads` in such a way that minimal editing is required
@@ -637,164 +639,152 @@ defaultLoads shid = do
     return (sheetCorrector E.^. SheetCorrectorUser, sheetCorrector E.^. SheetCorrectorLoad, sheetCorrector E.^. SheetCorrectorState)
   where
     toMap :: [(E.Value UserId, E.Value Load, E.Value CorrectorState)] -> Loads
-    toMap = foldMap $ \(E.Value uid, E.Value load, E.Value state) -> Map.singleton uid (state, load)
+    toMap = foldMap $ \(E.Value uid, E.Value load, E.Value state) -> Map.singleton (Right uid) (state, load)
 
 
-correctorForm :: SheetId -> MForm Handler (FormResult (Bool, Set SheetCorrector), [FieldView UniWorX])
-correctorForm shid = do
-  cListIdent <- newFormIdent
-  let
-    guardNonDeleted :: UserId -> Handler (Maybe UserId)
-    guardNonDeleted uid = do
-      CryptoID{ciphertext} <- encrypt uid :: Handler CryptoUUIDUser
-      deleted <- lookupPostParam $ tshow ciphertext <> "-" <> "del"
-      return $ bool Just (const Nothing) (isJust deleted) uid
-  formCIDs <- mapM decrypt =<< catMaybes <$> liftHandlerT (map fromPathPiece <$> lookupPostParams cListIdent :: Handler [Maybe CryptoUUIDUser])
+correctorForm :: SheetId -> AForm Handler (Set (Either SheetCorrectorInvitation SheetCorrector))
+correctorForm shid = wFormToAForm $ do
+  Just currentRoute <- liftHandlerT getCurrentRoute
+  userId <- liftHandlerT requireAuthId
+  MsgRenderer mr <- getMsgRenderer
+  
   let
     currentLoads :: DB Loads
-    currentLoads = foldMap (\(Entity _ SheetCorrector{..}) -> Map.singleton sheetCorrectorUser (sheetCorrectorState, sheetCorrectorLoad)) <$> selectList [ SheetCorrectorSheet ==. shid ] []
-  (autoDistribute, defaultLoads', currentLoads') <- lift . runDB $ (,,) <$> (sheetAutoDistribute <$> getJust shid) <*> defaultLoads shid <*> currentLoads
-  loads' <- fmap (Map.fromList [(uid, (CorrectorNormal, mempty)) | uid <- formCIDs] `Map.union`) $ if
-    | Map.null currentLoads'
-    , null formCIDs          -> defaultLoads' <$ when (not $ Map.null defaultLoads') (addMessageI Warning MsgCorrectorsDefaulted)
-    | otherwise              -> return $ Map.fromList (map (, (CorrectorNormal, mempty)) formCIDs) `Map.union` currentLoads'
+    currentLoads = Map.union
+      <$> fmap (foldMap $ \(Entity _ SheetCorrector{..}) -> Map.singleton (Right sheetCorrectorUser) (sheetCorrectorState, sheetCorrectorLoad)) (selectList [ SheetCorrectorSheet ==. shid ] [])
+      <*> fmap (foldMap $ \(Entity _ SheetCorrectorInvitation{..}) -> Map.singleton (Left sheetCorrectorInvitationEmail) (sheetCorrectorInvitationState, sheetCorrectorInvitationLoad)) (selectList [ SheetCorrectorInvitationSheet ==. shid ] [])
+  (defaultLoads', currentLoads') <- liftHandlerT . runDB $ (,) <$> defaultLoads shid <*> currentLoads
 
-  deletions <- lift $ foldM (\dels uid -> maybe (Set.insert uid dels) (const dels) <$> guardNonDeleted uid) Set.empty (Map.keys loads')
-
-  let loads'' = Map.restrictKeys loads' (Map.keysSet loads' `Set.difference` deletions)
-      didDelete = any (flip Set.member deletions) formCIDs
-
-  (countTutRes, countTutView) <- mreq checkBoxField (fsm MsgCountTutProp) . Just $ any (\(_, Load{..}) -> fromMaybe False byTutorial) $ Map.elems loads'
-  (autoDistributeRes, autoDistributeView) <- mreq checkBoxField (fsm MsgAutoAssignCorrs) (Just autoDistribute)
-  let
-    tutorField :: Field Handler [UserEmail]
-    tutorField = convertField (map CI.mk) (map CI.original) $ multiEmailField
-      { fieldView = \theId name attrs _val isReq -> asWidgetT $ do
-          listIdent <- newIdent
-          userId <- handlerToWidget requireAuthId
-          previousCorrectors <- handlerToWidget . runDB . E.select . E.from $ \(user `E.InnerJoin` sheetCorrector `E.InnerJoin` sheet `E.InnerJoin` course `E.InnerJoin` lecturer) -> E.distinctOnOrderBy [E.asc $ user E.^. UserEmail ] $ do
-            E.on $ lecturer E.^. LecturerCourse E.==. course E.^. CourseId
-            E.on $ course E.^. CourseId E.==. sheet E.^. SheetCourse
-            E.on $ sheet E.^. SheetId E.==. sheetCorrector E.^. SheetCorrectorSheet
-            E.on $ sheetCorrector E.^. SheetCorrectorUser E.==. user E.^. UserId
-            E.where_ $ lecturer E.^. LecturerUser E.==. E.val userId
-            return $ user E.^. UserEmail
-          [whamlet|
-            $newline never
-            <input id=#{theId} name=#{name} list=#{listIdent} *{attrs} type=email multiple :isReq:required value="" placeholder=_{MsgCorrectorsPlaceholder}>
-            <datalist id=#{listIdent}>
-              $forall E.Value prev <- previousCorrectors
-                <option value=#{prev}>
-          |]
-      }
-  (addTutRes, addTutView) <- mopt tutorField (fsm MsgAddCorrector) (Just Nothing)
-
-  loads <- case addTutRes of
-    FormSuccess (Just emails) -> fmap Map.unions . forM emails $ \email -> do
-      mUid <- fmap (fmap entityKey) . lift . runDB $ getBy (UniqueEmail email)
-      case mUid of
-        Nothing  -> loads'' <$ addMessageI Error (MsgEMailUnknown email)
-        Just uid
-          | not (Map.member uid loads') -> return $ Map.insert uid (CorrectorNormal, mempty) loads''
-          | otherwise                   -> loads'' <$ addMessageI Warning (MsgCorrectorExists email)
-    FormFailure errs -> loads'' <$ mapM_ (addMessage Error . toHtml) errs
-    _ -> return loads''
-
-  let deletions' = deletions `Set.difference` Map.keysSet loads
-
-  names <- fmap (Map.fromList . map (\(E.Value a, E.Value b) -> (a, b))) . lift . runDB . E.select . E.from $ \user -> do
-    E.where_ $ user E.^. UserId `E.in_` E.valList (Map.keys  loads)
-    return $ (user E.^. UserId, user E.^. UserDisplayName)
+  isWrite <- liftHandlerT $ isWriteRequest currentRoute
 
   let
-    constructFields :: (UserId, Text, (CorrectorState, Load)) -> MForm Handler CorrectorForm
-    constructFields (uid, uname, (state, Load{..})) = do
-      CryptoID{ciphertext} <- encrypt uid :: MForm Handler CryptoUUIDUser
-      let
-        fs name = ""
-          { fsName = Just $ tshow ciphertext <> "-" <> name
-          }
-        rationalField = convertField toRational fromRational doubleField
+    applyDefaultLoads = Map.null currentLoads' && not isWrite
+    loads :: Map (Either UserEmail UserId) (CorrectorState, Load)
+    loads
+      | applyDefaultLoads = defaultLoads'
+      | otherwise         = currentLoads'
 
-      (stateRes, cfViewState) <- mreq (selectField optionsFinite) (fs "state") (Just state)
-      (byTutRes, cfViewByTut) <- mreq checkBoxField (fs "bytut") (Just $ isJust byTutorial)
-      (propRes, cfViewProp) <- mreq (checkBool (>= 0) MsgProportionNegative $ rationalField) (fs "prop") (Just byProportion)
-      (_, cfViewDel) <- mreq checkBoxField (fs "del") (Just False)
+  when (not (Map.null loads) && applyDefaultLoads) $
+    addMessageI Warning MsgCorrectorsDefaulted
+  
+  countTutRes <- wreq checkBoxField (fsm MsgCountTutProp) . Just . any (\(_, Load{..}) -> fromMaybe False byTutorial) $ Map.elems loads
+
+  let
+    previousCorrectors :: E.SqlQuery (E.SqlExpr (Entity User))
+    previousCorrectors = E.from $ \(user `E.InnerJoin` sheetCorrector `E.InnerJoin` sheet `E.InnerJoin` course `E.InnerJoin` lecturer) -> do
+      E.on $ lecturer E.^. LecturerCourse E.==. course E.^. CourseId
+      E.on $ course E.^. CourseId E.==. sheet E.^. SheetCourse
+      E.on $ sheet E.^. SheetId E.==. sheetCorrector E.^. SheetCorrectorSheet
+      E.on $ sheetCorrector E.^. SheetCorrectorUser E.==. user E.^. UserId
+      E.where_ $ lecturer E.^. LecturerUser E.==. E.val userId
+      return user
+    
+    miAdd :: ListPosition
+          -> Natural
+          -> (Text -> Text)
+          -> FieldView UniWorX
+          -> Maybe (Form (Map ListPosition (Either UserEmail UserId) -> FormResult (Map ListPosition (Either UserEmail UserId))))
+    miAdd _ _ nudge submitView = Just $ \csrf -> do
+      (addRes, addView) <- mpreq (multiUserField False $ Just previousCorrectors) (fslpI MsgCorrector (mr MsgEMail) & setTooltip MsgMultiEmailFieldTip & addName (nudge "corrector")) Nothing
+      let addRes' = addRes <&> \nCorrs oldData@(maybe 0 (succ . fst) . Map.lookupMax -> kStart) -> if
+            | existing <- Set.intersection nCorrs . Set.fromList $ Map.elems oldData
+            , not $ null existing
+              -> FormFailure [mr MsgCorrectorExists]
+            | otherwise
+              -> FormSuccess . Map.fromList . zip [kStart..] $ Set.toList nCorrs
+      return (addRes', $(widgetFile "sheetCorrectors/add"))
+
+    miCell :: ListPosition
+           -> Either UserEmail UserId
+           -> Maybe (CorrectorState, Load)
+           -> (Text -> Text)
+           -> Form (CorrectorState, Load)
+    miCell _ userIdent initRes nudge csrf = do
+      (stateRes, stateView) <- mreq (selectField optionsFinite) ("" & addName (nudge "state")) $ (fst <$> initRes) <|> Just CorrectorNormal
+      (byTutRes, byTutView) <- mreq checkBoxField ("" & addName (nudge "bytut")) $ (isJust . byTutorial . snd <$> initRes) <|> Just False
+      (propRes, propView) <- mreq (checkBool (>= 0) MsgProportionNegative $ rationalField) ("" & addName (nudge "prop")) $ (byProportion . snd <$> initRes) <|> Just 0
       let
-        cfResult :: FormResult (CorrectorState, Load)
-        cfResult = (,) <$> stateRes <*> (Load <$> tutRes' <*> propRes)
+        res :: FormResult (CorrectorState, Load)
+        res = (,) <$> stateRes <*> (Load <$> tutRes' <*> propRes)
         tutRes'
           | FormSuccess True <- byTutRes  = Just <$> countTutRes
           | otherwise                     = Nothing <$ byTutRes
-        cfUserId = uid
-        cfUserName = uname
-      return CorrectorForm{..}
+      identWidget <- case userIdent of
+        Left email -> return . toWidget $ mailtoHtml email
+        Right uid -> do
+          User{userEmail, userDisplayName, userSurname} <- liftHandlerT . runDB $ getJust uid
+          return $ nameEmailWidget userEmail userDisplayName userSurname
+      return (res, $(widgetFile "sheetCorrectors/cell"))
+      
 
-  corrData <- sequence . catMaybes . (flip map) (Map.keys loads) $ \uid -> fmap constructFields $ (,,) <$> pure uid <*> names !? uid <*> loads !? uid
+    miDelete :: ListLength
+             -> ListPosition
+             -> MaybeT (MForm Handler) (Map ListPosition ListPosition)
+    miDelete = miDeleteList
 
-  mr <- getMessageRender
+    miAllowAdd :: ListPosition
+               -> Natural
+               -> ListLength
+               -> Bool
+    miAllowAdd _ _ _ = True
 
-  $logDebugS "SCorrR" $ tshow (didDelete, addTutRes)
+    miAddEmpty :: ListPosition
+               -> Natural
+               -> ListLength
+               -> Set ListPosition
+    miAddEmpty _ _ _ = Set.empty
 
-  let
-    corrColonnade = mconcat
-      [ headed (Yesod.textCell $ mr MsgCorrector) $ \CorrectorForm{..} -> Yesod.textCell cfUserName
-      , headed (Yesod.textCell $ mr MsgCorState) $ \CorrectorForm{..} -> Yesod.cell $ fvInput cfViewState
-      , headed (Yesod.textCell $ mr MsgCorByTut) $ \CorrectorForm{..} -> Yesod.cell $ fvInput cfViewByTut
-      , headed (Yesod.textCell $ mr MsgCorProportion) $ \CorrectorForm{..} -> Yesod.cell $ fvInput cfViewProp
-      , headed (Yesod.textCell $ mr MsgDeleteRow) $ \CorrectorForm{..} -> Yesod.cell $ fvInput cfViewDel
-      ]
-    corrResults
-      | FormSuccess (Just es) <- addTutRes
-      , not $ null es = FormMissing
-      | didDelete = FormMissing
-      | otherwise = fmap Set.fromList $ sequenceA [ SheetCorrector <$> pure cfUserId <*> pure shid <*> (snd <$> cfResult) <*> (fst <$> cfResult)
-                                                  | CorrectorForm{..} <- corrData
-                                                  ]
-    idField CorrectorForm{..} = do
-      cID <- encrypt cfUserId :: WidgetT UniWorX IO CryptoUUIDUser
-      toWidget [hamlet|<input name=#{cListIdent} type=hidden value=#{toPathPiece cID}>|]
+    miButtonAction :: forall p.
+                      PathPiece p
+                   => p
+                   -> Maybe (SomeRoute UniWorX)
+    miButtonAction frag = Just . SomeRoute $ currentRoute :#: frag
 
-    delField uid = do
-      cID <- encrypt uid :: WidgetT UniWorX IO CryptoUUIDUser
-      toWidget [hamlet|<input name="#{toPathPiece cID}-del" type=hidden value=yes>|]
+    miLayout :: ListLength
+             -> Map ListPosition (Either UserEmail UserId, FormResult (CorrectorState, Load))
+             -> Map ListPosition Widget
+             -> Map ListPosition (FieldView UniWorX)
+             -> Map (Natural, ListPosition) Widget
+             -> Widget
+    miLayout lLength _ cellWdgts delButtons addWdgts = $(widgetFile "sheetCorrectors/layout")
 
-  return ( (,) <$> autoDistributeRes <*> corrResults
-         , [ autoDistributeView
-           , countTutView
-           , FieldView
-             { fvLabel = text $ mr MsgCorrectors
-             , fvTooltip = Just $ toHtml $ mr MsgCorrectorStateTip
-             , fvId = ""
-             , fvInput = Yesod.encodeCellTable tableDefault corrColonnade corrData >> mapM_ idField corrData >> mapM_ delField deletions'
-             , fvErrors = Nothing
-             , fvRequired = True
-             }
-           , addTutView
-             { fvInput = [whamlet|
-                           <div>
-                             ^{fvInput addTutView}
-                             <button type=submit formnovalidate data-formnorequired>Hinzufügen
-                         |]
-             }
-           ])
+    postProcess :: Map ListPosition (Either UserEmail UserId, (CorrectorState, Load)) -> Set (Either SheetCorrectorInvitation SheetCorrector)
+    postProcess = Set.fromList . map postProcess' . Map.elems
+      where
+        sheetCorrectorSheet = shid
+        sheetCorrectorInvitationSheet = shid
+        
+        postProcess' :: (Either UserEmail UserId, (CorrectorState, Load)) -> Either SheetCorrectorInvitation SheetCorrector
+        postProcess' (Right sheetCorrectorUser, (sheetCorrectorState, sheetCorrectorLoad)) = Right SheetCorrector{..}
+        postProcess' (Left sheetCorrectorInvitationEmail, (sheetCorrectorInvitationState, sheetCorrectorInvitationLoad)) = Left SheetCorrectorInvitation{..}
 
-  -- Eingabebox für Korrektor hinzufügen
-  -- Eingabe für Korrekt ausgefüllt: FormMissing zurückschicken um dann Feld hinzuzufügen
+  fmap postProcess <$> massInputW MassInput{..} (fslI MsgCorrectors) True (Just . Map.fromList . zip [0..] $ Map.toList loads)
 
 getSCorrR, postSCorrR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html
 postSCorrR = getSCorrR
 getSCorrR tid ssh csh shn = do
+  uid <- requireAuthId
   Entity shid Sheet{..} <- runDB $ fetchSheet tid ssh csh shn
 
-  ((res,formWidget), formEnctype) <- runFormPost . identifyForm FIDcorrectors . renderAForm FormStandard $ formToAForm (correctorForm shid)
+  ((res,formWidget), formEnctype) <- runFormPost . identifyForm FIDcorrectors . renderAForm FormStandard $
+    (,) <$> areq checkBoxField (fslI MsgAutoAssignCorrs) (Just sheetAutoDistribute)
+        <*> correctorForm shid
 
   case res of
     FormFailure errs -> mapM_ (addMessage Error . toHtml) errs
-    FormSuccess (autoDistribute, res') -> runDB $ do
+    FormSuccess (autoDistribute, sheetCorrectors) -> runDBJobs $ do
       update shid [ SheetAutoDistribute =. autoDistribute ]
-      deleteWhere [SheetCorrectorSheet ==. shid]
-      insertMany_ $ Set.toList res'
+      deleteWhere [ SheetCorrectorSheet ==. shid ]
+      deleteWhere [ SheetCorrectorInvitationSheet ==. shid, SheetCorrectorInvitationEmail /<-. toListOf (folded . _Left . _sheetCorrectorInvitationEmail) sheetCorrectors ]
+      forM_ sheetCorrectors $ \case
+        Right shCor -> insert_ shCor
+        Left shCorInv -> do
+          insertRes <- insertBy shCorInv
+          case insertRes of
+            Right _ ->
+              void . queueDBJob $ JobCorrectorInvitation uid shCorInv
+            Left (Entity old _) ->
+               replace old shCorInv
       addMessageI Success MsgCorrectorsUpdated
     FormMissing -> return ()
 
@@ -804,3 +794,50 @@ getSCorrR tid ssh csh shn = do
       { formAction = Just . SomeRoute $ CSheetR tid ssh csh shn SCorrR
       , formEncoding = formEnctype
       }
+
+
+data ButtonCorrInvite = BtnCorrInvAccept | BtnCorrInvDecline
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
+instance Universe ButtonCorrInvite
+instance Finite ButtonCorrInvite
+
+nullaryPathPiece ''ButtonCorrInvite $ camelToPathPiece' 3
+embedRenderMessage ''UniWorX ''ButtonCorrInvite id
+
+instance Button UniWorX ButtonCorrInvite where
+  btnClasses BtnCorrInvAccept = [BCIsButton, BCPrimary]
+  btnClasses BtnCorrInvDecline = [BCIsButton, BCDanger]
+
+getSCorrInviteR, postSCorrInviteR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> UserEmail -> Handler Html
+getSCorrInviteR = postSCorrInviteR
+postSCorrInviteR tid ssh csh shn email = do
+  uid <- requireAuthId
+  (Entity _ Course{..}, Entity shid Sheet{..}, Entity ciId SheetCorrectorInvitation{..}) <- runDB $ do
+    (sRes@(Entity shid _), cRes) <- fetchSheetCourse tid ssh csh shn
+    iRes <- getBy404 $ UniqueSheetCorrectorInvitation email shid
+    return (cRes, sRes, iRes)
+
+  ((btnResult, btnInnerWidget), btnEncoding) <- runFormPost $ formEmbedJwtPost buttonForm
+
+  let btnWidget = wrapForm btnInnerWidget def
+        { formEncoding = btnEncoding
+        , formAction = Just . SomeRoute . CSheetR tid ssh csh shn $ SCorrInviteR email
+        , formSubmit = FormNoSubmit
+        }
+
+  formResult btnResult $ \case
+    BtnCorrInvAccept -> do
+      runDB $ do
+        delete ciId
+        insert_ $ SheetCorrector uid shid sheetCorrectorInvitationLoad sheetCorrectorInvitationState
+      addMessageI Success $ MsgCorrectorInvitationAccepted shn
+      redirect $ CSheetR tid ssh csh shn SShowR
+    BtnCorrInvDecline -> do
+      runDB $
+        delete ciId
+      addMessageI Info $ MsgCorrectorInvitationDeclined shn
+      redirect HomeR
+
+  siteLayoutMsg (MsgSheetCorrInviteHeading shn) $ do
+    setTitleI $ MsgSheetCorrInviteHeading shn
+    $(widgetFile "sheetCorrInvite")
diff --git a/src/Handler/Utils.hs b/src/Handler/Utils.hs
index 6e250cfd9..46c4e8631 100644
--- a/src/Handler/Utils.hs
+++ b/src/Handler/Utils.hs
@@ -101,7 +101,7 @@ wrapMailto (original -> email) linkText
 
 -- | Just show an email address in a standard way, for convenience inside hamlet files.
 mailtoHtml :: UserEmail -> Html
-mailtoHtml email = wrapMailto email $ toHtml email
+mailtoHtml email = wrapMailto email $(shamletFile "templates/widgets/email.hamlet")
 
 -- | Generic i18n text for "edited at sometime by someone"
 editedByW :: SelDateTimeFormat -> UTCTime -> Text -> Widget
diff --git a/src/Handler/Utils/Communication.hs b/src/Handler/Utils/Communication.hs
index fa63708df..accbaafbe 100644
--- a/src/Handler/Utils/Communication.hs
+++ b/src/Handler/Utils/Communication.hs
@@ -24,8 +24,6 @@ import qualified Data.Set as Set
 import Data.Aeson.TH
 import Data.Aeson.Types (ToJSONKey(..), FromJSONKey(..), toJSONKeyText, FromJSONKeyFunction(..))
 
-import Data.List (nub)
-
 
 data RecipientGroup = RGCourseParticipants | RGCourseLecturers | RGCourseCorrectors
   deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
@@ -133,9 +131,9 @@ commR CommunicationRoute{..} =  do
       recipientAForm = postProcess <$> massInputA MassInput{..} (fslI MsgCommRecipients & setTooltip MsgCommRecipientsTip) True (Just chosenRecipients')
         where
           miAdd (EnumPosition RecipientCustom, 0) 1 nudge submitView = Just $ \csrf -> do
-            (addRes, addView) <- mpreq multiEmailField (fslpI MsgEMail (mr MsgEMail) & setTooltip MsgMultiEmailFieldTip & addName (nudge "email")) Nothing
+            (addRes, addView) <- mpreq (multiUserField True Nothing) (fslpI MsgEMail (mr MsgEMail) & setTooltip MsgMultiEmailFieldTip & addName (nudge "email")) Nothing
             let
-              addRes' = addRes <&> \(nub . map CI.mk -> nEmails) (maybe 0 (succ . snd . fst) . Map.lookupMax . Map.filterWithKey (\(EnumPosition c, _) _ -> c == RecipientCustom) -> kStart) -> FormSuccess . Map.fromList $ zip (map (EnumPosition RecipientCustom, ) [kStart..]) (map Left nEmails)
+              addRes' = addRes <&> \(Set.toList -> nEmails) (maybe 0 (succ . snd . fst) . Map.lookupMax . Map.filterWithKey (\(EnumPosition c, _) _ -> c == RecipientCustom) -> kStart) -> FormSuccess . Map.fromList $ zip (map (EnumPosition RecipientCustom, ) [kStart..]) nEmails
             return (addRes', $(widgetFile "widgets/communication/recipientAdd"))
           miAdd _ _ _ _ = Nothing
           miCell _ (Left (CI.original -> email)) initRes nudge csrf = do
diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index c37007add..9323e73a4 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -33,12 +33,13 @@ import Data.Map (Map, (!))
 import qualified Data.Map as Map
 
 import Control.Monad.Trans.Writer (execWriterT, WriterT)
-import Control.Monad.Except (runExceptT)
+import Control.Monad.Trans.Except (throwE, runExceptT)
 import Control.Monad.Writer.Class
 
 import Data.Scientific (Scientific)
 import Data.Ratio
 import Text.Read (readMaybe)
+import Data.Either (partitionEithers)
 
 import Utils.Lens
 
@@ -47,6 +48,8 @@ import Data.Aeson.Text (encodeToLazyText)
 
 import Data.Proxy
 
+import qualified Text.Email.Validate as Email
+
 ----------------------------
 -- Buttons (new version ) --
 ----------------------------
@@ -651,3 +654,67 @@ formResultModal res finalDest handler = maybeT_ $ do
     | otherwise -> do
         forM_ messages $ \Message{..} -> addMessage messageStatus messageContent
         redirect finalDest
+
+multiUserField :: forall m.
+                  ( MonadHandler m
+                  , HandlerSite m ~ UniWorX
+                  )
+               => Bool -- ^ Only resolve suggested users?
+               -> Maybe (E.SqlQuery (E.SqlExpr (Entity User))) -- ^ Suggested users
+               -> Field m (Set (Either UserEmail UserId))
+multiUserField onlySuggested suggestions = Field{..}
+  where
+    lookupExpr
+      | onlySuggested = suggestions
+      | otherwise     = Just $ E.from return
+    
+    fieldEnctype = UrlEncoded
+    fieldView theId name attrs val isReq = do
+      val' <- case val of
+        Left t -> return t
+        Right vs -> Text.intercalate ", " . map CI.original <$> do
+          let (emails, uids) = partitionEithers $ Set.toList vs
+          rEmails <- case lookupExpr of
+            Nothing -> return []
+            Just lookupExpr' -> fmap concat . forM uids $ \uid -> do
+              dbRes <- liftHandlerT . runDB . E.select $ do
+                user <- lookupExpr'
+                E.where_ $ user E.^. UserId E.==. E.val uid
+                return $ user E.^. UserEmail
+              case dbRes of
+                [E.Value email] -> return [email]
+                _other -> return []
+          return $ emails ++ rEmails
+
+      datalistId <- maybe (return $ error "Not to be used") (const newIdent) suggestions
+      
+      [whamlet|
+        $newline never
+        <input id="#{theId}" name="#{name}" *{attrs} type="email" multiple :isReq:required="" value="#{val'}" :isJust suggestions:list=#{datalistId}>
+      |]
+
+      whenIsJust suggestions $ \suggestions' -> do
+        suggestedEmails <- fmap (Set.fromList . map E.unValue) . liftHandlerT . runDB . E.select $ do
+          user <- suggestions'
+          return $ user E.^. UserEmail
+        [whamlet|
+          $newline never
+          <datalist id=#{datalistId}>
+            $forall email <- suggestedEmails
+              <option value=#{email}>
+        |]
+    fieldParse (all Text.null -> True) _ = return $ Right Nothing 
+    fieldParse ts _ = runExceptT . fmap Just $ do
+      let ts' = concatMap (Text.splitOn ",") ts
+      emails <- forM ts' $ \t -> either (\errStr -> throwE . SomeMessage $ MsgInvalidEmail [st|#{t} (#{errStr})|]) (return . decodeUtf8 . Email.toByteString) $ Email.validate (encodeUtf8 t)
+      fmap Set.fromList . forM emails $ \(CI.mk -> email) -> case lookupExpr of
+        Nothing -> return $ Left email
+        Just lookupExpr' -> do
+            dbRes <- liftHandlerT . runDB . E.select $ do
+              user <- lookupExpr'
+              E.where_ $ user E.^. UserEmail E.==. E.val email
+              return $ user E.^. UserId
+            case dbRes of
+              [] -> return $ Left email
+              [E.Value uid] -> return $ Right uid
+              _other -> fail "Ambiguous e-mail addr"
diff --git a/src/Handler/Utils/Form/MassInput.hs b/src/Handler/Utils/Form/MassInput.hs
index 9ee5e07d2..c6b26d758 100644
--- a/src/Handler/Utils/Form/MassInput.hs
+++ b/src/Handler/Utils/Form/MassInput.hs
@@ -6,7 +6,7 @@ module Handler.Utils.Form.MassInput
   , defaultMiLayout
   , massInput
   , module Handler.Utils.Form.MassInput.Liveliness
-  , massInputA
+  , massInputA, massInputW
   , massInputList
   , ListLength(..), ListPosition(..), miDeleteList
   , EnumLiveliness(..), EnumPosition(..)
@@ -484,3 +484,17 @@ massInputA :: forall handler cellData cellResult liveliness.
           -> AForm handler (Map (BoxCoord liveliness) (cellData, cellResult))
 massInputA  mi fs fvRequired initialResult = formToAForm $
   over _2 pure <$> massInput mi fs fvRequired initialResult mempty
+
+massInputW :: forall handler cellData cellResult liveliness.
+           ( MonadHandler handler, HandlerSite handler ~ UniWorX
+           , ToJSON cellData, FromJSON cellData
+           , Liveliness liveliness
+           , MonadLogger handler
+           )
+          => MassInput handler liveliness cellData cellResult
+          -> FieldSettings UniWorX
+          -> Bool -- ^ Required?
+          -> Maybe (Map (BoxCoord liveliness) (cellData, cellResult))
+          -> WForm handler (FormResult (Map (BoxCoord liveliness) (cellData, cellResult)))
+massInputW mi fs fvRequired initialResult = mFormToWForm $
+  massInput mi fs fvRequired initialResult mempty
diff --git a/src/Handler/Utils/Sheet.hs b/src/Handler/Utils/Sheet.hs
index baea1b6a4..ff23e9d6a 100644
--- a/src/Handler/Utils/Sheet.hs
+++ b/src/Handler/Utils/Sheet.hs
@@ -12,7 +12,7 @@ fetchSheetAux ::  ( BaseBackend backend ~ SqlBackend
                   , Typeable a, MonadHandler m, IsPersistBackend backend
                   , PersistQueryRead backend, PersistUniqueRead backend
                   )
-  =>  (E.SqlExpr (Entity Sheet) -> b)
+  =>  (E.SqlExpr (Entity Sheet) -> E.SqlExpr (Entity Course) -> b)
       -> TermId -> SchoolId -> CourseShorthand -> SheetName -> ReaderT backend m a
 fetchSheetAux prj tid ssh csh shn =
     let cachId = encodeUtf8 $ tshow (tid,ssh,csh,shn)
@@ -27,19 +27,22 @@ fetchSheetAux prj tid ssh csh shn =
                 E.&&.  course E.^. CourseSchool    E.==. E.val ssh
                 E.&&.  course E.^. CourseShorthand E.==. E.val csh
                 E.&&.  sheet  E.^. SheetName       E.==. E.val shn
-            return $ prj sheet
+            return $ prj sheet course
         case sheetList of
           [sheet] -> return sheet
           _other  -> notFound
 
 fetchSheet :: TermId -> SchoolId -> CourseShorthand -> SheetName -> YesodDB UniWorX (Entity Sheet)
-fetchSheet = fetchSheetAux id
+fetchSheet = fetchSheetAux const
+
+fetchSheetCourse :: TermId -> SchoolId -> CourseShorthand -> SheetName -> YesodDB UniWorX (Entity Sheet, Entity Course)
+fetchSheetCourse = fetchSheetAux (,)
 
 fetchSheetId :: TermId -> SchoolId -> CourseShorthand -> SheetName -> YesodDB UniWorX (Key Sheet)
-fetchSheetId tid ssh cid shn = E.unValue <$> fetchSheetAux (E.^. SheetId) tid ssh cid shn
+fetchSheetId tid ssh cid shn = E.unValue <$> fetchSheetAux (\sheet _ -> sheet E.^. SheetId) tid ssh cid shn
 
 fetchSheetIdCourseId :: TermId -> SchoolId -> CourseShorthand -> SheetName -> YesodDB UniWorX (Key Sheet, Key Course)
-fetchSheetIdCourseId tid ssh cid shn = bimap E.unValue E.unValue <$> fetchSheetAux ((,) <$> (E.^. SheetId) <*> (E.^. SheetCourse)) tid ssh cid shn
+fetchSheetIdCourseId tid ssh cid shn = bimap E.unValue E.unValue <$> fetchSheetAux (\sheet course -> (sheet E.^. SheetId, course E.^. CourseId)) tid ssh cid shn
 
 
 sheetDeleteRoute :: Set SheetId -> DeleteRoute Sheet
diff --git a/src/Jobs.hs b/src/Jobs.hs
index 615c48755..c935c79af 100644
--- a/src/Jobs.hs
+++ b/src/Jobs.hs
@@ -61,6 +61,7 @@ import Jobs.Handler.SetLogSettings
 import Jobs.Handler.DistributeCorrections
 import Jobs.Handler.SendCourseCommunication
 import Jobs.Handler.LecturerInvitation
+import Jobs.Handler.CorrectorInvitation
 
   
 data JobQueueException = JInvalid QueuedJobId QueuedJob
diff --git a/src/Jobs/Handler/CorrectorInvitation.hs b/src/Jobs/Handler/CorrectorInvitation.hs
new file mode 100644
index 000000000..92b3cbc91
--- /dev/null
+++ b/src/Jobs/Handler/CorrectorInvitation.hs
@@ -0,0 +1,42 @@
+module Jobs.Handler.CorrectorInvitation
+  ( dispatchJobCorrectorInvitation
+  ) where
+
+import Import
+
+import Text.Hamlet
+
+import qualified Data.HashSet as HashSet
+
+import qualified Data.CaseInsensitive as CI
+
+import Utils.Lens
+
+
+dispatchJobCorrectorInvitation :: UserId -> SheetCorrectorInvitation -> Handler ()
+dispatchJobCorrectorInvitation jInviter jCorrectorInvitation@SheetCorrectorInvitation{..} = do
+  ctx <- runDB . runMaybeT $ do
+    sheet <- MaybeT $ get sheetCorrectorInvitationSheet
+    course <- MaybeT . get $ sheetCourse sheet
+    void . MaybeT $ getByValue jCorrectorInvitation
+    user <- MaybeT $ get jInviter
+    return (sheet, course, user)
+
+  case ctx of
+    Just (Sheet{..}, Course{..}, User{..}) -> do
+      let baseRoute = CSheetR courseTerm courseSchool courseShorthand sheetName $ SCorrInviteR sheetCorrectorInvitationEmail
+      jwt <- encodeToken =<< bearerToken jInviter (Just $ HashSet.singleton baseRoute) Nothing Nothing Nothing
+      let
+        invitationUrl :: SomeRoute UniWorX
+        invitationUrl = SomeRoute (baseRoute, [(toPathPiece GetBearer, toPathPiece jwt)])
+      invitationUrl' <- toTextUrl invitationUrl
+
+      mailT def $ do
+        _mailTo .= [Address Nothing (CI.original $ sheetCorrectorInvitationEmail)]
+        replaceMailHeader "Reply-To" . Just . renderAddress $ Address (Just userDisplayName) (CI.original userEmail)
+        replaceMailHeader "Auto-Submitted" $ Just "auto-generated"
+        setSubjectI $ MsgMailSubjectCorrectorInvitation courseTerm courseSchool courseShorthand sheetName
+      
+        addPart ($(ihamletFile "templates/mail/correctorInvitation.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX))
+    Nothing -> runDB .
+      deleteBy $ UniqueSheetCorrectorInvitation sheetCorrectorInvitationEmail sheetCorrectorInvitationSheet
diff --git a/src/Jobs/Types.hs b/src/Jobs/Types.hs
index 47df31a88..fc399d6a5 100644
--- a/src/Jobs/Types.hs
+++ b/src/Jobs/Types.hs
@@ -34,6 +34,9 @@ data Job = JobSendNotification { jRecipient :: UserId, jNotification :: Notifica
          | JobLecturerInvitation { jInviter :: UserId
                                  , jLecturerInvitation :: LecturerInvitation
                                  }
+         | JobCorrectorInvitation { jInviter :: UserId
+                                  , jCorrectorInvitation :: SheetCorrectorInvitation
+                                  }
   deriving (Eq, Ord, Show, Read, Generic, Typeable)
 data Notification = NotificationSubmissionRated { nSubmission :: SubmissionId }
                   | NotificationSheetActive { nSheet :: SheetId }
diff --git a/src/Model.hs b/src/Model.hs
index 1b16cd35e..7de0d7c1e 100644
--- a/src/Model.hs
+++ b/src/Model.hs
@@ -41,6 +41,7 @@ deriving instance Eq (Unique Sheet)
 deriving instance Binary (Key Term)
 
 instance Hashable LecturerInvitation
+instance Hashable SheetCorrectorInvitation
 
 submissionRatingDone :: Submission -> Bool
 submissionRatingDone Submission{..} = isJust submissionRatingTime
diff --git a/src/Model/Types.hs b/src/Model/Types.hs
index 3978399b4..665fe9e69 100644
--- a/src/Model/Types.hs
+++ b/src/Model/Types.hs
@@ -332,6 +332,7 @@ data Load -- = ByTutorial { countsToLoad :: Bool } | ByProportion { load :: Rati
 deriveJSON defaultOptions ''Load
 derivePersistFieldJSON ''Load
 
+instance Hashable Load
 
 instance Semigroup Load where
   (Load byTut prop) <> (Load byTut' prop') = Load byTut'' (prop + prop')
@@ -529,9 +530,11 @@ deriveJSON defaultOptions
   { constructorTagModifier = fromJust . stripPrefix "Corrector"
   } ''CorrectorState
 
-instance Universe CorrectorState where universe = universeDef
+instance Universe CorrectorState
 instance Finite CorrectorState
 
+instance Hashable CorrectorState
+
 nullaryPathPiece ''CorrectorState (camelToPathPiece' 1)
 
 derivePersistField "CorrectorState"
diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index 1f207d484..25180df04 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -441,6 +441,9 @@ optionsFinite = do
       }
   return . mkOptionList $ mkOption <$> universeF
 
+rationalField :: (MonadHandler m, RenderMessage (HandlerSite m) FormMessage) => Field m Rational
+rationalField = convertField toRational fromRational doubleField
+
 
 -----------
 -- Forms --
diff --git a/src/Utils/Lens.hs b/src/Utils/Lens.hs
index f83e91b59..1da50329f 100644
--- a/src/Utils/Lens.hs
+++ b/src/Utils/Lens.hs
@@ -100,6 +100,8 @@ makePrisms ''HandlerContents
 
 makePrisms ''ErrorResponse
 
+makeLenses_ ''SheetCorrectorInvitation
+
 
 -- makeClassy_ ''Load
 
diff --git a/static/js/utils/checkAll.js b/static/js/utils/checkAll.js
index fcf3f67c3..86749f2a9 100644
--- a/static/js/utils/checkAll.js
+++ b/static/js/utils/checkAll.js
@@ -91,12 +91,10 @@
       checkboxColumn = columns[checkboxColumnId];
       var firstRow = element.querySelector('tr');
       var th = Array.from(firstRow.querySelectorAll('th, td'))[checkboxColumnId];
-      th.innerHTML = 'test';
       checkAllCheckbox = document.createElement('input');
       checkAllCheckbox.setAttribute('type', 'checkbox');
       checkAllCheckbox.setAttribute('id', getCheckboxId());
-      th.innerHTML = '';
-      th.insertBefore(checkAllCheckbox, null);
+      th.insertBefore(checkAllCheckbox, th.firstChild);
 
       // manually set up newly created checkbox
       if (UtilRegistry) {
diff --git a/static/js/utils/inputs.js b/static/js/utils/inputs.js
index d5d7ee5a1..f90517e51 100644
--- a/static/js/utils/inputs.js
+++ b/static/js/utils/inputs.js
@@ -161,7 +161,7 @@
         return false;
       }
 
-      var siblingEl = element.nextElementSibling;
+      var siblingEl = element.nextSibling;
       var parentEl = element.parentElement;
 
       var wrapperEl = document.createElement('div');
diff --git a/templates/mail/correctorInvitation.hamlet b/templates/mail/correctorInvitation.hamlet
new file mode 100644
index 000000000..6583dfa09
--- /dev/null
+++ b/templates/mail/correctorInvitation.hamlet
@@ -0,0 +1,11 @@
+$newline never
+\<!doctype html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+  <body>
+    <p>
+      _{MsgSheetCorrInviteExplanation}
+    <p>
+      <a href=#{invitationUrl'}>
+        _{MsgInvitationAcceptDecline}
diff --git a/templates/mail/lecturerInvitation.hamlet b/templates/mail/lecturerInvitation.hamlet
index 9de17cc39..13a752f92 100644
--- a/templates/mail/lecturerInvitation.hamlet
+++ b/templates/mail/lecturerInvitation.hamlet
@@ -8,4 +8,4 @@ $newline never
       _{MsgCourseLecInviteExplanation}
     <p>
       <a href=#{invitationUrl'}>
-        _{MsgCourseLecturerInvitationAcceptDecline}
+        _{MsgInvitationAcceptDecline}
diff --git a/templates/sheetCorrInvite.hamlet b/templates/sheetCorrInvite.hamlet
new file mode 100644
index 000000000..8e51c7358
--- /dev/null
+++ b/templates/sheetCorrInvite.hamlet
@@ -0,0 +1,3 @@
+<p>
+  _{MsgSheetCorrInviteExplanation}
+^{btnWidget}
diff --git a/templates/sheetCorrectors/add.hamlet b/templates/sheetCorrectors/add.hamlet
new file mode 100644
index 000000000..3ad3f5fa8
--- /dev/null
+++ b/templates/sheetCorrectors/add.hamlet
@@ -0,0 +1,6 @@
+$newline never
+<td colspan=5>
+  #{csrf}
+  ^{fvInput addView}
+<td>
+  ^{fvInput submitView}
diff --git a/templates/sheetCorrectors/cell.hamlet b/templates/sheetCorrectors/cell.hamlet
new file mode 100644
index 000000000..8a497e436
--- /dev/null
+++ b/templates/sheetCorrectors/cell.hamlet
@@ -0,0 +1,20 @@
+$newline never
+$case userIdent
+  $of Left _
+    <td>
+      ^{identWidget}
+    <td>
+      <div .tooltip>
+        <div .tooltip__handle>
+        <div .tooltip__content>
+          _{MsgEmailInvitationWarning}
+  $of Right _
+    <td colspan=2>
+      ^{identWidget}
+<td>
+  #{csrf}
+  ^{fvInput stateView}
+<td>
+  ^{fvInput byTutView}
+<td>
+  ^{fvInput propView}
diff --git a/templates/sheetCorrectors/layout.hamlet b/templates/sheetCorrectors/layout.hamlet
new file mode 100644
index 000000000..3f6bb4f87
--- /dev/null
+++ b/templates/sheetCorrectors/layout.hamlet
@@ -0,0 +1,18 @@
+$newline never
+<table .table .table--striped .table--hover>
+  <thead>
+    <tr .table__row .table__row--head>
+      <th .table__th colspan="2">_{MsgCorrector}
+      <th .table__th>_{MsgCorState}
+      <th .table__th>_{MsgCorByTut}
+      <th .table__th>_{MsgCorProportion}
+      <td>
+  <tbody>
+    $forall coord <- review liveCoords lLength
+      <tr .massinput--cell .table__row>
+        ^{cellWdgts ! coord}
+        <td>
+          ^{fvInput (delButtons ! coord)}
+  <tfoot>
+    <tr .massinput--add>
+      ^{addWdgts ! (0, 0)}
diff --git a/templates/widgets/email.hamlet b/templates/widgets/email.hamlet
new file mode 100644
index 000000000..285c2c958
--- /dev/null
+++ b/templates/widgets/email.hamlet
@@ -0,0 +1,2 @@
+<span style="font-family: monospace">
+  ^{toHtml email}

From b63a2461091ba16463b034918aeb0de440b8c982 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 20 Apr 2019 21:28:44 +0200
Subject: [PATCH 101/238] Fix Haddock

---
 src/Handler/Utils/Form/MassInput.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Handler/Utils/Form/MassInput.hs b/src/Handler/Utils/Form/MassInput.hs
index c6b26d758..b89799f9a 100644
--- a/src/Handler/Utils/Form/MassInput.hs
+++ b/src/Handler/Utils/Form/MassInput.hs
@@ -256,9 +256,9 @@ data MassInput handler liveliness cellData cellResult = MassInput
   , miButtonAction :: forall p. PathPiece p => p -> Maybe (SomeRoute UniWorX) -- ^ Override form-tag route for `massInput`-Buttons to keep the user closer to the Widget, the `PathPiece` Argument is to be used for constructiong a `Fragment`
   , miLayout :: liveliness
              -> Map (BoxCoord liveliness) (cellData, FormResult cellResult)
-             -> Map (BoxCoord liveliness) Widget -- ^ Cell Widgets
-             -> Map (BoxCoord liveliness) (FieldView UniWorX) -- ^ Delete buttons
-             -> Map (Natural, BoxCoord liveliness) Widget -- ^ Addition forms
+             -> Map (BoxCoord liveliness) Widget -- Cell Widgets
+             -> Map (BoxCoord liveliness) (FieldView UniWorX) -- Delete buttons
+             -> Map (Natural, BoxCoord liveliness) Widget -- Addition forms
              -> Widget
   }
 

From 4578b5c3e3f3f225ff1178cd4b824b69b1cb0b9a Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 20 Apr 2019 21:28:44 +0200
Subject: [PATCH 102/238] Fix Haddock

---
 src/Handler/Utils/Form/MassInput.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Handler/Utils/Form/MassInput.hs b/src/Handler/Utils/Form/MassInput.hs
index 9ee5e07d2..142f0ef2a 100644
--- a/src/Handler/Utils/Form/MassInput.hs
+++ b/src/Handler/Utils/Form/MassInput.hs
@@ -256,9 +256,9 @@ data MassInput handler liveliness cellData cellResult = MassInput
   , miButtonAction :: forall p. PathPiece p => p -> Maybe (SomeRoute UniWorX) -- ^ Override form-tag route for `massInput`-Buttons to keep the user closer to the Widget, the `PathPiece` Argument is to be used for constructiong a `Fragment`
   , miLayout :: liveliness
              -> Map (BoxCoord liveliness) (cellData, FormResult cellResult)
-             -> Map (BoxCoord liveliness) Widget -- ^ Cell Widgets
-             -> Map (BoxCoord liveliness) (FieldView UniWorX) -- ^ Delete buttons
-             -> Map (Natural, BoxCoord liveliness) Widget -- ^ Addition forms
+             -> Map (BoxCoord liveliness) Widget -- Cell Widgets
+             -> Map (BoxCoord liveliness) (FieldView UniWorX) -- Delete buttons
+             -> Map (Natural, BoxCoord liveliness) Widget -- Addition forms
              -> Widget
   }
 

From cb3bb18a5dcc647c13fd7d1e0383dba24b3e18ff Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 20 Apr 2019 21:57:05 +0200
Subject: [PATCH 103/238] Bump ChangeLog.md

---
 ChangeLog.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ChangeLog.md b/ChangeLog.md
index f35e0e155..1e78cad00 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,9 @@
+  * Version 20.04.2019
+  
+    Versand von Benachrichtigungen an Kursteilnehmer
+    
+    Eintragen von Korrektoren und Kursverwaltern auch ohne bestehenden Account
+
   * Version 27.03.2019
 
     Kurse Veranstalter können nun mehrere Dozenten und Assistenten selbst eintragen

From 98026b2a40c791ae83728ddc24405ddf06af1262 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 20 Apr 2019 22:17:17 +0200
Subject: [PATCH 104/238] Fix hlint

---
 src/Handler/Utils/Communication.hs      | 4 ++--
 src/Handler/Utils/Form/MassInput/TH.hs  | 7 +++----
 src/Handler/Utils/Tokens.hs             | 2 +-
 src/Jobs/Handler/CorrectorInvitation.hs | 2 +-
 src/Jobs/Handler/LecturerInvitation.hs  | 2 +-
 src/Utils/Lens.hs                       | 2 +-
 src/Utils/PathPiece.hs                  | 4 ++--
 src/Utils/Tokens.hs                     | 2 +-
 8 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/Handler/Utils/Communication.hs b/src/Handler/Utils/Communication.hs
index accbaafbe..1ccf45abc 100644
--- a/src/Handler/Utils/Communication.hs
+++ b/src/Handler/Utils/Communication.hs
@@ -111,7 +111,7 @@ commR CommunicationRoute{..} =  do
   let
     lookupUser :: UserId -> User
     lookupUser lId
-      = entityVal . unsafeHead . filter ((== lId) . entityKey) $ (concat $ Map.elems suggestedRecipients) ++ chosenRecipients
+      = entityVal . unsafeHead . filter ((== lId) . entityKey) $ concat (Map.elems suggestedRecipients) ++ chosenRecipients
 
   let chosenRecipients' = Map.fromList $
         [ ( (EnumPosition $ RecipientGroup g, pos)
@@ -156,7 +156,7 @@ commR CommunicationRoute{..} =  do
                    -> Widget
           miLayout liveliness state cellWdgts _delButtons addWdgts = do
             checkedIdentBase <- newIdent
-            let checkedCategories = Set.mapMonotonic (unEnumPosition . fst) . Set.filter (\k' -> Map.foldrWithKey (\k (_, checkState) -> (||) $ k == k' && checkState /= FormSuccess False && (checkState /= FormMissing || fromMaybe True (fmap snd $ chosenRecipients' !? k))) False state) $ Map.keysSet state
+            let checkedCategories = Set.mapMonotonic (unEnumPosition . fst) . Set.filter (\k' -> Map.foldrWithKey (\k (_, checkState) -> (||) $ k == k' && checkState /= FormSuccess False && (checkState /= FormMissing || maybe True snd (chosenRecipients' !? k))) False state) $ Map.keysSet state
                 checkedIdent c = checkedIdentBase <> "-" <> toPathPiece c
                 categoryIndices c = Set.filter ((== c) . unEnumPosition . fst) $ review liveCoords liveliness
             $(widgetFile "widgets/communication/recipientLayout")
diff --git a/src/Handler/Utils/Form/MassInput/TH.hs b/src/Handler/Utils/Form/MassInput/TH.hs
index b495a244b..095149bf7 100644
--- a/src/Handler/Utils/Form/MassInput/TH.hs
+++ b/src/Handler/Utils/Form/MassInput/TH.hs
@@ -16,12 +16,11 @@ import Data.List ((!!))
 
 tupleBoxCoord :: Int -> DecQ
 tupleBoxCoord tupleDim = do
-  cs <- sequence . replicate tupleDim $ newName "c"
+  cs <- replicateM tupleDim $ newName "c"
 
   let tupleType = foldl appT (tupleT tupleDim) $ map varT cs
-      tCxt = cxt $ concat
-        [ [ [t|IsBoxCoord $(varT c)|] | c <- cs ]
-        ]
+      tCxt = cxt
+        [ [t|IsBoxCoord $(varT c)|] | c <- cs ]
       fieldLenses =
         [ [e|_1|]
         , [e|_2|]
diff --git a/src/Handler/Utils/Tokens.hs b/src/Handler/Utils/Tokens.hs
index 00a0cdbe7..e95b16a69 100644
--- a/src/Handler/Utils/Tokens.hs
+++ b/src/Handler/Utils/Tokens.hs
@@ -19,7 +19,7 @@ maybeBearerToken = runMaybeT $ catchIfMaybeT cPred requireBearerToken
 
 requireBearerToken :: (MonadHandler m, HandlerSite m ~ UniWorX) => m (BearerToken UniWorX)
 requireBearerToken = liftHandlerT $ do
-  token <- exceptT (guardAuthResult >=> error "askToken should not throw `Authorized`") return $ askTokenUnsafe
+  token <- exceptT (guardAuthResult >=> error "askToken should not throw `Authorized`") return askTokenUnsafe
   mAuthId <- maybeAuthId
   currentRoute <- maybe (permissionDeniedI MsgUnauthorizedToken404) return =<< getCurrentRoute
   isWrite <- isWriteRequest currentRoute
diff --git a/src/Jobs/Handler/CorrectorInvitation.hs b/src/Jobs/Handler/CorrectorInvitation.hs
index 92b3cbc91..76e0d26c2 100644
--- a/src/Jobs/Handler/CorrectorInvitation.hs
+++ b/src/Jobs/Handler/CorrectorInvitation.hs
@@ -32,7 +32,7 @@ dispatchJobCorrectorInvitation jInviter jCorrectorInvitation@SheetCorrectorInvit
       invitationUrl' <- toTextUrl invitationUrl
 
       mailT def $ do
-        _mailTo .= [Address Nothing (CI.original $ sheetCorrectorInvitationEmail)]
+        _mailTo .= [Address Nothing $ CI.original sheetCorrectorInvitationEmail]
         replaceMailHeader "Reply-To" . Just . renderAddress $ Address (Just userDisplayName) (CI.original userEmail)
         replaceMailHeader "Auto-Submitted" $ Just "auto-generated"
         setSubjectI $ MsgMailSubjectCorrectorInvitation courseTerm courseSchool courseShorthand sheetName
diff --git a/src/Jobs/Handler/LecturerInvitation.hs b/src/Jobs/Handler/LecturerInvitation.hs
index 8faeabba2..e3fd03a6d 100644
--- a/src/Jobs/Handler/LecturerInvitation.hs
+++ b/src/Jobs/Handler/LecturerInvitation.hs
@@ -31,7 +31,7 @@ dispatchJobLecturerInvitation jInviter jLecturerInvitation@LecturerInvitation{..
       invitationUrl' <- toTextUrl invitationUrl
 
       mailT def $ do
-        _mailTo .= [Address Nothing (CI.original $ lecturerInvitationEmail)]
+        _mailTo .= [Address Nothing $ CI.original lecturerInvitationEmail]
         replaceMailHeader "Reply-To" . Just . renderAddress $ Address (Just userDisplayName) (CI.original userEmail)
         replaceMailHeader "Auto-Submitted" $ Just "auto-generated"
         setSubjectI $ MsgMailSubjectLecturerInvitation courseTerm courseSchool courseShorthand
diff --git a/src/Utils/Lens.hs b/src/Utils/Lens.hs
index 1da50329f..fc5bb1738 100644
--- a/src/Utils/Lens.hs
+++ b/src/Utils/Lens.hs
@@ -1,6 +1,6 @@
 module Utils.Lens ( module Utils.Lens ) where
 
-import ClassyPrelude.Yesod hiding ((.=))
+import ClassyPrelude.Yesod
 import Model
 import Control.Lens as Utils.Lens hiding ((<.>), universe, snoc)
 import Control.Lens.Extras as Utils.Lens (is)
diff --git a/src/Utils/PathPiece.hs b/src/Utils/PathPiece.hs
index 7f2e0bd78..7a391bc01 100644
--- a/src/Utils/PathPiece.hs
+++ b/src/Utils/PathPiece.hs
@@ -75,8 +75,8 @@ tuplePathPiece tupleDim = do
     tupleSeparator :: Text
     tupleSeparator = ","
   
-  xs <- sequence . replicate tupleDim $ newName "x" :: Q [Name]
-  xs' <- sequence . replicate tupleDim $ newName "x'" :: Q [Name]
+  xs <- replicateM tupleDim $ newName "x" :: Q [Name]
+  xs' <- replicateM tupleDim $ newName "x'" :: Q [Name]
 
   let tupleType = foldl appT (tupleT tupleDim) $ map varT xs
       tCxt = cxt
diff --git a/src/Utils/Tokens.hs b/src/Utils/Tokens.hs
index f6533120d..5f8107573 100644
--- a/src/Utils/Tokens.hs
+++ b/src/Utils/Tokens.hs
@@ -12,7 +12,7 @@ import Yesod.Auth (AuthId)
 
 import Utils (NTop(..), hoistMaybe, SessionKey(..))
 import Utils.Parameters
-import Utils.Lens hiding ((.=))
+import Utils.Lens
 
 import Model
 import Model.Tokens

From 721630f4b29535d8aaf2ac8b97c27e2bb086c9b6 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 20 Apr 2019 22:23:51 +0200
Subject: [PATCH 105/238] add styling for course communication recipient form

---
 .../widgets/communication/recipientAdd.hamlet |  2 +-
 .../communication/recipientEmail.hamlet       |  7 ++--
 .../communication/recipientLayout.hamlet      |  7 ++--
 .../communication/recipientLayout.lucius      | 40 +++++++++++++++++++
 .../communication/recipientName.hamlet        |  4 +-
 5 files changed, 50 insertions(+), 10 deletions(-)
 create mode 100644 templates/widgets/communication/recipientLayout.lucius

diff --git a/templates/widgets/communication/recipientAdd.hamlet b/templates/widgets/communication/recipientAdd.hamlet
index 6f992e6bd..3c99d2964 100644
--- a/templates/widgets/communication/recipientAdd.hamlet
+++ b/templates/widgets/communication/recipientAdd.hamlet
@@ -1,5 +1,5 @@
 $newline never
-<div .category__entry-add>
+<div .recipient-category__option-add>
   #{csrf}
   ^{fvInput addView}
   ^{fvInput submitView}
diff --git a/templates/widgets/communication/recipientEmail.hamlet b/templates/widgets/communication/recipientEmail.hamlet
index ed3964879..5290fcef2 100644
--- a/templates/widgets/communication/recipientEmail.hamlet
+++ b/templates/widgets/communication/recipientEmail.hamlet
@@ -1,7 +1,6 @@
 $newline never
-<div .category__option>
+<div .recipient-category__option>
   #{csrf}
   ^{fvInput tickView}
-  <label for=#{fvId tickView}>
-    <span style="font-family: monospace">
-      #{email}
+  <label .recipient-category__option-label for=#{fvId tickView}>
+    #{email}
diff --git a/templates/widgets/communication/recipientLayout.hamlet b/templates/widgets/communication/recipientLayout.hamlet
index 9f0ff360f..680778623 100644
--- a/templates/widgets/communication/recipientLayout.hamlet
+++ b/templates/widgets/communication/recipientLayout.hamlet
@@ -1,11 +1,12 @@
 $newline never
 $forall category <- activeCategories
-  <div .category>
+  <div .recipient-category>
     <input type=checkbox id=#{checkedIdent category} :elem category checkedCategories:checked>
-    <label for=#{checkedIdent category}>
+    <label .recipient-category__label for=#{checkedIdent category}>
       _{category}
 
-    <fieldset uw-interactive-fieldset data-conditional-input=#{checkedIdent category} .interactive-fieldset--target>
+    $# TODO: only add fieldset if there are options to choose from
+    <fieldset .recipient-category__fieldset uw-interactive-fieldset data-conditional-input=#{checkedIdent category}>
       $forall optIx <- categoryIndices category
         ^{cellWdgts ! optIx}
 
diff --git a/templates/widgets/communication/recipientLayout.lucius b/templates/widgets/communication/recipientLayout.lucius
new file mode 100644
index 000000000..c7636f072
--- /dev/null
+++ b/templates/widgets/communication/recipientLayout.lucius
@@ -0,0 +1,40 @@
+.recipient-category {
+  max-width: 400px;
+  padding: 3px 0;
+
+  &:not(:last-child) {
+    margin-bottom: 7px;
+  }
+
+  &:not(:first-child) {
+    margin-top: 7px;
+  }
+}
+
+.recipient-category__option {
+  display: flex;
+
+  &:not(:last-child) {
+    margin-bottom: 10px;
+  }
+}
+
+.recipient-category__label,
+.recipient-category__option-label {
+  margin-left: 15px;
+  vertical-align: top;
+}
+
+.recipient-category__fieldset {
+  margin: 7px 0 5px 9px;
+  padding: 5px 0 10px;
+  border-left: 1px solid #bcbcbc;
+  padding-left: 16px;
+  max-height: 200px;
+  overflow-y: auto;
+}
+
+.recipient-category__option-add {
+  display: flex;
+  align-items: center;
+}
diff --git a/templates/widgets/communication/recipientName.hamlet b/templates/widgets/communication/recipientName.hamlet
index 1da8a7fe3..96b650b0d 100644
--- a/templates/widgets/communication/recipientName.hamlet
+++ b/templates/widgets/communication/recipientName.hamlet
@@ -1,6 +1,6 @@
 $newline never
-<div .category__option>
+<div .recipient-category__option>
   #{csrf}
   ^{fvInput tickView}
-  <label for=#{fvId tickView}>
+  <label .recipient-category__option-label for=#{fvId tickView}>
     #{nameHtml userDisplayName userSurname}

From b35dc87db6d05e514ac787c19dda1e279e741b12 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 20 Apr 2019 22:24:50 +0200
Subject: [PATCH 106/238] make target for interactive-fieldset optional

---
 static/js/utils/form.js              | 13 +++----------
 templates/widgets/aform/aform.hamlet |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index b2a449e2a..ad87b3501 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -182,15 +182,8 @@
       }
       conditionalValue = element.dataset.conditionalValue;
 
-      if (element.matches(INTERACTIVE_FIELDSET_UTIL_TARGET_SELECTOR)) {
-        target = element;
-      }
-      if (!target) {
-        target = element.closest(INTERACTIVE_FIELDSET_UTIL_TARGET_SELECTOR);
-      }
-      if (!target) {
-        throw new Error('Interactive Fieldset needs to be a target or have a target-ancestor!');
-      }
+      // check if there is a target ancestor, otherwise target the fieldset itself
+      target = element.closest(INTERACTIVE_FIELDSET_UTIL_TARGET_SELECTOR) || element;
 
       childInputs = Array.from(element.querySelectorAll(INTERACTIVE_FIELDSET_CHILD_SELECTOR));
 
@@ -212,7 +205,7 @@
 
     function updateVisibility() {
       var active = matchesConditionalValue();
-      
+
       target.classList.toggle('hidden', !active);
 
       childInputs.forEach(function(el) {
diff --git a/templates/widgets/aform/aform.hamlet b/templates/widgets/aform/aform.hamlet
index 00f8755f2..91ebc2b93 100644
--- a/templates/widgets/aform/aform.hamlet
+++ b/templates/widgets/aform/aform.hamlet
@@ -11,7 +11,7 @@ $case formLayout
         <h3 .form-section-title>
           ^{fvLabel view}
       $else
-        <div .form-group .interactive-fieldset--target :fvRequired view:.form-group--required :not $ fvRequired view:.form-group--optional :isJust $ fvErrors view:.form-group--has-error>
+        <div .form-group :fvRequired view:.form-group--required :not $ fvRequired view:.form-group--optional :isJust $ fvErrors view:.form-group--has-error>
           $if not (Blaze.null $ fvLabel view)
             <label .form-group-label for=#{fvId view}>
               <span .form-group-label__caption>

From 04f6f89ada090b5cc4a1296d26c2604c837e06e0 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 20 Apr 2019 22:34:05 +0200
Subject: [PATCH 107/238] Fix build

---
 src/Handler/Utils/Form/MassInput/TH.hs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Handler/Utils/Form/MassInput/TH.hs b/src/Handler/Utils/Form/MassInput/TH.hs
index 095149bf7..01d0e8e56 100644
--- a/src/Handler/Utils/Form/MassInput/TH.hs
+++ b/src/Handler/Utils/Form/MassInput/TH.hs
@@ -13,6 +13,8 @@ import Control.Lens
 
 import Data.List ((!!))
 
+import Control.Monad (replicateM)
+
 
 tupleBoxCoord :: Int -> DecQ
 tupleBoxCoord tupleDim = do

From 4d6fc24b404250f81e08dfd8598823ab6c7feaa3 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 21 Apr 2019 10:24:23 +0200
Subject: [PATCH 108/238] Hotfix (logically) nested multiActions

---
 static/js/utils/form.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index b2a449e2a..367d4dba1 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -149,7 +149,7 @@
   var INTERACTIVE_FIELDSET_UTIL_TARGET_SELECTOR = '.interactive-fieldset--target';
 
   var INTERACTIVE_FIELDSET_INITIALIZED_CLASS = 'interactive-fieldset--initialized';
-  var INTERACTIVE_FIELDSET_CHILD_SELECTOR = 'input:not([disabled])';
+  var INTERACTIVE_FIELDSET_CHILD_SELECTOR = 'input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled])';
 
   var interactiveFieldsetUtil = function(element) {
     var conditionalInput;
@@ -195,6 +195,10 @@
       childInputs = Array.from(element.querySelectorAll(INTERACTIVE_FIELDSET_CHILD_SELECTOR));
 
       // add event listener
+      var observer = new MutationObserver(function(mutationsList, observer) {
+        updateVisibility();
+      });
+      observer.observe(conditionalInput, { attributes: true, attributeFilter: ['disabled'] });
       conditionalInput.addEventListener('input', updateVisibility);
 
       // initial visibility update
@@ -211,12 +215,12 @@
     }
 
     function updateVisibility() {
-      var active = matchesConditionalValue();
+      var active = matchesConditionalValue() && !conditionalInput.disabled;
       
       target.classList.toggle('hidden', !active);
 
       childInputs.forEach(function(el) {
-        el.toggleAttribute('disabled', !active);
+        el.disabled = !active;
       });
     }
 

From 07ff56e1576f27c6ff69f49000e2a2e0e21804f4 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 21 Apr 2019 13:57:03 +0200
Subject: [PATCH 109/238] Mixed (external & direct) submissions

---
 messages/uniworx/de.msg              |  7 +-
 models/sheets                        |  3 +-
 src/CryptoID.hs                      | 18 -----
 src/Database/Persist/TH/Directory.hs | 27 +++++---
 src/Foundation.hs                    | 32 ++++-----
 src/Handler/Corrections.hs           | 10 +--
 src/Handler/Profile.hs               |  4 +-
 src/Handler/Sheet.hs                 |  9 +--
 src/Handler/Submission.hs            | 10 +--
 src/Handler/Utils/Form.hs            | 98 +++++++++++++++++-----------
 src/Model/Migration.hs               | 17 +++++
 src/Model/Migration/Types.hs         | 40 ++++++++++++
 src/Model/Types.hs                   | 63 +++++++++++++-----
 src/Utils/Lens.hs                    |  7 +-
 templates/sheetShow.hamlet           |  6 +-
 templates/submission.hamlet          | 10 +--
 16 files changed, 229 insertions(+), 132 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 0c3465350..c29f933d6 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -456,9 +456,10 @@ UploadModeNone: Kein Upload
 UploadModeUnpack: Upload, einzelne Datei
 UploadModeNoUnpack: Upload, ZIP-Archive entpacken
 
-SheetNoSubmissions: Keine Abgabe
-SheetCorrectorSubmissions: Abgabe extern mit Pseudonym
-SheetUserSubmissions: Direkte Abgabe
+NoSubmissions: Keine Abgabe
+CorrectorSubmissions: Abgabe extern mit Pseudonym
+UserSubmissions: Direkte Abgabe
+BothSubmissions: Abgabe direkt & extern mit Pseudonym
 
 SheetCorrectorSubmissionsTip: Abgabe erfolgt über ein Uni2work-externes Verfahren (zumeist in Papierform durch Einwurf) unter Angabe eines persönlichen Pseudonyms. Korrektorn können mithilfe des Pseudonyms später Korrekturergebnisse in Uni2work eintragen, damit Sie sie einsehen können.
 
diff --git a/models/sheets b/models/sheets
index 8f6d623db..293d75b2f 100644
--- a/models/sheets
+++ b/models/sheets
@@ -10,8 +10,7 @@ Sheet   -- exercise sheet for a given course
     activeTo        UTCTime          -- Submission is only permitted before
     hintFrom        UTCTime Maybe    -- Additional files are made available
     solutionFrom    UTCTime Maybe    -- Solution is made available
-    uploadMode      UploadMode       -- Take apart Zip-Archives or not?
-    submissionMode  SheetSubmissionMode default='UserSubmissions'  -- Submission upload by students or through tutors only?
+    submissionMode  SubmissionMode   -- Submission upload by students and/or through tutors?
     autoDistribute  Bool default=false  -- Should correctors be assigned submissions automagically?
     CourseSheet course name
     deriving Generic
diff --git a/src/CryptoID.hs b/src/CryptoID.hs
index 22266fc3a..4914bac78 100644
--- a/src/CryptoID.hs
+++ b/src/CryptoID.hs
@@ -58,21 +58,3 @@ instance {-# OVERLAPS #-} namespace ~ CryptoIDNamespace (CI FilePath) Submission
   parseJSON = withText "CryptoFileNameSubmission" $ maybe (fail "Could not parse CryptoFileNameSubmission") return . fromPathPiece
 instance {-# OVERLAPS #-} namespace ~ CryptoIDNamespace (CI FilePath) SubmissionId => FromJSONKey (E.CryptoID namespace (CI FilePath)) where
   fromJSONKey = FromJSONKeyTextParser $ maybe (fail "Could not parse CryptoFileNameSubmission") return . fromPathPiece
-
-
-newtype SubmissionMode = SubmissionMode (Maybe CryptoFileNameSubmission)
-  deriving (Show, Read, Eq)
-
-pattern NewSubmission :: SubmissionMode
-pattern NewSubmission = SubmissionMode Nothing
-pattern ExistingSubmission :: CryptoFileNameSubmission -> SubmissionMode
-pattern ExistingSubmission cID = SubmissionMode (Just cID)
-
-instance PathPiece SubmissionMode where
-    fromPathPiece "new" = Just $ SubmissionMode Nothing
-    fromPathPiece s     = SubmissionMode . Just <$> fromPathPiece s
-
-    toPathPiece (SubmissionMode Nothing)  = "new"
-    toPathPiece (SubmissionMode (Just x)) = toPathPiece x
-
-
diff --git a/src/Database/Persist/TH/Directory.hs b/src/Database/Persist/TH/Directory.hs
index 770b71d71..66966913c 100644
--- a/src/Database/Persist/TH/Directory.hs
+++ b/src/Database/Persist/TH/Directory.hs
@@ -2,26 +2,35 @@ module Database.Persist.TH.Directory
   ( persistDirectoryWith
   ) where
 
-import ClassyPrelude hiding (mapM_, toList)
+import ClassyPrelude
 
 import Database.Persist.TH (parseReferences)
 import Database.Persist.Quasi (PersistSettings)
-import Language.Haskell.TH.Syntax
+import Language.Haskell.TH.Syntax hiding (lift)
 
 import qualified Data.Text as Text
 import qualified Data.Text.IO as Text
 import qualified System.IO as SIO
 
+import System.FilePath
 import qualified System.Directory.Tree as DirTree
 
-import Data.Foldable (Foldable(..), mapM_)
+import Control.Monad.Trans.Maybe (MaybeT(MaybeT), runMaybeT)
+
+import Control.Lens
+  
 
 persistDirectoryWith :: PersistSettings -> FilePath -> Q Exp
 persistDirectoryWith settings dir = do
-  files <- runIO . flip DirTree.readDirectoryWith dir $ \fp -> do
-    h <- SIO.openFile fp SIO.ReadMode
-    SIO.hSetEncoding h SIO.utf8_bom
-    Text.hGetContents h
-  mapM_ (qAddDependentFile . fst) $ DirTree.zipPaths files
+  files <- runIO . flip DirTree.readDirectoryWith dir $ \fp -> runMaybeT $ do
+    fn <- MaybeT . return . fromNullable $ takeFileName fp
+    guard . not $ head fn == '.'
+    guard . not $ head fn == '#' && last fn == '#'
+
+    lift $ do
+      h <- SIO.openFile fp SIO.ReadMode
+      SIO.hSetEncoding h SIO.utf8_bom
+      Text.hGetContents h
+  mapM_ qAddDependentFile . toListOf (traverse . filtered (has $ _2 . _Just) . _1) $ DirTree.zipPaths files
   
-  parseReferences settings . Text.intercalate "\n" . toList $ DirTree.dirTree files
+  parseReferences settings . Text.intercalate "\n" . toListOf (traverse . _Just) $ DirTree.dirTree files
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 4dbbba963..46e176a19 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -253,9 +253,13 @@ embedRenderMessage ''UniWorX ''RatingException id
 embedRenderMessage ''UniWorX ''SubmissionSinkException ("SubmissionSinkException" <>)
 embedRenderMessage ''UniWorX ''SheetGrading ("SheetGrading" <>)
 embedRenderMessage ''UniWorX ''AuthTag $ ("AuthTag" <>) . concat . drop 1 . splitCamel
-embedRenderMessage ''UniWorX ''SheetSubmissionMode ("Sheet" <>)
 embedRenderMessage ''UniWorX ''EncodedSecretBoxException id
 embedRenderMessage ''UniWorX ''LecturerType id
+embedRenderMessage ''UniWorX ''SubmissionModeDescr
+  $ let verbMap [_, _, "None"] = "NoSubmissions"
+        verbMap [_, _, v] = v <> "Submissions"
+        verbMap _ = error "Invalid number of verbs"
+     in verbMap . splitCamel
 
 newtype SheetTypeHeader = SheetTypeHeader SheetType
 embedRenderMessageVariant ''UniWorX ''SheetTypeHeader ("SheetType" <>)
@@ -742,15 +746,15 @@ tagAccessPredicate AuthRated = APDB $ \_ route _ -> case route of
 tagAccessPredicate AuthUserSubmissions = APDB $ \_ route _ -> case route of
   CSheetR tid ssh csh shn _ -> maybeT (unauthorizedI MsgUnauthorizedUserSubmission) $ do
     Entity cid _ <- MaybeT . getBy $ TermSchoolCourseShort tid ssh csh
-    Entity _ Sheet{sheetSubmissionMode} <- MaybeT . getBy $ CourseSheet cid shn
-    guard $ sheetSubmissionMode == UserSubmissions
+    Entity _ Sheet{ sheetSubmissionMode = SubmissionMode{..} } <- MaybeT . getBy $ CourseSheet cid shn
+    guard $ is _Just submissionModeUser
     return Authorized
   r -> $unsupportedAuthPredicate AuthUserSubmissions r
 tagAccessPredicate AuthCorrectorSubmissions = APDB $ \_ route _ -> case route of
   CSheetR tid ssh csh shn _ -> maybeT (unauthorizedI MsgUnauthorizedCorrectorSubmission) $ do
     Entity cid _ <- MaybeT . getBy $ TermSchoolCourseShort tid ssh csh
-    Entity _ Sheet{sheetSubmissionMode} <- MaybeT . getBy $ CourseSheet cid shn
-    guard $ sheetSubmissionMode == CorrectorSubmissions
+    Entity _ Sheet{ sheetSubmissionMode = SubmissionMode{..} } <- MaybeT . getBy $ CourseSheet cid shn
+    guard submissionModeCorrector
     return Authorized
   r -> $unsupportedAuthPredicate AuthCorrectorSubmissions r
 tagAccessPredicate AuthSelf = APHandler $ \mAuthId route _ -> exceptT return return $ do
@@ -1891,7 +1895,7 @@ pageActions (CorrectionsR) =
       , menuItemModal = False
       , menuItemAccessCallback' = runDB . maybeT (return False) $ do
           uid <- MaybeT $ liftHandlerT maybeAuthId
-          [E.Value sheetCount] <- lift . E.select . E.from $ \(course `E.InnerJoin` sheet) -> do
+          sheets <- lift . E.select . E.from $ \(course `E.InnerJoin` sheet) -> do
             E.on $ course E.^. CourseId E.==. sheet E.^. SheetCourse
             let
               isCorrector' = E.exists . E.from $ \sheetCorrector -> E.where_
@@ -1900,10 +1904,9 @@ pageActions (CorrectionsR) =
               isLecturer = E.exists . E.from $ \lecturer -> E.where_
                     $ lecturer E.^. LecturerUser E.==. E.val uid
                 E.&&. lecturer E.^. LecturerCourse E.==. course E.^. CourseId
-            E.where_ $ sheet E.^. SheetSubmissionMode E.==. E.val CorrectorSubmissions
-                 E.&&. ( isCorrector' E.||. isLecturer )
-            return E.countRows
-          return $ (sheetCount :: Int) /= 0
+            E.where_ $ isCorrector' E.||. isLecturer
+            return $ sheet E.^. SheetSubmissionMode
+          return $ orOf (traverse . _Value . _submissionModeCorrector) sheets
       }
   , MenuItem
       { menuItemType = PageActionPrime
@@ -1931,7 +1934,7 @@ pageActions (CorrectionsGradeR) =
       , menuItemModal = False
       , menuItemAccessCallback' = runDB . maybeT (return False) $ do
           uid <- MaybeT $ liftHandlerT maybeAuthId
-          [E.Value sheetCount] <- lift . E.select . E.from $ \(course `E.InnerJoin` sheet) -> do
+          sheets <- lift . E.select . E.from $ \(course `E.InnerJoin` sheet) -> do
             E.on $ course E.^. CourseId E.==. sheet E.^. SheetCourse
             let
               isCorrector' = E.exists . E.from $ \sheetCorrector -> E.where_
@@ -1940,10 +1943,9 @@ pageActions (CorrectionsGradeR) =
               isLecturer = E.exists . E.from $ \lecturer -> E.where_
                     $ lecturer E.^. LecturerUser E.==. E.val uid
                 E.&&. lecturer E.^. LecturerCourse E.==. course E.^. CourseId
-            E.where_ $ sheet E.^. SheetSubmissionMode E.==. E.val CorrectorSubmissions
-                 E.&&. ( isCorrector' E.||. isLecturer )
-            return E.countRows
-          return $ (sheetCount :: Int) /= 0
+            E.where_ $ isCorrector' E.||. isLecturer
+            return $ sheet E.^. SheetSubmissionMode
+          return $ orOf (traverse . _Value . _submissionModeCorrector) sheets
       }
   ]
 pageActions _ = []
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index b82a85ea0..8f1049ad7 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -80,9 +80,6 @@ courseIs cid  (( course `E.InnerJoin` _sheet `E.InnerJoin` _submission) `E.LeftO
 sheetIs :: Key Sheet -> CorrectionTableWhere
 sheetIs shid  ((_course `E.InnerJoin`  sheet `E.InnerJoin` _submission) `E.LeftOuterJoin` _corrector) = sheet E.^. SheetId E.==. E.val shid
 
-submissionModeIs :: SheetSubmissionMode -> CorrectionTableWhere
-submissionModeIs sMode ((_course `E.InnerJoin` sheet `E.InnerJoin` _submission) `E.LeftOuterJoin` _corrector) = sheet E.^. SheetSubmissionMode E.==. E.val sMode
-
 
 -- Columns
 colTerm :: IsDBTable m a => Colonnade Sortable CorrectionTableData (DBCell m a)
@@ -731,7 +728,7 @@ getCorrectionsCreateR, postCorrectionsCreateR :: Handler Html
 getCorrectionsCreateR = postCorrectionsCreateR
 postCorrectionsCreateR = do
   uid <- requireAuthId
-  let sheetOptions = mkOptList <=< runDB $ E.select . E.from $ \(course `E.InnerJoin` sheet) -> do
+  let sheetOptions = mkOptList . toListOf (traverse . filtered (view $ _1 . _Value . _submissionModeCorrector) . _2) <=< runDB $ E.select . E.from $ \(course `E.InnerJoin` sheet) -> do
         E.on $ course E.^. CourseId E.==. sheet E.^. SheetCourse
         let
           isCorrector = E.exists . E.from $ \sheetCorrector -> E.where_
@@ -740,10 +737,9 @@ postCorrectionsCreateR = do
           isLecturer = E.exists . E.from $ \lecturer -> E.where_
                 $ lecturer E.^. LecturerUser E.==. E.val uid
             E.&&. lecturer E.^. LecturerCourse E.==. course E.^. CourseId
-        E.where_ $ sheet E.^. SheetSubmissionMode E.==. E.val CorrectorSubmissions
-             E.&&. ( isCorrector E.||. isLecturer )
+        E.where_ $ isCorrector E.||. isLecturer
         E.orderBy [E.desc $ course E.^. CourseTerm, E.asc $ course E.^. CourseShorthand, E.desc $ sheet E.^. SheetActiveFrom]
-        return (sheet E.^. SheetId, course E.^. CourseTerm, course E.^. CourseShorthand, sheet E.^. SheetName)
+        return (sheet E.^. SheetSubmissionMode, (sheet E.^. SheetId, course E.^. CourseTerm, course E.^. CourseShorthand, sheet E.^. SheetName))
       mkOptList :: [(E.Value SheetId, E.Value TermId, E.Value CourseShorthand, E.Value SheetName)] -> Handler (OptionList SheetId)
       mkOptList opts = do
         opts' <- mapM (\v@(E.Value sid, _, _, _) -> (, v) <$> encrypt sid) opts
diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs
index aa1593ea2..38f47c3e1 100644
--- a/src/Handler/Profile.hs
+++ b/src/Handler/Profile.hs
@@ -515,9 +515,9 @@ mkCorrectionsTable =
         , sortable (toNothing "cload")  (i18nCell MsgCorProportion) $
             correctorLoadCell  <$> view (_dbrOutput . _3 . _entityVal)
         , sortable (toNothing "assigned")  (i18nCell MsgCorProportion) $
-            int64Cell <$> view (_dbrOutput . _4 . _1 . _unValue)
+            int64Cell <$> view (_dbrOutput . _4 . _1 . _Value)
         , sortable (toNothing "corrected")  (i18nCell MsgCorProportion) $
-            int64Cell <$> view (_dbrOutput . _4 . _2 . _unValue)
+            int64Cell <$> view (_dbrOutput . _4 . _2 . _Value)
         ]
 
       validator = def & defaultSorting [SortDescBy "term", SortAscBy "school", SortAscBy "course", SortAscBy "sheet"]
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index cf3f36b09..297708e5f 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -71,8 +71,7 @@ data SheetForm = SheetForm
       , sfVisibleFrom  :: Maybe UTCTime
       , sfActiveFrom   :: UTCTime
       , sfActiveTo     :: UTCTime
-      , sfSubmissionMode :: SheetSubmissionMode
-      , sfUploadMode   :: UploadMode
+      , sfSubmissionMode :: SubmissionMode
       , sfSheetF       :: Maybe (Source Handler (Either FileId File))
       , sfHintFrom     :: Maybe UTCTime
       , sfHintF        :: Maybe (Source Handler (Either FileId File))
@@ -112,8 +111,7 @@ makeSheetForm msId template = identifyForm FIDsheet $ \html -> do
             & setTooltip MsgSheetActiveFromTip)
                                                               (sfActiveFrom   <$> template)
       <*> areq utcTimeField   (fslI MsgSheetActiveTo)         (sfActiveTo     <$> template)
-      <*> areq submissionModeField (fslI MsgSheetSubmissionMode) ((sfSubmissionMode <$> template) <|> pure UserSubmissions)
-      <*> areq uploadModeField (fslI MsgSheetUploadMode)      ((sfUploadMode   <$> template) <|> pure (Upload True))
+      <*> submissionModeForm ((sfSubmissionMode <$> template) <|> pure (SubmissionMode False . Just $ Upload True))
       <*> aopt (multiFileField $ oldFileIds SheetExercise) (fslI MsgSheetExercise) (sfSheetF <$> template)
       <*> aopt utcTimeField   (fslpI MsgSheetHintFrom "Datum, sonst nur für Korrektoren"
             & setTooltip MsgSheetHintFromTip)                 (sfHintFrom     <$> template)
@@ -464,7 +462,6 @@ getSheetNewR tid ssh csh = do
             , sfActiveFrom   = addTime     sheetActiveFrom
             , sfActiveTo     = addTime     sheetActiveTo
             , sfSubmissionMode = sheetSubmissionMode
-            , sfUploadMode   = sheetUploadMode
             , sfSheetF       = Nothing
             , sfHintFrom     = addTime <$> sheetHintFrom
             , sfHintF        = Nothing
@@ -497,7 +494,6 @@ getSEditR tid ssh csh shn = do
         , sfActiveFrom   = sheetActiveFrom
         , sfActiveTo     = sheetActiveTo
         , sfSubmissionMode = sheetSubmissionMode
-        , sfUploadMode   = sheetUploadMode
         , sfSheetF       = Just . yieldMany . map Left . Set.elems $ sheetFileIds SheetExercise
         , sfHintFrom     = sheetHintFrom
         , sfHintF        = Just . yieldMany . map Left . Set.elems $ sheetFileIds SheetHint
@@ -539,7 +535,6 @@ handleSheetEdit tid ssh csh msId template dbAction = do
               , sheetActiveTo       = sfActiveTo
               , sheetHintFrom       = sfHintFrom
               , sheetSolutionFrom   = sfSolutionFrom
-              , sheetUploadMode     = sfUploadMode
               , sheetSubmissionMode = sfSubmissionMode
               , sheetAutoDistribute = fromMaybe False oldAutoDistribute
               }
diff --git a/src/Handler/Submission.hs b/src/Handler/Submission.hs
index 978f02672..99149b23c 100644
--- a/src/Handler/Submission.hs
+++ b/src/Handler/Submission.hs
@@ -75,12 +75,12 @@ makeSubmissionForm msmid uploadMode grouping (self :| buddies) = identifyForm FI
 
 getSubmissionNewR, postSubmissionNewR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html
 getSubmissionNewR = postSubmissionNewR
-postSubmissionNewR tid ssh csh shn = submissionHelper tid ssh csh shn NewSubmission
+postSubmissionNewR tid ssh csh shn = submissionHelper tid ssh csh shn Nothing
 
 
 getSubShowR, postSubShowR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> CryptoFileNameSubmission -> Handler Html
 getSubShowR = postSubShowR
-postSubShowR tid ssh csh shn cid = submissionHelper tid ssh csh shn $ ExistingSubmission cid
+postSubShowR tid ssh csh shn cid = submissionHelper tid ssh csh shn $ Just cid
 
 getSubmissionOwnR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html
 getSubmissionOwnR tid ssh csh shn = do
@@ -98,8 +98,8 @@ getSubmissionOwnR tid ssh csh shn = do
   cID <- encrypt sid
   redirect $ CSubmissionR tid ssh csh shn cID SubShowR
 
-submissionHelper :: TermId -> SchoolId -> CourseShorthand -> SheetName -> SubmissionMode -> Handler Html
-submissionHelper tid ssh csh shn (SubmissionMode mcid) = do
+submissionHelper :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Maybe CryptoFileNameSubmission -> Handler Html
+submissionHelper tid ssh csh shn mcid = do
   (Entity uid userData) <- requireAuth
   msmid     <- traverse decrypt mcid
   actionUrl <- Data.Maybe.fromJust <$> getCurrentRoute
@@ -168,7 +168,7 @@ submissionHelper tid ssh csh shn (SubmissionMode mcid) = do
               return (userName, submissionEdit E.^. SubmissionEditTime)
             forM raw $ \(E.Value name, E.Value time) -> (name, ) <$> formatTime SelFormatDateTime time
         return (csheet,buddies,lastEdits)
-  ((res,formWidget'), formEnctype) <- runFormPost $ makeSubmissionForm msmid sheetUploadMode sheetGrouping (userEmail userData :| buddies)
+  ((res,formWidget'), formEnctype) <- runFormPost $ makeSubmissionForm msmid (fromMaybe (Upload True) . submissionModeUser $ sheetSubmissionMode) sheetGrouping (userEmail userData :| buddies)
   let formWidget = wrapForm formWidget' def
         { formAction = Just $ SomeRoute actionUrl
         , formEncoding = formEnctype
diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index 9323e73a4..e552930d9 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -140,7 +140,47 @@ linkButton lbl cls url = do
       ^{lbl}
   |]
 
+--------------------------
+-- Interactive fieldset --
+--------------------------
 
+multiAction :: forall action a.
+               ( RenderMessage UniWorX action, PathPiece action, Ord action, Eq action )
+            => Map action (AForm (HandlerT UniWorX IO) a)
+            -> FieldSettings UniWorX
+            -> Maybe action
+            -> (Html -> MForm Handler (FormResult a, [FieldView UniWorX]))
+multiAction acts fs@FieldSettings{..} defAction csrf = do
+  mr <- getMessageRender
+
+  let
+    options = OptionList [ Option (mr a) a (toPathPiece a) | a <- Map.keys acts ] fromPathPiece
+  (actionRes, actionView) <- mreq (selectField $ return options) fs defAction
+  results <- mapM (fmap (over _2 ($ [])) . aFormToForm) acts
+
+  let actionResults = view _1 <$> results
+      actionViews = Map.foldrWithKey accViews [] results
+
+      accViews :: forall b. action -> (b, [FieldView UniWorX]) -> [FieldView UniWorX] -> [FieldView UniWorX]
+      accViews act = flip mappend . over (mapped . _fvInput) (\w -> $(widgetFile "widgets/multi-action/multi-action")) . snd
+
+  return ((actionResults Map.!) =<< actionRes, over _fvInput (mappend $ toWidget csrf) actionView : actionViews)
+
+multiActionA :: (RenderMessage UniWorX action, PathPiece action, Ord action, Eq action)
+             => Map action (AForm (HandlerT UniWorX IO) a)
+             -> FieldSettings UniWorX
+             -> Maybe action
+             -> AForm Handler a
+multiActionA acts fSettings defAction = formToAForm $ multiAction acts fSettings defAction mempty
+
+multiActionM :: (RenderMessage UniWorX action, PathPiece action, Ord action, Eq action)
+             => Map action (AForm (HandlerT UniWorX IO) a)
+             -> FieldSettings UniWorX
+             -> Maybe action
+             -> (Html -> MForm Handler (FormResult a, Widget))
+multiActionM acts fSettings defAction = renderAForm FormStandard $ multiActionA acts fSettings defAction
+
+  
 ------------
 -- Fields --
 ------------
@@ -277,8 +317,26 @@ studyFeaturesPrimaryFieldFor oldFeatures mbuid = selectField $ do
 uploadModeField :: Field Handler UploadMode
 uploadModeField = selectField optionsFinite
 
-submissionModeField :: Field Handler SheetSubmissionMode
-submissionModeField = selectField optionsFinite
+submissionModeForm :: Maybe SubmissionMode -> AForm Handler SubmissionMode
+submissionModeForm prev = multiActionA actions (fslI MsgSheetSubmissionMode) $ classifySubmissionMode <$> prev
+  where
+    uploadModeForm = apreq uploadModeField (fslI MsgSheetUploadMode) (preview (_Just . _submissionModeUser . _Just) $ prev)
+
+    actions :: Map SubmissionModeDescr (AForm Handler SubmissionMode)
+    actions = Map.fromList
+      [ ( SubmissionModeNone
+        , pure $ SubmissionMode False Nothing
+        )
+      , ( SubmissionModeCorrector
+        , pure $ SubmissionMode True  Nothing
+        )
+      , ( SubmissionModeUser
+        , SubmissionMode False . Just <$> uploadModeForm
+        )
+      , ( SubmissionModeBoth
+        , SubmissionMode True  . Just <$> uploadModeForm
+        )
+      ]
 
 pseudonymWordField :: Field Handler PseudonymWord
 pseudonymWordField = checkMMap doCheck CI.original $ textField & addDatalist (return $ map CI.original pseudonymWordlist)
@@ -605,42 +663,6 @@ optionsPersistCryptoId filts ords toDisplay = fmap mkOptionList $ do
                  , optionExternalValue = toPathPiece (cId :: CryptoID UUID (Key a))
                  }) cPairs
 
-multiAction :: forall action a.
-               ( RenderMessage UniWorX action, PathPiece action, Ord action, Eq action )
-            => Map action (AForm (HandlerT UniWorX IO) a)
-            -> FieldSettings UniWorX
-            -> Maybe action
-            -> (Html -> MForm Handler (FormResult a, [FieldView UniWorX]))
-multiAction acts fs@FieldSettings{..} defAction csrf = do
-  mr <- getMessageRender
-
-  let
-    options = OptionList [ Option (mr a) a (toPathPiece a) | a <- Map.keys acts ] fromPathPiece
-  (actionRes, actionView) <- mreq (selectField $ return options) fs defAction
-  results <- mapM (fmap (over _2 ($ [])) . aFormToForm) acts
-
-  let actionResults = view _1 <$> results
-      actionViews = Map.foldrWithKey accViews [] results
-
-      accViews :: forall b. action -> (b, [FieldView UniWorX]) -> [FieldView UniWorX] -> [FieldView UniWorX]
-      accViews act = flip mappend . over (mapped . _fvInput) (\w -> $(widgetFile "widgets/multi-action/multi-action")) . snd
-
-  return ((actionResults Map.!) =<< actionRes, over _fvInput (mappend $ toWidget csrf) actionView : actionViews)
-
-multiActionA :: (RenderMessage UniWorX action, PathPiece action, Ord action, Eq action)
-             => Map action (AForm (HandlerT UniWorX IO) a)
-             -> FieldSettings UniWorX
-             -> Maybe action
-             -> AForm Handler a
-multiActionA acts fSettings defAction = formToAForm $ multiAction acts fSettings defAction mempty
-
-multiActionM :: (RenderMessage UniWorX action, PathPiece action, Ord action, Eq action)
-             => Map action (AForm (HandlerT UniWorX IO) a)
-             -> FieldSettings UniWorX
-             -> Maybe action
-             -> (Html -> MForm Handler (FormResult a, Widget))
-multiActionM acts fSettings defAction = renderAForm FormStandard $ multiActionA acts fSettings defAction
-
 formResultModal :: (MonadHandler m, RedirectUrl (HandlerSite m) route) => FormResult a -> route -> (a -> WriterT [Message] m ()) -> m ()
 formResultModal res finalDest handler = maybeT_ $ do
   messages <- case res of
diff --git a/src/Model/Migration.hs b/src/Model/Migration.hs
index 7b5fcc375..b8d960301 100644
--- a/src/Model/Migration.hs
+++ b/src/Model/Migration.hs
@@ -223,6 +223,23 @@ customMigrations = Map.fromListWith (>>)
         whenM (columnExists "study_terms" "shorthand") $ [executeQQ| UPDATE "study_terms" SET "shorthand" = NULL WHERE "shorthand" = '' |]
         whenM (columnExists "study_terms" "name") $ [executeQQ| UPDATE "study_terms" SET "name" = NULL WHERE "shorthand" = '' |]
     )
+  , ( AppliedMigrationKey [migrationVersion|10.0.0|] [version|11.0.0|]
+    , whenM ((&&) <$> columnExists "sheet" "upload_mode" <*> columnExists "sheet" "submission_mode") $ do
+        sheetModes <- [sqlQQ| SELECT "id", "upload_mode", "submission_mode" FROM "sheet"; |]
+        [executeQQ|
+          ALTER TABLE "sheet" DROP COLUMN "upload_mode";
+          ALTER TABLE "sheet" ALTER COLUMN "submission_mode" DROP DEFAULT;
+          ALTER TABLE "sheet" ALTER COLUMN "submission_mode" TYPE jsonb USING 'null'::jsonb;
+        |]
+        forM_ sheetModes $ \(shid :: SheetId, unSingle -> uploadMode :: Legacy.UploadMode, unSingle -> submissionMode :: Legacy.SheetSubmissionMode ) -> do
+          let submissionMode' = case (submissionMode, uploadMode) of
+                ( Legacy.NoSubmissions       , _                   ) -> SubmissionMode False Nothing
+                ( Legacy.CorrectorSubmissions, _                   ) -> SubmissionMode True Nothing
+                ( Legacy.UserSubmissions     , Legacy.NoUpload     ) -> SubmissionMode False (Just NoUpload)
+                ( Legacy.UserSubmissions     , Legacy.Upload True  ) -> SubmissionMode False (Just $ Upload True)
+                ( Legacy.UserSubmissions     , Legacy.Upload False ) -> SubmissionMode False (Just $ Upload False)
+          [executeQQ| UPDATE "sheet" SET "submission_mode" = #{submissionMode'} WHERE "id" = #{shid}; |]
+    )
   ]
 
 
diff --git a/src/Model/Migration/Types.hs b/src/Model/Migration/Types.hs
index 5ec81cd81..4720bf099 100644
--- a/src/Model/Migration/Types.hs
+++ b/src/Model/Migration/Types.hs
@@ -1,11 +1,17 @@
 module Model.Migration.Types where 
 
 import ClassyPrelude.Yesod
+import Data.Aeson
 import Data.Aeson.TH (deriveJSON, defaultOptions)
 
+import Utils.PathPiece
+
 import qualified Model as Current
 import qualified Model.Types.JSON as Current
 
+import Data.Universe
+
+
 data SheetType
   = Bonus  { maxPoints :: Current.Points } -- Erhöht nicht das Maximum, wird gutgeschrieben
   | Normal { maxPoints :: Current.Points } -- Erhöht das Maximum, wird gutgeschrieben
@@ -19,6 +25,40 @@ sheetType Normal {..} = Current.Normal Current.Points {..}
 sheetType Pass {..}   = Current.Normal Current.PassPoints {..}
 sheetType NotGraded   = Current.NotGraded
 
+
+data UploadMode = NoUpload | Upload { unpackZips :: Bool }
+  deriving (Show, Read, Eq, Ord, Generic)
+
+deriveJSON defaultOptions ''UploadMode
+Current.derivePersistFieldJSON ''UploadMode
+
+instance Universe UploadMode where
+  universe = NoUpload : (Upload <$> universe)
+instance Finite UploadMode
+
+instance PathPiece UploadMode where
+  toPathPiece = \case
+    NoUpload     -> "no-upload"
+    Upload True  -> "unpack"
+    Upload False -> "no-unpack"
+  fromPathPiece = finiteFromPathPiece
+
+data SheetSubmissionMode = NoSubmissions
+                         | CorrectorSubmissions
+                         | UserSubmissions
+  deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic)
+
+deriveJSON defaultOptions
+  { constructorTagModifier = camelToPathPiece
+  } ''SheetSubmissionMode
+derivePersistField "SheetSubmissionMode"
+
+instance Universe SheetSubmissionMode
+instance Finite SheetSubmissionMode
+
+nullaryPathPiece ''SheetSubmissionMode camelToPathPiece
+
+  
 {- TODO:
   * RenderMessage instance for newtype(SheetType) if needed
 -}
diff --git a/src/Model/Types.hs b/src/Model/Types.hs
index 665fe9e69..527c748f1 100644
--- a/src/Model/Types.hs
+++ b/src/Model/Types.hs
@@ -16,6 +16,7 @@ import Utils
 import Control.Lens hiding (universe)
 import Utils.Lens.TH
 
+import Data.Map ((!))
 import Data.Set (Set)
 import qualified Data.Set as Set
 import qualified Data.Map as Map
@@ -24,6 +25,7 @@ import Data.Monoid (Sum(..))
 import Data.Maybe (fromJust)
 import Data.Universe
 import Data.Universe.Helpers
+import Data.Universe.TH
 import Data.UUID.Types (UUID)
 import qualified Data.UUID.Types as UUID
 
@@ -289,12 +291,14 @@ instance DisplayAble DA where
 data UploadMode = NoUpload | Upload { unpackZips :: Bool }
   deriving (Show, Read, Eq, Ord, Generic)
 
-deriveJSON defaultOptions ''UploadMode
-derivePersistFieldJSON ''UploadMode
+deriveFinite ''UploadMode
 
-instance Universe UploadMode where
-  universe = NoUpload : (Upload <$> universe)
-instance Finite UploadMode
+deriveJSON defaultOptions
+  { constructorTagModifier = camelToPathPiece
+  , fieldLabelModifier = camelToPathPiece
+  , sumEncoding = TaggedObject "mode" "settings"
+  }''UploadMode
+derivePersistFieldJSON ''UploadMode
 
 instance PathPiece UploadMode where
   toPathPiece = \case
@@ -303,20 +307,49 @@ instance PathPiece UploadMode where
     Upload False -> "no-unpack"
   fromPathPiece = finiteFromPathPiece
 
-data SheetSubmissionMode = NoSubmissions
-                         | CorrectorSubmissions
-                         | UserSubmissions
-  deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic)
+data SubmissionMode = SubmissionMode
+  { submissionModeCorrector :: Bool
+  , submissionModeUser :: Maybe UploadMode
+  }
+  deriving (Show, Read, Eq, Ord, Generic)
+
+deriveFinite ''SubmissionMode
 
 deriveJSON defaultOptions
-  { constructorTagModifier = camelToPathPiece
-  } ''SheetSubmissionMode
-derivePersistField "SheetSubmissionMode"
+  { fieldLabelModifier = camelToPathPiece' 2
+  } ''SubmissionMode
+derivePersistFieldJSON ''SubmissionMode
 
-instance Universe SheetSubmissionMode
-instance Finite SheetSubmissionMode
+instance PathPiece SubmissionMode where
+  toPathPiece = (Map.fromList (zip universeF verbs) !)
+    where
+      verbs = [ "no-submissions"
+              , "no-upload"
+              , "no-unpack"
+              , "unpack"
+              , "correctors"
+              , "correctors+no-upload"
+              , "correctors+no-unpack"
+              , "correctors+unpack"
+              ]
+  fromPathPiece = finiteFromPathPiece
 
-nullaryPathPiece ''SheetSubmissionMode camelToPathPiece
+data SubmissionModeDescr = SubmissionModeNone
+                         | SubmissionModeCorrector
+                         | SubmissionModeUser
+                         | SubmissionModeBoth
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
+instance Universe SubmissionModeDescr
+instance Finite SubmissionModeDescr
+
+nullaryPathPiece ''SubmissionModeDescr $ camelToPathPiece' 2
+
+classifySubmissionMode :: SubmissionMode -> SubmissionModeDescr
+classifySubmissionMode (SubmissionMode False Nothing ) = SubmissionModeNone
+classifySubmissionMode (SubmissionMode True  Nothing ) = SubmissionModeCorrector
+classifySubmissionMode (SubmissionMode False (Just _)) = SubmissionModeUser
+classifySubmissionMode (SubmissionMode True  (Just _)) = SubmissionModeBoth
+  
 
 data ExamStatus = Attended | NoShow | Voided
   deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic)
diff --git a/src/Utils/Lens.hs b/src/Utils/Lens.hs
index fc5bb1738..46087e831 100644
--- a/src/Utils/Lens.hs
+++ b/src/Utils/Lens.hs
@@ -11,9 +11,6 @@ import Yesod.Core.Types (HandlerContents(..), ErrorResponse(..))
 import qualified Database.Esqueleto as E (Value(..),InnerJoin(..))
 
 
-_unValue :: Lens' (E.Value a) a
-_unValue f (E.Value a) = E.Value <$> f a
-
 _PathPiece :: PathPiece v => Prism' Text v
 _PathPiece = prism' toPathPiece fromPathPiece
 
@@ -102,6 +99,10 @@ makePrisms ''ErrorResponse
 
 makeLenses_ ''SheetCorrectorInvitation
 
+makeLenses_ ''SubmissionMode
+
+makePrisms ''E.Value
+
 
 -- makeClassy_ ''Load
 
diff --git a/templates/sheetShow.hamlet b/templates/sheetShow.hamlet
index 2cd90602b..994fbe52e 100644
--- a/templates/sheetShow.hamlet
+++ b/templates/sheetShow.hamlet
@@ -18,15 +18,15 @@ $maybe descr <- sheetDescription sheet
       <dt .deflist__dt>_{MsgSheetSolutionFrom}
       <dd .deflist__dd>#{solution}
     <dt .deflist__dt>_{MsgSheetSubmissionMode}
-    <dd .deflist__dd>_{sheetSubmissionMode sheet}
+    <dd .deflist__dd>_{classifySubmissionMode (sheetSubmissionMode sheet)}
       $case sheetSubmissionMode sheet
-        $of CorrectorSubmissions
+        $of SubmissionMode True _
           <div .tooltip>
             <div .tooltip__handle>
             <div .tooltip__content>_{MsgSheetCorrectorSubmissionsTip}
         $of _
     $case sheetSubmissionMode sheet
-      $of CorrectorSubmissions
+      $of SubmissionMode True _
         <dt .deflist__dt>_{MsgSheetPseudonym}
         <dd .deflist__dd #pseudonym>
           $maybe pseudonym <- mPseudonym
diff --git a/templates/submission.hamlet b/templates/submission.hamlet
index 913322f79..b64a9a41c 100644
--- a/templates/submission.hamlet
+++ b/templates/submission.hamlet
@@ -1,7 +1,10 @@
 $maybe cID <- mcid
   <section>
-    $case sheetUploadMode
-      $of Upload _
+    $case sheetSubmissionMode
+      $of SubmissionMode False Nothing
+        <p>
+          _{MsgSubmissionNoUploadExpected}
+      $of _
         <h2>
           <a href=@{urlArchive cID}>Archiv
           (<a href=@{urlOriginal cID}>Original</a>)
@@ -9,9 +12,6 @@ $maybe cID <- mcid
         $maybe fileTable <- mFileTable
           <h3>_{MsgSubmissionFiles}
           ^{fileTable}
-      $of _
-        <p>
-          _{MsgSubmissionNoUploadExpected}
 
     $if maySubmit && not (null lastEdits)
       <h3>_{MsgLastEdits}

From 35c182b80d2b90695de590e04bf4cf17461441a0 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 21 Apr 2019 14:02:13 +0200
Subject: [PATCH 110/238] Fix Database

---
 test/Database.hs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/Database.hs b/test/Database.hs
index 3943263db..025e7ddf0 100755
--- a/test/Database.hs
+++ b/test/Database.hs
@@ -496,8 +496,7 @@ fillDb = do
     , sheetVisibleFrom = Just now
     , sheetActiveFrom = now
     , sheetActiveTo = (14 * nominalDay) `addUTCTime` now
-    , sheetSubmissionMode = CorrectorSubmissions
-    , sheetUploadMode = Upload True
+    , sheetSubmissionMode = SubmissionMode True Nothing
     , sheetHintFrom = Nothing
     , sheetSolutionFrom = Nothing
     , sheetAutoDistribute = True

From eaf0f321b8e3b6b13fcbd0ce81995c7a7ac4156d Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 21 Apr 2019 14:09:58 +0200
Subject: [PATCH 111/238] Fix Database

---
 test/Database.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/Database.hs b/test/Database.hs
index 025e7ddf0..646539247 100755
--- a/test/Database.hs
+++ b/test/Database.hs
@@ -397,11 +397,11 @@ fillDb = do
   void . insert $ DegreeCourse ffp sdMst sdInf
   void . insert $ Lecturer jost   ffp CourseLecturer
   void . insert $ Lecturer gkleen ffp CourseAssistant
-  adhoc <- insert $ Sheet ffp "AdHoc-Gruppen" Nothing NotGraded (Arbitrary 3) Nothing Nothing now now Nothing Nothing (Upload True) UserSubmissions False
+  adhoc <- insert $ Sheet ffp "AdHoc-Gruppen" Nothing NotGraded (Arbitrary 3) Nothing Nothing now now Nothing Nothing (SubmissionMode False . Just $ Upload True) False
   insert_ $ SheetEdit gkleen now adhoc
-  feste <- insert $ Sheet ffp "Feste Gruppen" Nothing NotGraded RegisteredGroups Nothing Nothing now now Nothing Nothing (Upload True) UserSubmissions False
+  feste <- insert $ Sheet ffp "Feste Gruppen" Nothing NotGraded RegisteredGroups Nothing Nothing now now Nothing Nothing (SubmissionMode False . Just $ Upload True) False
   insert_ $ SheetEdit gkleen now feste
-  keine <- insert $ Sheet ffp "Keine Gruppen" Nothing NotGraded NoGroups Nothing Nothing now now Nothing Nothing (Upload True) UserSubmissions False
+  keine <- insert $ Sheet ffp "Keine Gruppen" Nothing NotGraded NoGroups Nothing Nothing now now Nothing Nothing (SubmissionMode False . Just $ Upload True) False
   insert_ $ SheetEdit gkleen now keine
   void . insertMany $ map (\(u,sf) -> CourseParticipant ffp u now sf)
     [(fhamann   , Nothing)

From 89bc1b7b70dab8e0851f75afecc82f504199ee9e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 21 Apr 2019 14:33:48 +0200
Subject: [PATCH 112/238] Fix Test

---
 test/Model/TypesSpec.hs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/test/Model/TypesSpec.hs b/test/Model/TypesSpec.hs
index d30237550..b042b2aa6 100644
--- a/test/Model/TypesSpec.hs
+++ b/test/Model/TypesSpec.hs
@@ -66,7 +66,11 @@ instance Arbitrary UploadMode where
   arbitrary = genericArbitrary
   shrink = genericShrink
 
-instance Arbitrary SheetSubmissionMode where
+instance Arbitrary SubmissionMode where
+  arbitrary = genericArbitrary
+  shrink = genericShrink
+
+instance Arbitrary SubmissionModeDescr where
   arbitrary = genericArbitrary
   shrink = genericShrink
 
@@ -171,8 +175,10 @@ spec = do
       [ eqLaws, showReadLaws, ordLaws, boundedEnumLaws, pathPieceLaws, finiteLaws ]
     lawsCheckHspec (Proxy @UploadMode)
       [ eqLaws, showReadLaws, ordLaws, jsonLaws, persistFieldLaws, pathPieceLaws, finiteLaws ]
-    lawsCheckHspec (Proxy @SheetSubmissionMode)
-      [ eqLaws, showReadLaws, ordLaws, boundedEnumLaws, jsonLaws, persistFieldLaws, finiteLaws, pathPieceLaws ]
+    lawsCheckHspec (Proxy @SubmissionMode)
+      [ eqLaws, showReadLaws, ordLaws, jsonLaws, persistFieldLaws, finiteLaws ]
+    lawsCheckHspec (Proxy @SubmissionModeDescr)
+      [ eqLaws, showReadLaws, ordLaws, boundedEnumLaws, finiteLaws, pathPieceLaws ]
     lawsCheckHspec (Proxy @ExamStatus)
       [ eqLaws, showReadLaws, ordLaws, boundedEnumLaws, persistFieldLaws ]
     lawsCheckHspec (Proxy @Load)

From a81bc3b340c9ea36cde43fd9f6d2e69e8e96152d Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 21 Apr 2019 16:53:27 +0200
Subject: [PATCH 113/238] Annotate widget files in dev-mode

---
 src/Settings.hs | 58 +++++++++++++++++++++++++------------------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/src/Settings.hs b/src/Settings.hs
index 47e0b25e8..9fa858fa2 100644
--- a/src/Settings.hs
+++ b/src/Settings.hs
@@ -21,12 +21,14 @@ import           Data.Aeson.TH
 import           Data.FileEmbed              (embedFile)
 import           Data.Yaml                   (decodeEither')
 import           Database.Persist.Postgresql (PostgresConf)
-import           Language.Haskell.TH.Syntax  (Exp, Name, Q)
+import           Language.Haskell.TH.Syntax  (Exp, Q, location, Loc(..))
 import           Network.Wai.Handler.Warp    (HostPreference)
 import           Yesod.Default.Config2       (applyEnvValue, configSettingsYml)
-import           Yesod.Default.Util          (WidgetFileSettings,
-                                              widgetFileNoReload,
-                                              widgetFileReload)
+#ifdef DEVELOPMENT
+import           Yesod.Default.Util          (WidgetFileSettings, widgetFileReload)
+#else
+import           Yesod.Default.Util          (WidgetFileSettings, widgetFileNoReload, widgetFileReload)
+#endif
 import qualified Yesod.Auth.Util.PasswordStore as PWStore
 
 import Data.Time (NominalDiffTime, nominalDay)
@@ -65,6 +67,9 @@ import qualified System.FilePath as FilePath
 
 import Jose.Jwt (JwtEncoding(..))
 
+import Text.Shakespeare.Text (st)
+import Text.Blaze.Html (preEscapedToHtml)
+
 
 -- | Runtime settings to configure this application. These settings can be
 -- loaded from various sources: defaults, environment variables, config files,
@@ -409,18 +414,31 @@ makeClassy_ ''AppSettings
 widgetFileSettings :: WidgetFileSettings
 widgetFileSettings = def
 
--- | How static files should be combined.
-combineSettings :: CombineSettings
-combineSettings = def
-
 -- The rest of this file contains settings which rarely need changing by a
 -- user.
 
 widgetFile :: String -> Q Exp
-widgetFile = (if appReloadTemplates compileTimeAppSettings
-                then widgetFileReload
-                else widgetFileNoReload)
-              widgetFileSettings
+#ifdef DEVELOPMENT
+widgetFile nameBase = do
+  Loc{..} <- location
+  let nameBase' = "templates" </> nameBase
+      before, after :: Text
+      before = [st|<!-- BEGIN ‘#{nameBase'}.*’ IN ‘#{loc_filename}’ #{tshow loc_start}–#{tshow loc_end} -->|]
+      after  = [st|<!-- END ‘#{nameBase'}.*’ -->|]
+  [e| do
+        toWidget $ preEscapedToHtml before
+        $(widgetFileReload widgetFileSettings nameBase)
+        toWidget $ preEscapedToHtml after
+    |]
+#else
+widgetFile nameBase = do
+  let widgetFile
+        | appReloadTemplates compileTimeAppSettings
+        = widgetFileReload widgetFileSettings
+        | otherwise
+        = widgetFileNoReload widgetFileSettings
+  [e| widgetFile nameBase |]
+#endif
 
 -- | Raw bytes at compile time of @config/settings.yml@
 configSettingsYmlBS :: ByteString
@@ -437,19 +455,3 @@ compileTimeAppSettings =
     case fromJSON $ applyEnvValue False mempty configSettingsYmlValue of
         Error e -> error e
         Success settings -> settings
-
--- The following two functions can be used to combine multiple CSS or JS files
--- at compile time to decrease the number of http requests.
--- Sample usage (inside a Widget):
---
--- > $(combineStylesheets 'StaticR [style1_css, style2_css])
-
-combineStylesheets :: Name -> [Route Static] -> Q Exp
-combineStylesheets = combineStylesheets'
-    (appSkipCombining compileTimeAppSettings)
-    combineSettings
-
-combineScripts :: Name -> [Route Static] -> Q Exp
-combineScripts = combineScripts'
-    (appSkipCombining compileTimeAppSettings)
-    combineSettings

From 1a44e45ea2be36cb64bbea96008728ef817a438f Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 21 Apr 2019 17:18:10 +0200
Subject: [PATCH 114/238] Fix build for no-dev

---
 src/Settings.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Settings.hs b/src/Settings.hs
index 9fa858fa2..a0cc9022c 100644
--- a/src/Settings.hs
+++ b/src/Settings.hs
@@ -437,7 +437,7 @@ widgetFile nameBase = do
         = widgetFileReload widgetFileSettings
         | otherwise
         = widgetFileNoReload widgetFileSettings
-  [e| widgetFile nameBase |]
+  widgetFile nameBase
 #endif
 
 -- | Raw bytes at compile time of @config/settings.yml@

From 5f70bc99518699942d47b3f730424cbb76cdf5ea Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 21 Apr 2019 17:23:18 +0200
Subject: [PATCH 115/238] Fix build for no-dev

---
 src/Settings.hs | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/Settings.hs b/src/Settings.hs
index a0cc9022c..085ec469a 100644
--- a/src/Settings.hs
+++ b/src/Settings.hs
@@ -21,13 +21,17 @@ import           Data.Aeson.TH
 import           Data.FileEmbed              (embedFile)
 import           Data.Yaml                   (decodeEither')
 import           Database.Persist.Postgresql (PostgresConf)
-import           Language.Haskell.TH.Syntax  (Exp, Q, location, Loc(..))
 import           Network.Wai.Handler.Warp    (HostPreference)
 import           Yesod.Default.Config2       (applyEnvValue, configSettingsYml)
 #ifdef DEVELOPMENT
 import           Yesod.Default.Util          (WidgetFileSettings, widgetFileReload)
+import           Language.Haskell.TH.Syntax  (Exp, Q, location, Loc(..))
+
+import Text.Shakespeare.Text (st)
+import Text.Blaze.Html (preEscapedToHtml)
 #else
 import           Yesod.Default.Util          (WidgetFileSettings, widgetFileNoReload, widgetFileReload)
+import           Language.Haskell.TH.Syntax  (Exp, Q)
 #endif
 import qualified Yesod.Auth.Util.PasswordStore as PWStore
 
@@ -67,9 +71,6 @@ import qualified System.FilePath as FilePath
 
 import Jose.Jwt (JwtEncoding(..))
 
-import Text.Shakespeare.Text (st)
-import Text.Blaze.Html (preEscapedToHtml)
-
 
 -- | Runtime settings to configure this application. These settings can be
 -- loaded from various sources: defaults, environment variables, config files,
@@ -431,13 +432,11 @@ widgetFile nameBase = do
         toWidget $ preEscapedToHtml after
     |]
 #else
-widgetFile nameBase = do
-  let widgetFile
-        | appReloadTemplates compileTimeAppSettings
-        = widgetFileReload widgetFileSettings
-        | otherwise
-        = widgetFileNoReload widgetFileSettings
-  widgetFile nameBase
+widgetFile
+  | appReloadTemplates compileTimeAppSettings
+  = widgetFileReload widgetFileSettings
+  | otherwise
+  = widgetFileNoReload widgetFileSettings
 #endif
 
 -- | Raw bytes at compile time of @config/settings.yml@

From b74de0f88df511b8d3c47890829d7a06ced8766e Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 21 Apr 2019 17:22:22 +0200
Subject: [PATCH 116/238] reintroduce explicit interactive fieldset target but
 keep it optional

---
 static/js/utils/form.js                                | 8 +++++---
 templates/widgets/aform/aform.hamlet                   | 2 +-
 templates/widgets/communication/recipientLayout.hamlet | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index 7a949c539..a68f56b9f 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -146,7 +146,7 @@
 
   var INTERACTIVE_FIELDSET_UTIL_NAME = 'interactiveFieldset';
   var INTERACTIVE_FIELDSET_UTIL_SELECTOR = '[uw-interactive-fieldset]';
-  var INTERACTIVE_FIELDSET_UTIL_TARGET_SELECTOR = '.interactive-fieldset--target';
+  var INTERACTIVE_FIELDSET_UTIL_TARGET_SELECTOR = '.interactive-fieldset__target';
 
   var INTERACTIVE_FIELDSET_INITIALIZED_CLASS = 'interactive-fieldset--initialized';
   var INTERACTIVE_FIELDSET_CHILD_SELECTOR = 'input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled])';
@@ -182,8 +182,10 @@
       }
       conditionalValue = element.dataset.conditionalValue;
 
-      // check if there is a target ancestor, otherwise target the fieldset itself
-      target = element.closest(INTERACTIVE_FIELDSET_UTIL_TARGET_SELECTOR) || element;
+      target = element.closest(INTERACTIVE_FIELDSET_UTIL_TARGET_SELECTOR);
+      if (!target || element.matches(INTERACTIVE_FIELDSET_UTIL_TARGET_SELECTOR)) {
+        target = element;
+      }
 
       childInputs = Array.from(element.querySelectorAll(INTERACTIVE_FIELDSET_CHILD_SELECTOR));
 
diff --git a/templates/widgets/aform/aform.hamlet b/templates/widgets/aform/aform.hamlet
index 91ebc2b93..460ca1ba7 100644
--- a/templates/widgets/aform/aform.hamlet
+++ b/templates/widgets/aform/aform.hamlet
@@ -11,7 +11,7 @@ $case formLayout
         <h3 .form-section-title>
           ^{fvLabel view}
       $else
-        <div .form-group :fvRequired view:.form-group--required :not $ fvRequired view:.form-group--optional :isJust $ fvErrors view:.form-group--has-error>
+        <div .form-group .interactive-fieldset__target :fvRequired view:.form-group--required :not $ fvRequired view:.form-group--optional :isJust $ fvErrors view:.form-group--has-error>
           $if not (Blaze.null $ fvLabel view)
             <label .form-group-label for=#{fvId view}>
               <span .form-group-label__caption>
diff --git a/templates/widgets/communication/recipientLayout.hamlet b/templates/widgets/communication/recipientLayout.hamlet
index 680778623..3fbdddad4 100644
--- a/templates/widgets/communication/recipientLayout.hamlet
+++ b/templates/widgets/communication/recipientLayout.hamlet
@@ -6,7 +6,7 @@ $forall category <- activeCategories
       _{category}
 
     $# TODO: only add fieldset if there are options to choose from
-    <fieldset .recipient-category__fieldset uw-interactive-fieldset data-conditional-input=#{checkedIdent category}>
+    <fieldset .recipient-category__fieldset uw-interactive-fieldset .interactive-fieldset__target data-conditional-input=#{checkedIdent category}>
       $forall optIx <- categoryIndices category
         ^{cellWdgts ! optIx}
 

From 07e8b5e203dcd6c05cbfe3a2da0176ff07a571ba Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 21 Apr 2019 17:36:52 +0200
Subject: [PATCH 117/238] Only include <fieldset> if recipient category has
 content

---
 src/Handler/Utils/Communication.hs                   |  1 +
 .../widgets/communication/recipientLayout.hamlet     | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Handler/Utils/Communication.hs b/src/Handler/Utils/Communication.hs
index 1ccf45abc..d0ebfb186 100644
--- a/src/Handler/Utils/Communication.hs
+++ b/src/Handler/Utils/Communication.hs
@@ -158,6 +158,7 @@ commR CommunicationRoute{..} =  do
             checkedIdentBase <- newIdent
             let checkedCategories = Set.mapMonotonic (unEnumPosition . fst) . Set.filter (\k' -> Map.foldrWithKey (\k (_, checkState) -> (||) $ k == k' && checkState /= FormSuccess False && (checkState /= FormMissing || maybe True snd (chosenRecipients' !? k))) False state) $ Map.keysSet state
                 checkedIdent c = checkedIdentBase <> "-" <> toPathPiece c
+                hasContent c = not (null $ categoryIndices c) || Map.member (1, (EnumPosition c, 0)) addWdgts
                 categoryIndices c = Set.filter ((== c) . unEnumPosition . fst) $ review liveCoords liveliness
             $(widgetFile "widgets/communication/recipientLayout")
           miDelete :: MapLiveliness (EnumLiveliness RecipientCategory) ListLength -> (EnumPosition RecipientCategory, ListPosition) -> MaybeT (MForm Handler) (Map (EnumPosition RecipientCategory, ListPosition) (EnumPosition RecipientCategory, ListPosition))
diff --git a/templates/widgets/communication/recipientLayout.hamlet b/templates/widgets/communication/recipientLayout.hamlet
index 3fbdddad4..c52ff534d 100644
--- a/templates/widgets/communication/recipientLayout.hamlet
+++ b/templates/widgets/communication/recipientLayout.hamlet
@@ -5,10 +5,10 @@ $forall category <- activeCategories
     <label .recipient-category__label for=#{checkedIdent category}>
       _{category}
 
-    $# TODO: only add fieldset if there are options to choose from
-    <fieldset .recipient-category__fieldset uw-interactive-fieldset .interactive-fieldset__target data-conditional-input=#{checkedIdent category}>
-      $forall optIx <- categoryIndices category
-        ^{cellWdgts ! optIx}
+    $if hasContent category
+      <fieldset .recipient-category__fieldset uw-interactive-fieldset .interactive-fieldset__target data-conditional-input=#{checkedIdent category}>
+        $forall optIx <- categoryIndices category
+          ^{cellWdgts ! optIx}
 
-      $maybe addWdgt <- addWdgts !? (1, (EnumPosition category, 0))
-        ^{addWdgt}
+        $maybe addWdgt <- addWdgts !? (1, (EnumPosition category, 0))
+          ^{addWdgt}

From 5dda5aa1bab0278e3860fd281d730d8b94eb81f9 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 21 Apr 2019 18:14:01 +0200
Subject: [PATCH 118/238] adjust spacing for mass-input-add button in course
 communication

---
 templates/widgets/communication/recipientLayout.lucius | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/templates/widgets/communication/recipientLayout.lucius b/templates/widgets/communication/recipientLayout.lucius
index c7636f072..df68114dd 100644
--- a/templates/widgets/communication/recipientLayout.lucius
+++ b/templates/widgets/communication/recipientLayout.lucius
@@ -36,5 +36,9 @@
 
 .recipient-category__option-add {
   display: flex;
-  align-items: center;
+
+  .btn-mass-input-add {
+    margin-left: 10px;
+    padding: 10px 0;
+  }
 }

From f5da46ff5a8e457c91baf222fdea99aa8a430d34 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 21 Apr 2019 21:13:17 +0200
Subject: [PATCH 119/238] wrap modals in shared modals-wrapper element

---
 static/css/utils/modal.scss | 28 ++++++++++++++++++-----
 static/js/utils/modal.js    | 45 +++++++++++++++++++++++++++++--------
 2 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/static/css/utils/modal.scss b/static/css/utils/modal.scss
index d47b8c727..2cecac941 100644
--- a/static/css/utils/modal.scss
+++ b/static/css/utils/modal.scss
@@ -1,27 +1,43 @@
-.modal {
+.modals-wrapper {
   position: fixed;
-  left: 50%;
-  top: 50%;
-  transform: translate(-50%, -50%) scale(0.8, 0.8);
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  z-index: -1;
   display: flex;
+  align-items: center;
+  justify-content: center;
+
+  &.modals-wrapper--open {
+    z-index: 200;
+    width: 100%;
+    height: 100%;
+  }
+}
+
+.modal {
+  position: relative;
+  display: none;
   background-color: rgba(255, 255, 255, 1);
   min-width: 60vw;
+  max-width: 70vw;
   min-height: 100px;
   max-height: calc(100vh - 30px);
   border-radius: 2px;
   z-index: -1;
   color: var(--color-font);
-  padding: 0 65px 0 20px;
+  padding: 0 40px;
   overflow: auto;
   overscroll-behavior: contain;
   pointer-events: none;
   opacity: 0;
 
   &.modal--open {
+    display: flex;
     opacity: 1;
     pointer-events: auto;
     z-index: 200;
-    transform: translate(-50%, -50%) scale(1, 1);
     transition:
       opacity .2s .1s ease-in-out,
       transform .3s ease-in-out;
diff --git a/static/js/utils/modal.js b/static/js/utils/modal.js
index c29feea69..99fc34f6f 100644
--- a/static/js/utils/modal.js
+++ b/static/js/utils/modal.js
@@ -37,10 +37,18 @@
 
   var MAIN_CONTENT_CLASS = 'main__content-body'
 
+  // one singleton wrapper to keep all the modals to avoid CSS bug
+  // with blurry text due to `transform: translate(-50%, -50%)`
+  // will be created (and reused) for the first modal that gets initialized
+  var MODALS_WRAPPER_CLASS = 'modals-wrapper';
+  var MODALS_WRAPPER_SELECTOR = '.' + MODALS_WRAPPER_CLASS;
+  var MODALS_WRAPPER_OPEN_CLASS = 'modals-wrapper--open';
+
   var modalUtil = function(element) {
 
-    var overlayElement = document.createElement('div');
+    var modalOverlay;
     var modalUrl;
+    var modalsWrapper;
 
     function _init() {
       if (!element) {
@@ -51,6 +59,8 @@
         return false;
       }
 
+      ensureModalWrapper();
+
       // param modalTrigger
       if (!element.dataset.modalTrigger) {
         throw new Error('Modal utility cannot be setup without a trigger element!');
@@ -63,8 +73,6 @@
         setupCloser();
       }
 
-      // setupForm();
-
       // mark as initialized and add modal class for styling
       element.classList.add(MODAL_INITIALIZED_CLASS, MODAL_CLASS);
 
@@ -75,6 +83,24 @@
       };
     }
 
+    function ensureModalWrapper() {
+      modalsWrapper = document.querySelector(MODALS_WRAPPER_SELECTOR);
+      if (!modalsWrapper) {
+        // create modal wrapper
+        modalsWrapper = document.createElement('div');
+        modalsWrapper.classList.add(MODALS_WRAPPER_CLASS);
+        document.body.appendChild(modalsWrapper);
+      }
+
+      modalOverlay = modalsWrapper.querySelector('.' + MODAL_OVERLAY_CLASS);
+      if (!modalOverlay) {
+        // create modal overlay
+        modalOverlay = document.createElement('div');
+        modalOverlay.classList.add(MODAL_OVERLAY_CLASS);
+        modalsWrapper.appendChild(modalOverlay);
+      }
+    }
+
     function setupTrigger() {
       var triggerSelector = element.dataset.modalTrigger;
       if (!triggerSelector.startsWith('#')) {
@@ -96,7 +122,7 @@
       element.insertBefore(closerElement, null);
       closerElement.classList.add(MODAL_CLOSER_CLASS);
       closerElement.addEventListener('click', onCloseClicked, false);
-      overlayElement.addEventListener('click', onCloseClicked, false);
+      modalOverlay.addEventListener('click', onCloseClicked, false);
     }
 
     function onTriggerClicked(event) {
@@ -116,11 +142,11 @@
     }
 
     function open() {
-      document.body.insertBefore(element, null);
       element.classList.add(MODAL_OPEN_CLASS);
-      overlayElement.classList.add(MODAL_OVERLAY_CLASS);
-      document.body.insertBefore(overlayElement, element);
-      overlayElement.classList.add(MODAL_OVERLAY_OPEN_CLASS);
+      modalOverlay.classList.add(MODAL_OVERLAY_OPEN_CLASS);
+      modalsWrapper.classList.add(MODALS_WRAPPER_OPEN_CLASS);
+      modalsWrapper.appendChild(element);
+      console.log({ modalsWrapper });
 
       if (modalUrl) {
         fillModal(modalUrl);
@@ -130,8 +156,9 @@
     }
 
     function close() {
-      overlayElement.classList.remove(MODAL_OVERLAY_OPEN_CLASS);
+      modalOverlay.classList.remove(MODAL_OVERLAY_OPEN_CLASS);
       element.classList.remove(MODAL_OPEN_CLASS);
+      modalsWrapper.classList.remove(MODALS_WRAPPER_OPEN_CLASS);
 
       document.removeEventListener('keyup', onKeyUp);
     };

From f61b4b581a794447bd5cc5d02dfd6da42dfd14d8 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 21 Apr 2019 21:15:13 +0200
Subject: [PATCH 120/238] remove obsolete utils.setup JS code

---
 static/js/services/utilRegistry.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/static/js/services/utilRegistry.js b/static/js/services/utilRegistry.js
index ada1f7d0f..259b828c0 100644
--- a/static/js/services/utilRegistry.js
+++ b/static/js/services/utilRegistry.js
@@ -144,12 +144,4 @@
     window.UtilRegistry.setupAll();
   });
 
-
-  // REMOVE ME. JUST HERE TO AVOID JS ERRORS
-  window.utils = {
-    setup: function(name) {
-      console.log('not really setting up', name);
-    },
-  };
-
 })();

From 594ca2f3e62ecf8d57324d5efd48a6c6315d66b7 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 21 Apr 2019 21:31:15 +0200
Subject: [PATCH 121/238] remove obsolete modal JS code

---
 static/js/utils/modal.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/static/js/utils/modal.js b/static/js/utils/modal.js
index 99fc34f6f..de6fee9d6 100644
--- a/static/js/utils/modal.js
+++ b/static/js/utils/modal.js
@@ -46,9 +46,9 @@
 
   var modalUtil = function(element) {
 
+    var modalsWrapper;
     var modalOverlay;
     var modalUrl;
-    var modalsWrapper;
 
     function _init() {
       if (!element) {
@@ -146,7 +146,6 @@
       modalOverlay.classList.add(MODAL_OVERLAY_OPEN_CLASS);
       modalsWrapper.classList.add(MODALS_WRAPPER_OPEN_CLASS);
       modalsWrapper.appendChild(element);
-      console.log({ modalsWrapper });
 
       if (modalUrl) {
         fillModal(modalUrl);

From 8db6ee8e5758f6a80840fd8f47d1d790951ad269 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 21 Apr 2019 22:13:31 +0200
Subject: [PATCH 122/238] Set uw-file-input on CorrectionsUploadR

---
 src/Handler/Corrections.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 8f1049ad7..dba8b49fc 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -699,7 +699,7 @@ getCorrectionsUploadR, postCorrectionsUploadR :: Handler Html
 getCorrectionsUploadR = postCorrectionsUploadR
 postCorrectionsUploadR = do
   ((uploadRes, upload), uploadEncoding) <- runFormPost . identifyForm FIDcorrectionsUpload . renderAForm FormStandard $
-       areq (zipFileField True) (fslI MsgCorrUploadField) Nothing
+       areq (zipFileField True) (fslI MsgCorrUploadField & addAttr "uw-file-input" "") Nothing
 
   case uploadRes of
     FormMissing -> return ()

From 374cd9621df38e3e3970ba25faf369dd9e20149a Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 21 Apr 2019 22:53:47 +0200
Subject: [PATCH 123/238] Refactor help.hamlet

---
 src/Handler/Help.hs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Handler/Help.hs b/src/Handler/Help.hs
index f79d36b92..bf33da8d5 100644
--- a/src/Handler/Help.hs
+++ b/src/Handler/Help.hs
@@ -47,7 +47,7 @@ postHelpR = do
   isModal <- hasCustomHeader HeaderIsModal
   MsgRenderer mr <- getMsgRenderer
 
-  ((res,formWidget),formEnctype) <- runFormPost $ renderAForm FormStandard $ helpForm mr mReferer mUid
+  ((res,formWidget'),formEnctype) <- runFormPost $ renderAForm FormStandard $ helpForm mr mReferer mUid
 
   formResultModal res HelpR $ \HelpForm{..} -> do
     now <- liftIO getCurrentTime
@@ -63,8 +63,9 @@ postHelpR = do
 
   defaultLayout $ do
     setTitleI MsgHelpTitle
-    wrapForm $(widgetFile "help") def
-      { formAction = Just $ SomeRoute HelpR
-      , formEncoding = formEnctype
-      , formAttrs = [ ("data-ajax-submit", "") | isModal ]
-      }
+    let formWidget = wrapForm formWidget' def
+          { formAction = Just $ SomeRoute HelpR
+          , formEncoding = formEnctype
+          , formAttrs = [ ("data-ajax-submit", "") | isModal ]
+          }
+    $(widgetFile "help")

From 423596bd261dd2b9864ad837601b128414e3865d Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 21 Apr 2019 23:05:49 +0200
Subject: [PATCH 124/238] remove section wrapper in form.hamlet

---
 templates/help.hamlet              |  5 +++--
 templates/widgets/form/form.hamlet | 33 +++++++++++++++---------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/templates/help.hamlet b/templates/help.hamlet
index 073bac477..4b09217cb 100644
--- a/templates/help.hamlet
+++ b/templates/help.hamlet
@@ -1,3 +1,4 @@
-<p>
+<section>
   _{MsgHelpIntroduction}
-^{formWidget}
+<section>
+  ^{formWidget}
diff --git a/templates/widgets/form/form.hamlet b/templates/widgets/form/form.hamlet
index 45a25b820..1046f79b5 100644
--- a/templates/widgets/form/form.hamlet
+++ b/templates/widgets/form/form.hamlet
@@ -1,19 +1,18 @@
 $newline never
 $# Wrapper for all kinds of forms
-<section>
-  <form ##{formId} method=#{decodeUtf8 (renderStdMethod formMethod)} action=#{fromMaybe "" formActionUrl} enctype=#{formEncoding} *{formAttrs}>
-    $# Distinguish different falvours of submit button layouts here:
-    $case formSubmit
-      $of FormNoSubmit
-        ^{formWidget}
-      $of FormSubmit
-        ^{formWidget}
-        ^{submitButtonView}
-      $of FormDualSubmit
-        ^{submitButtonView}
-        ^{formWidget}
-        ^{submitButtonView}
-      $of FormAutoSubmit
-        ^{formWidget}
-        <button type=submit uw-auto-submit-button>
-          ^{btnLabel BtnSubmit}
+<form ##{formId} method=#{decodeUtf8 (renderStdMethod formMethod)} action=#{fromMaybe "" formActionUrl} enctype=#{formEncoding} *{formAttrs}>
+  $# Distinguish different falvours of submit button layouts here:
+  $case formSubmit
+    $of FormNoSubmit
+      ^{formWidget}
+    $of FormSubmit
+      ^{formWidget}
+      ^{submitButtonView}
+    $of FormDualSubmit
+      ^{submitButtonView}
+      ^{formWidget}
+      ^{submitButtonView}
+    $of FormAutoSubmit
+      ^{formWidget}
+      <button type=submit uw-auto-submit-button>
+        ^{btnLabel BtnSubmit}

From 2fde26b68e0b1150e502e0db2c58e008d8cebe2c Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 21 Apr 2019 23:16:26 +0200
Subject: [PATCH 125/238] adjust headline spacing for pages without pageactions

---
 templates/default-layout.hamlet                | 17 ++++++++---------
 templates/default-layout.lucius                |  2 +-
 templates/widgets/pageaction/pageaction.lucius |  3 +++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet
index 7a679af27..701b464ce 100644
--- a/templates/default-layout.hamlet
+++ b/templates/default-layout.hamlet
@@ -15,16 +15,15 @@ $if not isModal
 
     <div .main__content-body>
 
-      <section>
-        $maybe headline <- contentHeadline
-          <h1 .headline-one>
-            <!-- $maybe back <- lastMaybe parents
-              <a .breadcrumbs__link href="@{fst back}">#{snd back}  -->
-            ^{headline}
+      $maybe headline <- contentHeadline
+        <h1 .headline-one>
+          <!-- $maybe back <- lastMaybe parents
+            <a .breadcrumbs__link href="@{fst back}">#{snd back}  -->
+          ^{headline}
 
-        $if not isModal && hasPageActions
-          <!-- page actions -->
-          ^{pageaction}
+      $if not isModal && hasPageActions
+        <!-- page actions -->
+        ^{pageaction}
 
       <!-- actual content -->
       ^{widget}
diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius
index 2dc1141d9..558ee6e0d 100644
--- a/templates/default-layout.lucius
+++ b/templates/default-layout.lucius
@@ -541,5 +541,5 @@ section {
 }
 
 .headline-one {
-  margin-bottom: 15px;
+  margin-bottom: 10px;
 }
diff --git a/templates/widgets/pageaction/pageaction.lucius b/templates/widgets/pageaction/pageaction.lucius
index 29977228d..ebdd5be78 100644
--- a/templates/widgets/pageaction/pageaction.lucius
+++ b/templates/widgets/pageaction/pageaction.lucius
@@ -1,6 +1,9 @@
 .pagenav {
   display: flex;
   align-items: flex-start;
+  padding-bottom: 15px;
+  margin-bottom: 20px;
+  border-bottom: 1px solid #eee;
 }
 
 .pagenav__list-item {

From ea38ee422f9eb7e7e42c001218c62275659727c6 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 22 Apr 2019 12:48:40 +0200
Subject: [PATCH 126/238] Basic short-circuit support for mass-input

---
 src/Handler/Utils/Form/MassInput.hs                       | 8 ++++++++
 src/Utils.hs                                              | 2 +-
 .../widgets/massinput/massinput-standalone-wrapper.hamlet | 8 ++++++++
 templates/widgets/massinput/massinput-standalone.hamlet   | 6 ++++++
 4 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 templates/widgets/massinput/massinput-standalone-wrapper.hamlet
 create mode 100644 templates/widgets/massinput/massinput-standalone.hamlet

diff --git a/src/Handler/Utils/Form/MassInput.hs b/src/Handler/Utils/Form/MassInput.hs
index b89799f9a..6cd67ccc5 100644
--- a/src/Handler/Utils/Form/MassInput.hs
+++ b/src/Handler/Utils/Form/MassInput.hs
@@ -36,6 +36,8 @@ import qualified Data.Foldable as Fold
 
 import Control.Monad.Reader.Class (MonadReader(local))
 
+import Text.Hamlet (hamletFile)
+
 
 $(mapM tupleBoxCoord [2..4])
 
@@ -409,6 +411,12 @@ massInput MassInput{..} FieldSettings{..} fvRequired initialResult csrf = do
 
   MsgRenderer mr <- getMsgRenderer
 
+  whenM (hasCustomHeader HeaderMassInputShortcircuit) . liftHandlerT $ do
+    PageContent{..} <- widgetToPageContent $(widgetFile "widgets/massinput/massinput-standalone")
+    ur <- getUrlRenderParams
+
+    sendResponse $ $(hamletFile "templates/widgets/massinput/massinput-standalone-wrapper.hamlet") ur
+
   let
     fvLabel = toHtml $ mr fsLabel
     fvTooltip = toHtml . mr <$> fsTooltip
diff --git a/src/Utils.hs b/src/Utils.hs
index 40fa580ee..4310da38d 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -645,7 +645,7 @@ takeSessionJson key = lookupSessionJson key <* deleteSession (toPathPiece key)
 -- Custom HTTP Request-Headers --
 ---------------------------------
 
-data CustomHeader = HeaderIsModal | HeaderDBTableShortcircuit
+data CustomHeader = HeaderIsModal | HeaderDBTableShortcircuit | HeaderMassInputShortcircuit
   deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic)
 
 instance Universe CustomHeader
diff --git a/templates/widgets/massinput/massinput-standalone-wrapper.hamlet b/templates/widgets/massinput/massinput-standalone-wrapper.hamlet
new file mode 100644
index 000000000..f6cfbcf2a
--- /dev/null
+++ b/templates/widgets/massinput/massinput-standalone-wrapper.hamlet
@@ -0,0 +1,8 @@
+$newline never
+$# Wrapper around massinput-standalone
+$#   pageTitle :: Html
+$#   pageHead  :: HtmlUrl url
+$#   pageBody  :: HtmlUrl url
+$#
+$# Probably only `pageBody` is relevant
+^{pageBody}
diff --git a/templates/widgets/massinput/massinput-standalone.hamlet b/templates/widgets/massinput/massinput-standalone.hamlet
new file mode 100644
index 000000000..6fef23b58
--- /dev/null
+++ b/templates/widgets/massinput/massinput-standalone.hamlet
@@ -0,0 +1,6 @@
+$newline never
+$# Version of `widgets/massinput/massinput` for when short-circuiting happens
+$# i.e. the response is only this widget wrapped in `massinput-standalone-wrapper.hamlet`
+#{csrf}
+^{shapeInput}
+^{miWidget}

From 8591306b14e22447dfd189ea9226c260056c0e3b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 22 Apr 2019 23:56:05 +0200
Subject: [PATCH 127/238] Prototype of generic invitation infrastructure

---
 messages/uniworx/de.msg                  |  10 +-
 models/invitations                       |   5 +
 package.yaml                             |   2 +
 src/Handler/Utils/Invitations.hs         | 289 +++++++++++++++++++++++
 src/Handler/Utils/Tokens.hs              |   7 +
 src/Import/NoFoundation.hs               |   1 +
 src/Jobs.hs                              |   1 +
 src/Jobs/Handler/Invitation.hs           |  14 ++
 src/Jobs/Types.hs                        |   6 +
 src/Jose/Jwt/Instances.hs                |   8 +
 src/Utils.hs                             |   6 +
 src/Utils/Form.hs                        |  13 +
 templates/widgets/invitation-site.hamlet |   4 +
 13 files changed, 365 insertions(+), 1 deletion(-)
 create mode 100644 models/invitations
 create mode 100644 src/Handler/Utils/Invitations.hs
 create mode 100644 src/Jobs/Handler/Invitation.hs
 create mode 100644 templates/widgets/invitation-site.hamlet

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index c29f933d6..8a6a194bc 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -792,4 +792,12 @@ CourseLecInviteExplanation: Sie wurden eingeladen, Verwalter für einen Kurs zu
 CorrectorInvitationAccepted shn@SheetName: Sie wurden als Korrektor für #{shn} eingetragen
 CorrectorInvitationDeclined shn@SheetName: Sie haben die Einladung, Korrektor für #{shn} zu werden, abgelehnt
 SheetCorrInviteHeading shn@SheetName: Einladung zum Korrektor für #{shn}
-SheetCorrInviteExplanation: Sie wurden eingeladen, Korrektor für ein Übungsblatt zu sein.
\ No newline at end of file
+SheetCorrInviteExplanation: Sie wurden eingeladen, Korrektor für ein Übungsblatt zu sein.
+
+InvitationAction: Aktion
+InvitationActionTip: Abgelehnte Einladungen können nicht mehr angenommen werden
+InvitationMissingRestrictions: Authorisierungs-Token fehlen benötigte Daten
+InvitationCollision: Einladung konnte nicht angenommen werden da ein derartiger Eintrag bereits existiert
+InvitationDeclined: Einladung wurde abgelehnt
+BtnInviteAccept: Einladung annehmen
+BtnInviteDecline: Einladung ablehnen
\ No newline at end of file
diff --git a/models/invitations b/models/invitations
new file mode 100644
index 000000000..c1d15148c
--- /dev/null
+++ b/models/invitations
@@ -0,0 +1,5 @@
+Invitation
+  email     UserEmail
+  for       Value
+  data      Value
+  UniqueInvitation email for
\ No newline at end of file
diff --git a/package.yaml b/package.yaml
index 47917503c..16178c5ae 100644
--- a/package.yaml
+++ b/package.yaml
@@ -172,12 +172,14 @@ default-extensions:
   - PackageImports
   - TypeApplications
   - RecursiveDo
+  - TypeFamilyDependencies
 
 ghc-options:
   - -Wall
   - -fno-warn-type-defaults
   - -fno-warn-unrecognised-pragmas
   - -fno-warn-partial-type-signatures
+  - -fno-max-relevant-binds
 
 when:
   - condition: flag(pedantic)
diff --git a/src/Handler/Utils/Invitations.hs b/src/Handler/Utils/Invitations.hs
new file mode 100644
index 000000000..480282060
--- /dev/null
+++ b/src/Handler/Utils/Invitations.hs
@@ -0,0 +1,289 @@
+{-# LANGUAGE UndecidableInstances #-}
+
+module Handler.Utils.Invitations
+  ( -- * Procedure
+    --
+    -- $procedure
+    IsInvitableJunction(..)
+  , _invitationDBData, _invitationTokenData
+  , InvitationConfig(..), InvitationTokenConfig(..)
+  , sinkInvitations, sinkInvitationsF
+  , invitationR
+  ) where
+
+import Import
+import Utils.Lens
+import Utils.Form
+import Jobs.Queue
+
+import Handler.Utils.Tokens
+
+import Text.Hamlet
+
+import Control.Monad.Trans.Reader (mapReaderT)
+
+import qualified Data.Conduit.List as C
+import qualified Data.List.NonEmpty as NonEmpty
+import qualified Data.HashSet as HashSet
+
+import Data.Aeson (fromJSON)
+import qualified Data.Aeson as JSON
+import Data.Aeson.TH
+
+
+class ( PersistRecordBackend junction (YesodPersistBackend UniWorX)
+      , ToJSON (InvitationDBData junction), ToJSON (InvitationTokenData junction)
+      , FromJSON (InvitationDBData junction), FromJSON (InvitationTokenData junction)
+      , PersistRecordBackend (InvitationFor junction) (YesodPersistBackend UniWorX)
+      ) => IsInvitableJunction junction where
+  -- | One side of the junction is always `User`; `InvitationFor junction` is the other
+  type InvitationFor       junction :: *
+  -- | `junction` without `Key User` and `Key (InvitationFor junction)`
+  data InvitableJunction   junction :: *
+  
+  -- | `InvitationData` is all data associated with an invitation except for the `UserEmail` and `InvitationFor junction`
+  --
+  -- Note that this is only the data associated with the invitation; some user input might still be required to construct `InvitableJunction junction`
+  type InvitationData      junction = (dat :: *) | dat -> junction
+  type InvitationData      junction = (InvitationDBData junction, InvitationTokenData junction)
+  -- | `InvitationDBData` is the part of `InvitationData` that is stored confidentially in the database
+  data InvitationDBData    junction :: *
+  -- | `InvitationTokenData` is the part of `InvitationData` that is stored readably within the token
+  data InvitationTokenData junction :: *
+
+  _InvitableJunction :: Iso' junction (UserId, Key (InvitationFor junction), InvitableJunction junction)
+
+  _InvitationData :: Iso' (InvitationData junction) (InvitationDBData junction, InvitationTokenData junction)
+  default _InvitationData :: InvitationData junction ~ (InvitationDBData junction, InvitationTokenData junction)
+                          => Iso' (InvitationData junction) (InvitationDBData junction, InvitationTokenData junction)
+  _InvitationData = id
+
+  -- | If `ephemeralInvitation` is not `Nothing` pending invitations are not stored in the database
+  --
+  -- In this case no invitation data can be stored in the database (@InvitationDBData junction ~ ()@)
+  ephemeralInvitation :: Maybe (AnIso' () (InvitationDBData junction))
+  ephemeralInvitation = Nothing
+
+  {-# MINIMAL _InvitableJunction #-}
+
+_invitationDBData :: IsInvitableJunction junction => Lens' (InvitationData junction) (InvitationDBData junction)
+_invitationDBData = _InvitationData . _1
+_invitationTokenData :: IsInvitableJunction junction => Lens' (InvitationData junction) (InvitationTokenData junction)
+_invitationTokenData = _InvitationData . _2
+
+
+-- | Configuration needed for creating and accepting/declining `Invitation`s
+--
+-- It is advisable to define this once per `junction` in a global constant
+data InvitationConfig junction = InvitationConfig
+  { invitationRoute       :: InvitationFor junction -> InvitationData junction -> YesodDB UniWorX (Route UniWorX)
+    -- ^ Which route calls `invitationR` for this kind of invitation?
+  , invitationResolveFor  :: YesodDB UniWorX (Key (InvitationFor junction))
+    -- ^ Monadically resolve `InvitationFor` during `inviteR`
+    --
+    -- Usually from `requireBearerToken` or `getCurrentRoute`
+  , invitationSubject     :: InvitationFor junction -> InvitationData junction -> SomeMessage UniWorX
+    -- ^ Subject of the e-mail which sends the token to the user
+  , invitationHeading     :: InvitationFor junction -> InvitationData junction -> SomeMessage UniWorX
+    -- ^ Heading of the page which allows the invitee to accept/decline the invitation (`invitationR`
+  , invitationExplanation :: InvitationFor junction -> InvitationData junction -> HtmlUrlI18n (SomeMessage UniWorX) (Route UniWorX)
+    -- ^ Explanation of what kind of invitation this is (used both in the e-mail and in `invitationR`)
+  , invitationTokenConfig :: InvitationFor junction -> InvitationData junction -> YesodDB UniWorX InvitationTokenConfig
+    -- ^ Parameters for creating the invitation token (`InvitationTokenData` is handled transparently)
+  , invitationRestriction :: InvitationFor junction -> InvitationData junction -> YesodDB UniWorX AuthResult
+    -- ^ Additional restrictions to check before allowing an user to redeem an invitation token
+  , invitationForm        :: InvitationFor junction -> InvitationData junction -> AForm (YesodDB UniWorX) (InvitableJunction junction)
+    -- ^ Assimilate the additional data entered by the redeeming user
+  , invitationSuccessMsg  :: InvitationFor junction -> Entity junction         -> YesodDB UniWorX (SomeMessage UniWorX)
+    -- ^ What to tell the redeeming user after accepting the invitation
+  , invitationUltDest     :: InvitationFor junction -> Entity junction         -> YesodDB UniWorX (SomeRoute UniWorX)
+    -- ^ Where to redirect the redeeming user after accepting the invitation
+  } deriving (Generic, Typeable)
+
+-- | Additional configuration needed for an invocation of `bearerToken`
+data InvitationTokenConfig = InvitationTokenConfig
+  { itAuthority :: UserId
+  , itAddAuth   :: Maybe AuthDNF
+  , itExpiresAt :: Maybe (Maybe UTCTime)
+  , itStartsAt  :: Maybe UTCTime
+  } deriving (Generic, Typeable)
+
+data InvitationTokenRestriction junction = IsInvitableJunction junction => InvitationTokenRestriction
+  { itEmail :: UserEmail
+  , itData  :: InvitationTokenData junction
+  }
+deriving instance Eq (InvitationTokenData junction) => Eq (InvitationTokenRestriction junction)
+deriving instance Ord (InvitationTokenData junction) => Ord (InvitationTokenRestriction junction)
+deriving instance (Read (InvitationTokenData junction), IsInvitableJunction junction) => Read (InvitationTokenRestriction junction)
+deriving instance Show (InvitationTokenData junction) => Show (InvitationTokenRestriction junction)
+
+$(return [])
+
+instance ToJSON (InvitationTokenRestriction junction) where
+  toJSON = $(mkToJSON defaultOptions{ fieldLabelModifier = camelToPathPiece' 1 } ''InvitationTokenRestriction)
+  
+instance IsInvitableJunction junction => FromJSON (InvitationTokenRestriction junction) where
+  parseJSON = $(mkParseJSON defaultOptions{ fieldLabelModifier = camelToPathPiece' 1 } ''InvitationTokenRestriction)
+
+
+sinkInvitations :: forall junction.
+                   IsInvitableJunction junction
+                => InvitationConfig junction
+                -> Sink (UserEmail, Key (InvitationFor junction), InvitationData junction) (YesodJobDB UniWorX) ()
+-- | Register invitations in the database
+--
+-- When an invitation for a certain junction (i.e. an `UserEmail`, `Key
+-- (InvitationFor junction)`-Pair) already exists it's `InvitationData` is
+-- updated, instead.
+--
+-- For new junctions an invitation is sent by e-mail.
+sinkInvitations InvitationConfig{..} = determineExists .| C.foldMap pure >>= lift . sinkInvitations'
+  where
+    determineExists :: Conduit (UserEmail, Key (InvitationFor junction), InvitationData junction)
+                               (YesodJobDB UniWorX)
+                               (Either (InvitationId, InvitationData junction) (UserEmail, Key (InvitationFor junction), InvitationData junction))
+    determineExists
+      | is _Just (ephemeralInvitation @junction)
+      = C.map Right
+      | otherwise
+      = C.mapM $ \inp@(email, fid, dat) ->
+          maybe (Right inp) (Left . (, dat)) <$> getKeyBy (UniqueInvitation email (toJSON fid))
+
+    sinkInvitations' :: [Either (InvitationId, InvitationData junction) (UserEmail, Key (InvitationFor junction), InvitationData junction)]
+                     -> YesodJobDB UniWorX ()
+    sinkInvitations' (partitionEithers -> (existing, new)) = do
+      when (is _Nothing (ephemeralInvitation @junction)) $ do
+        insertMany_ $ map (\(email, fid, dat) -> Invitation email (toJSON fid) (toJSON $ dat ^. _invitationDBData)) new
+        forM_ existing $ \(iid, dat) -> update iid [ InvitationData =. toJSON (dat ^. _invitationDBData) ]
+      forM_ new $ \(jInvitee, fid, dat) -> do
+        app <- getYesod
+        let mr = renderMessage app $ NonEmpty.toList appLanguages
+        ur <- getUrlRenderParams
+
+        fRec <- get404 fid
+        
+        jInviter <- liftHandlerT requireAuthId
+        route <- mapReaderT liftHandlerT $ invitationRoute fRec dat
+        InvitationTokenConfig{..} <- mapReaderT liftHandlerT $ invitationTokenConfig fRec dat
+        protoToken <- bearerToken itAuthority (Just . HashSet.singleton $ urlRoute route) itAddAuth itExpiresAt itStartsAt
+        let token = protoToken & tokenRestrict (urlRoute route) (InvitationTokenRestriction jInvitee $ dat ^. _invitationTokenData)
+        jwt <- encodeToken token
+        jInvitationUrl <- toTextUrl (route, [(toPathPiece GetBearer, toPathPiece jwt)])
+        let jInvitationSubject     = mr $ invitationSubject fRec dat
+            jInvitationExplanation = invitationExplanation fRec dat (toHtml . mr) ur
+
+        queueDBJob JobInvitation{..}
+
+sinkInvitationsF :: forall junction mono.
+                    ( IsInvitableJunction junction
+                    , MonoFoldable mono
+                    , Element mono ~ (UserEmail, Key (InvitationFor junction), InvitationData junction)
+                    )
+                 => InvitationConfig junction
+                 -> mono
+                 -> YesodJobDB UniWorX ()
+-- | Non-conduit version of `sinkInvitations`
+sinkInvitationsF cfg invs = runConduit $ mapM_ yield invs .| sinkInvitations cfg
+
+
+data ButtonInvite = BtnInviteAccept | BtnInviteDecline
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
+instance Universe ButtonInvite
+instance Finite ButtonInvite
+
+nullaryPathPiece ''ButtonInvite $ camelToPathPiece' 2
+embedRenderMessage ''UniWorX ''ButtonInvite id
+
+instance Button UniWorX ButtonInvite where
+  btnClasses BtnInviteAccept = [BCIsButton, BCPrimary]
+  btnClasses BtnInviteDecline = [BCIsButton, BCDanger]
+
+  btnValidate _ BtnInviteAccept  = True
+  btnValidate _ BtnInviteDecline = False
+
+invitationR :: forall junction m.
+               ( IsInvitableJunction junction
+               , MonadHandler m
+               , HandlerSite m ~ UniWorX
+               )
+            => InvitationConfig junction
+            -> m Html
+-- | Generic handler for incoming invitations
+invitationR InvitationConfig{..} = liftHandlerT $ do
+  InvitationTokenRestriction{..} <- maybeM (invalidArgsI [MsgInvitationMissingRestrictions]) return currentTokenRestrictions :: Handler (InvitationTokenRestriction junction)
+  invitee <- requireAuthId
+  Just cRoute <- getCurrentRoute
+
+  (tRoute, (dataWidget, dataEnctype), heading, explanation) <- runDB $ do
+    Entity fid fRec <- invitationResolveFor >>= (\k -> Entity k <$> get404 k)
+    dbData <- case ephemeralInvitation @junction of
+      Nothing -> do
+        Invitation{..} <- entityVal <$> getBy404 (UniqueInvitation itEmail $ toJSON fid)
+        case fromJSON invitationData of
+          JSON.Success dbData -> return dbData
+          JSON.Error   str    -> fail $ "Could not decode invitationData: " <> str
+      Just (cloneIso -> _DBData) -> return $ view _DBData ()
+    let
+      iData :: InvitationData junction
+      iData = review _InvitationData (dbData, itData)
+    guardAuthResult =<< invitationRestriction fRec iData
+    ((dataRes, dataWidget), dataEnctype) <- runFormPost . formEmbedJwtPost . renderAForm FormStandard . wFormToAForm $ do
+      dataRes <- aFormToWForm $ invitationForm fRec iData
+      btnRes <- aFormToWForm . disambiguateButtons $ combinedButtonField (BtnInviteAccept : [ BtnInviteDecline | is _Nothing $ ephemeralInvitation @junction ]) (fslI MsgInvitationAction & bool id (setTooltip MsgInvitationActionTip) (is _Nothing $ ephemeralInvitation @junction))
+      case btnRes of
+        FormSuccess BtnInviteDecline -> return $ FormSuccess Nothing
+        _other -> return $ Just <$> dataRes
+
+    MsgRenderer mr <- getMsgRenderer
+    ur <- getUrlRenderParams
+    let
+      heading = invitationHeading fRec iData
+      explanation = invitationExplanation fRec iData (toHtml . mr) ur
+
+    fmap (, (dataWidget, dataEnctype), heading, explanation) . formResultMaybe dataRes $ \case
+      Nothing -> do
+        addMessageI Info MsgInvitationDeclined
+        deleteBy . UniqueInvitation itEmail $ toJSON fid
+        return . Just $ SomeRoute HomeR
+      Just jData -> do
+        mResult <- insertUniqueEntity $ review _InvitableJunction (invitee, fid, jData)
+        case mResult of
+          Nothing -> invalidArgsI [MsgInvitationCollision]
+          Just res -> do
+            addMessageI Success =<< invitationSuccessMsg fRec res
+            Just <$> invitationUltDest fRec res
+
+  whenIsJust tRoute redirect
+
+  let formWidget = wrapForm dataWidget def
+        { formMethod   = POST
+        , formAction   = Just $ SomeRoute cRoute
+        , formEncoding = dataEnctype
+        , formSubmit   = FormNoSubmit
+        }
+
+  siteLayoutMsg heading $(widgetFile "widgets/invitation-site")
+
+
+-- $procedure
+--
+-- `Invitation`s encode a pending entry of some junction table between some
+-- record and `User` e.g.
+--
+-- > data SheetCorrector = SheetCorrector
+-- >   { sheetCorrectorUser  :: UserId
+-- >   , sheetCorrectorSheet :: SheetId
+-- >   , sheetCorrectorLoad  :: Load
+-- >   }
+--
+-- We split the record, encoding a line in the junction table, into a `(UserId,
+-- InvitationData)`-Pair, storing only part of the `InvitationData` in a
+-- separate table (what we don't store in that table gets encoded into a
+-- `BearerToken`).
+--
+-- After a User, authorized by said token, supplies their `UserId` the record is
+-- completed and `insert`ed into the database.
+--
+-- We also make provisions for storing one side of the junction's `Key`s
+-- (`InvitationFor`) separately from the rest of the `InvitationData` to make
+-- querying for pending invitations easier.
diff --git a/src/Handler/Utils/Tokens.hs b/src/Handler/Utils/Tokens.hs
index e95b16a69..8ca5ad400 100644
--- a/src/Handler/Utils/Tokens.hs
+++ b/src/Handler/Utils/Tokens.hs
@@ -1,5 +1,6 @@
 module Handler.Utils.Tokens
   ( maybeBearerToken, requireBearerToken
+  , currentTokenRestrictions
   ) where
 
 import Import
@@ -25,3 +26,9 @@ requireBearerToken = liftHandlerT $ do
   isWrite <- isWriteRequest currentRoute
   guardAuthResult <=< runDB $ validateToken mAuthId currentRoute isWrite token
   return token
+
+currentTokenRestrictions :: (MonadHandler m, HandlerSite m ~ UniWorX, MonadCatch m, FromJSON a, ToJSON a) => m (Maybe a)
+currentTokenRestrictions = runMaybeT $ do
+  token <- MaybeT maybeBearerToken
+  route <- MaybeT getCurrentRoute
+  hoistMaybe $ preview (_tokenRestrictionIx route) token
diff --git a/src/Import/NoFoundation.hs b/src/Import/NoFoundation.hs
index 51de48a1e..f43f2d864 100644
--- a/src/Import/NoFoundation.hs
+++ b/src/Import/NoFoundation.hs
@@ -84,6 +84,7 @@ import Control.Monad.Random.Class as Import (MonadRandom(..))
 
 import Text.Blaze.Instances as Import ()
 import Jose.Jwt.Instances as Import ()
+import Jose.Jwt as Import (Jwt)
 import Web.PathPieces.Instances as Import ()
 
 
diff --git a/src/Jobs.hs b/src/Jobs.hs
index c935c79af..b44642d15 100644
--- a/src/Jobs.hs
+++ b/src/Jobs.hs
@@ -62,6 +62,7 @@ import Jobs.Handler.DistributeCorrections
 import Jobs.Handler.SendCourseCommunication
 import Jobs.Handler.LecturerInvitation
 import Jobs.Handler.CorrectorInvitation
+import Jobs.Handler.Invitation
 
   
 data JobQueueException = JInvalid QueuedJobId QueuedJob
diff --git a/src/Jobs/Handler/Invitation.hs b/src/Jobs/Handler/Invitation.hs
new file mode 100644
index 000000000..f9c93828f
--- /dev/null
+++ b/src/Jobs/Handler/Invitation.hs
@@ -0,0 +1,14 @@
+module Jobs.Handler.Invitation
+  ( dispatchJobInvitation
+  ) where
+
+import Import
+
+
+dispatchJobInvitation :: UserId
+                      -> UserEmail
+                      -> Text
+                      -> Text
+                      -> Html
+                      -> Handler ()
+dispatchJobInvitation = error "dispatchJobInvitation"
diff --git a/src/Jobs/Types.hs b/src/Jobs/Types.hs
index fc399d6a5..4dcf0de35 100644
--- a/src/Jobs/Types.hs
+++ b/src/Jobs/Types.hs
@@ -37,6 +37,12 @@ data Job = JobSendNotification { jRecipient :: UserId, jNotification :: Notifica
          | JobCorrectorInvitation { jInviter :: UserId
                                   , jCorrectorInvitation :: SheetCorrectorInvitation
                                   }
+         | JobInvitation { jInviter :: UserId
+                         , jInvitee :: UserEmail
+                         , jInvitationUrl :: Text
+                         , jInvitationSubject :: Text
+                         , jInvitationExplanation :: Html
+                         }
   deriving (Eq, Ord, Show, Read, Generic, Typeable)
 data Notification = NotificationSubmissionRated { nSubmission :: SubmissionId }
                   | NotificationSheetActive { nSheet :: SheetId }
diff --git a/src/Jose/Jwt/Instances.hs b/src/Jose/Jwt/Instances.hs
index 4bf4e3827..0c0c093ef 100644
--- a/src/Jose/Jwt/Instances.hs
+++ b/src/Jose/Jwt/Instances.hs
@@ -9,10 +9,18 @@ import ClassyPrelude.Yesod
 import Jose.Jwt
 
 
+deriving instance Ord Jwt
+deriving instance Read Jwt
+deriving instance Generic Jwt
+deriving instance Typeable Jwt
+
 instance PathPiece Jwt where
   toPathPiece (Jwt bytes) = decodeUtf8 bytes
   fromPathPiece = Just . Jwt . encodeUtf8
 
+instance Hashable Jwt
+
+
 deriving instance Generic JwtError
 deriving instance Typeable JwtError
 
diff --git a/src/Utils.hs b/src/Utils.hs
index 40fa580ee..a5939a40b 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -462,6 +462,12 @@ formResultToMaybe :: Alternative m => FormResult a -> m a
 formResultToMaybe (FormSuccess x) = pure x
 formResultToMaybe  _              = empty
 
+maybeThrow :: (MonadThrow m, Exception e) => e -> Maybe a -> m a
+maybeThrow exc = maybe (throwM exc) return
+
+maybeThrowM :: (MonadThrow m, Exception e) => m e -> Maybe a -> m a
+maybeThrowM excM = maybe (throwM =<< excM) return
+
 ------------
 -- Either --
 ------------
diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index 25180df04..ec9fc2d86 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -23,6 +23,7 @@ import qualified Data.Set as Set
 import Control.Monad.Trans.Maybe (MaybeT(..))
 import Control.Monad.Reader.Class (MonadReader(..))
 import Control.Monad.Writer.Class (MonadWriter(..))
+import Control.Monad.Trans.RWS (mapRWST)
 
 import Data.List ((!!))
 
@@ -614,6 +615,18 @@ prismAForm p outer form = review p <$> form inner
   where
     inner = outer >>= preview p
 
+-----------------------
+-- Form Manipulation --
+-----------------------
+
+aFormToWForm :: MonadHandler m => AForm m a -> WForm m (FormResult a)
+aFormToWForm = mapRWST mFormToWForm' . over (mapped . _2) ($ []) . aFormToForm
+  where
+    mFormToWForm' f = do
+      ((a, vs), ints, enctype) <- lift f
+      writer ((a, ints, enctype), vs)
+
+
 ---------------------------------------------
 -- Special variants of @mopt@, @mreq@, ... --
 ---------------------------------------------
diff --git a/templates/widgets/invitation-site.hamlet b/templates/widgets/invitation-site.hamlet
new file mode 100644
index 000000000..064e92184
--- /dev/null
+++ b/templates/widgets/invitation-site.hamlet
@@ -0,0 +1,4 @@
+<section>
+  #{explanation}
+<section>
+  ^{formWidget}

From 7f6d30c0d6095d7a5f8684d80f2b4f4160af1f7c Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 23 Apr 2019 00:03:41 +0200
Subject: [PATCH 128/238] Invitation e-mails

---
 src/Jobs/Handler/Invitation.hs   | 15 ++++++++++++++-
 templates/mail/invitation.hamlet | 11 +++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 templates/mail/invitation.hamlet

diff --git a/src/Jobs/Handler/Invitation.hs b/src/Jobs/Handler/Invitation.hs
index f9c93828f..f86256f33 100644
--- a/src/Jobs/Handler/Invitation.hs
+++ b/src/Jobs/Handler/Invitation.hs
@@ -3,6 +3,11 @@ module Jobs.Handler.Invitation
   ) where
 
 import Import
+import Utils.Lens
+import Handler.Utils.Mail
+
+import qualified Data.CaseInsensitive as CI
+import Text.Hamlet
 
 
 dispatchJobInvitation :: UserId
@@ -11,4 +16,12 @@ dispatchJobInvitation :: UserId
                       -> Text
                       -> Html
                       -> Handler ()
-dispatchJobInvitation = error "dispatchJobInvitation"
+dispatchJobInvitation jInviter jInvitee jInvitationUrl jInvitationSubject jInvitationExplanation = do
+  mInviter <- runDB $ get jInviter
+
+  whenIsJust mInviter $ \jInviter' -> mailT def $ do
+    _mailTo .= [Address Nothing $ CI.original jInvitee]
+    replaceMailHeader "Reply-To" . Just . renderAddress $ userAddress jInviter'
+    replaceMailHeader "Auto-Submitted" $ Just "auto-generated"
+    replaceMailHeader "Subject" $ Just jInvitationSubject
+    addPart ($(ihamletFile "templates/mail/invitation.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX))
diff --git a/templates/mail/invitation.hamlet b/templates/mail/invitation.hamlet
new file mode 100644
index 000000000..ef3b004e5
--- /dev/null
+++ b/templates/mail/invitation.hamlet
@@ -0,0 +1,11 @@
+$newline never
+\<!doctype html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+  <body>
+    <p>
+      #{jInvitationExplanation}
+    <p>
+      <a href=#{jInvitationUrl}>
+        _{MsgInvitationAcceptDecline}

From 5bc0254f7f757dd73dba51e81586aa20aa4da69c Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 23 Apr 2019 01:22:36 +0200
Subject: [PATCH 129/238] Implement lecturer invitations with new system

---
 messages/uniworx/de.msg                |   4 +-
 routes                                 |   2 +-
 src/Handler/Course.hs                  | 142 +++++++++++++------------
 src/Handler/Utils/Invitations.hs       |  72 ++++++++++---
 src/Jobs.hs                            |   1 -
 src/Jobs/Handler/LecturerInvitation.hs |  41 -------
 src/Jobs/Types.hs                      |   3 -
 templates/courseLecInvite.hamlet       |   3 -
 8 files changed, 139 insertions(+), 129 deletions(-)
 delete mode 100644 src/Jobs/Handler/LecturerInvitation.hs
 delete mode 100644 templates/courseLecInvite.hamlet

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 8a6a194bc..509bb2120 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -800,4 +800,6 @@ InvitationMissingRestrictions: Authorisierungs-Token fehlen benötigte Daten
 InvitationCollision: Einladung konnte nicht angenommen werden da ein derartiger Eintrag bereits existiert
 InvitationDeclined: Einladung wurde abgelehnt
 BtnInviteAccept: Einladung annehmen
-BtnInviteDecline: Einladung ablehnen
\ No newline at end of file
+BtnInviteDecline: Einladung ablehnen
+
+LecturerType: Rolle
\ No newline at end of file
diff --git a/routes b/routes
index 0e801e22b..c9af2ca13 100644
--- a/routes
+++ b/routes
@@ -76,7 +76,7 @@
   /                           CShowR          GET             !free
   /register                   CRegisterR          POST        !timeANDcapacity
   /edit                       CEditR          GET POST
-  /lecturer-invite/#UserEmail CLecInviteR     GET POST
+  /lecturer-invite            CLecInviteR     GET POST
   /delete                     CDeleteR        GET POST        !lecturerANDempty
   /users                      CUsersR         GET POST
   /users/#CryptoUUIDUser      CUserR          GET POST        !lecturerANDparticipant
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 5697b7bd4..3cc623819 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -15,6 +15,7 @@ import Handler.Utils.Delete
 import Handler.Utils.Database
 import Handler.Utils.Table.Cells
 import Handler.Utils.Table.Columns
+import Handler.Utils.Invitations
 import Database.Persist.Sql (deleteWhereCount)
 import qualified Database.Esqueleto.Utils as E
 import Database.Esqueleto.Utils.TH
@@ -37,6 +38,11 @@ import Text.Blaze.Html.Renderer.Text (renderHtml)
 
 import Jobs.Queue
 
+import Data.Aeson hiding (Result(..))
+
+import Text.Hamlet (ihamlet)
+  
+
 -- NOTE: Outdated way to use dbTable; see ProfileDataR Handler for a more recent method.
 type CourseTableData = DBRow (Entity Course, Int, Bool, Entity School)
 
@@ -500,12 +506,10 @@ courseEditHandler miButtonAction mbCourseForm = do
               , courseDeregisterUntil = cfDeRegUntil res
               }
             whenIsJust insertOkay $ \cid -> do
-                forM_ (cfLecturers res) $ \case
-                  Right (lid, lty) -> insert_  $ Lecturer lid cid lty
-                  Left (lEmail, mLTy) -> do
-                    insert_ $ LecturerInvitation lEmail cid mLTy
-                    queueDBJob . JobLecturerInvitation aid $ LecturerInvitation lEmail cid mLTy
-                insert_ $ CourseEdit aid now cid
+              let (invites, adds) = partitionEithers $ cfLecturers res
+              insertMany_ $ map (\(lid, lty) -> Lecturer lid cid lty) adds
+              sinkInvitationsF lecturerInvitationConfig $ map (\(lEmail, mLty) -> (lEmail, cid, (InvDBDataLecturer mLty, InvTokenDataLecturer))) invites
+              insert_ $ CourseEdit aid now cid
             return insertOkay
           case insertOkay of
             Just _ -> do
@@ -545,16 +549,11 @@ courseEditHandler miButtonAction mbCourseForm = do
                   (Just _) -> addMessageI Warning (MsgCourseEditDupShort tid ssh csh) $> False
                   Nothing  -> do
                     deleteWhere [LecturerCourse ==. cid]
-                    deleteWhere [LecturerInvitationCourse ==. cid, LecturerInvitationEmail /<-. toListOf (folded . _Left . _1) (cfLecturers res)]
-                    forM_ (cfLecturers res) $ \case
-                      Right (lid, lty) -> insert_  $ Lecturer lid cid lty
-                      Left (lEmail, mLTy) -> do
-                        insertRes <- insertUnique (LecturerInvitation lEmail cid mLTy)
-                        case insertRes of
-                          Just _  ->
-                            queueDBJob . JobLecturerInvitation aid $ LecturerInvitation lEmail cid mLTy
-                          Nothing -> 
-                            updateBy (UniqueLecturerInvitation lEmail cid) [ LecturerInvitationType =. mLTy ]
+                    deleteWhere [InvitationFor ==. invRef @Lecturer cid, InvitationEmail /<-. toListOf (folded . _Left . _1) (cfLecturers res)]
+                    let (invites, adds) = partitionEithers $ cfLecturers res
+                    insertMany_ $ map (\(lid, lty) -> Lecturer lid cid lty) adds
+                    sinkInvitationsF lecturerInvitationConfig $ map (\(lEmail, mLty) -> (lEmail, cid, (InvDBDataLecturer mLty, InvTokenDataLecturer))) invites
+
                     insert_ $ CourseEdit aid now cid
                     addMessageI Success $ MsgCourseEditOk tid ssh csh
                     return True
@@ -568,6 +567,65 @@ courseEditHandler miButtonAction mbCourseForm = do
         }
 
 
+instance IsInvitableJunction Lecturer where
+  type InvitationFor Lecturer = Course
+  data InvitableJunction Lecturer = JunctionLecturer
+    { jLecturerType :: LecturerType
+    } deriving (Eq, Ord, Read, Show, Generic, Typeable)
+  data InvitationDBData Lecturer = InvDBDataLecturer
+    { invDBLecturerType :: Maybe LecturerType
+    } deriving (Eq, Ord, Read, Show, Generic, Typeable)
+  data InvitationTokenData Lecturer = InvTokenDataLecturer
+    deriving (Eq, Ord, Read, Show, Generic, Typeable)
+
+  _InvitableJunction = iso
+    (\Lecturer{..} -> (lecturerUser, lecturerCourse, JunctionLecturer lecturerType))
+    (\(lecturerUser, lecturerCourse, JunctionLecturer lecturerType) -> Lecturer{..})
+
+instance ToJSON (InvitableJunction Lecturer) where
+  toJSON = genericToJSON defaultOptions { fieldLabelModifier = camelToPathPiece' 1 }
+  toEncoding = genericToEncoding defaultOptions { fieldLabelModifier = camelToPathPiece' 1 }
+instance FromJSON (InvitableJunction Lecturer) where
+  parseJSON = genericParseJSON defaultOptions { fieldLabelModifier = camelToPathPiece' 1 }
+
+instance ToJSON (InvitationDBData Lecturer) where
+  toJSON = genericToJSON defaultOptions { fieldLabelModifier = camelToPathPiece' 3 }
+  toEncoding = genericToEncoding defaultOptions { fieldLabelModifier = camelToPathPiece' 3 }
+instance FromJSON (InvitationDBData Lecturer) where
+  parseJSON = genericParseJSON defaultOptions { fieldLabelModifier = camelToPathPiece' 3 }
+
+instance ToJSON (InvitationTokenData Lecturer) where
+  toJSON = genericToJSON defaultOptions { constructorTagModifier = camelToPathPiece' 3 }
+  toEncoding = genericToEncoding defaultOptions { fieldLabelModifier = camelToPathPiece' 3 }
+instance FromJSON (InvitationTokenData Lecturer) where
+  parseJSON = genericParseJSON defaultOptions { constructorTagModifier = camelToPathPiece' 3 }
+
+lecturerInvitationConfig :: InvitationConfig Lecturer
+lecturerInvitationConfig = InvitationConfig{..}
+  where
+    invitationRoute Course{..} _ = return . CourseR courseTerm courseSchool courseShorthand $ CLecInviteR
+    invitationResolveFor = do
+      Just (CourseR tid csh ssh CLecInviteR) <- getCurrentRoute
+      getKeyBy404 $ TermSchoolCourseShort tid csh ssh
+    invitationSubject Course{..} _ = SomeMessage $ MsgMailSubjectLecturerInvitation courseTerm courseSchool courseShorthand
+    invitationHeading Course{..} _ = SomeMessage $ MsgCourseLecInviteHeading $ CI.original courseName
+    invitationExplanation _ _ = [ihamlet|_{SomeMessage MsgCourseLecInviteExplanation}|]
+    invitationTokenConfig _ _ = do
+      itAuthority <- liftHandlerT requireAuthId
+      return $ InvitationTokenConfig itAuthority Nothing Nothing Nothing
+    invitationRestriction _ _ = return Authorized
+    invitationForm _ (InvDBDataLecturer mlType, _) = hoistAForm liftHandlerT $ toJunction <$> case mlType of
+      Nothing    -> areq    (selectField optionsFinite) lFs Nothing
+      Just lType -> aforced (selectField optionsFinite) lFs lType
+      where
+        toJunction jLecturerType = JunctionLecturer{..}
+        lFs = fslI MsgLecturerType & setTooltip MsgCourseLecturerRightsIdentical
+    invitationSuccessMsg Course{..} (Entity _ Lecturer{..}) = do
+      MsgRenderer mr <- getMsgRenderer
+      return . SomeMessage $ MsgLecturerInvitationAccepted (mr lecturerType) courseShorthand
+    invitationUltDest Course{..} _ = return . SomeRoute $ CourseR courseTerm courseSchool courseShorthand CShowR
+
+
 data CourseForm = CourseForm
         { cfCourseId   :: Maybe CourseId
         , cfName       :: CourseName
@@ -1131,54 +1189,6 @@ postCCommR tid ssh csh = do
     }
 
  
-data ButtonLecInvite = BtnLecInvAccept | BtnLecInvDecline
-  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
-instance Universe ButtonLecInvite
-instance Finite ButtonLecInvite
-
-nullaryPathPiece ''ButtonLecInvite $ camelToPathPiece' 3
-embedRenderMessage ''UniWorX ''ButtonLecInvite id
-
-instance Button UniWorX ButtonLecInvite where
-  btnClasses BtnLecInvAccept = [BCIsButton, BCPrimary]
-  btnClasses BtnLecInvDecline = [BCIsButton, BCDanger]
-
-getCLecInviteR, postCLecInviteR :: TermId -> SchoolId -> CourseShorthand -> UserEmail -> Handler Html
+getCLecInviteR, postCLecInviteR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getCLecInviteR = postCLecInviteR
-postCLecInviteR tid ssh csh email = do
-  uid <- requireAuthId
-  (Entity cid Course{..}, Entity liId LecturerInvitation{..}) <- runDB $ do
-    cRes@(Entity cid _) <- getBy404 $ TermSchoolCourseShort tid ssh csh
-    iRes <- getBy404 $ UniqueLecturerInvitation email cid
-    return (cRes, iRes)
-
-  ((btnResult, btnInnerWidget), btnEncoding) <- runFormPost . formEmbedJwtPost $ \csrf -> do
-    (ltRes, ltView) <- case lecturerInvitationType of
-      Nothing -> mreq (selectField optionsFinite) "" Nothing
-      Just lType -> mforced (selectField optionsFinite) "" lType
-    (btnRes, btnWdgt) <- buttonForm mempty
-    return ((,) <$> ltRes <*> btnRes, toWidget csrf <> fvInput ltView <> btnWdgt)
-
-  let btnWidget = wrapForm btnInnerWidget def
-        { formEncoding = btnEncoding
-        , formAction = Just . SomeRoute . CourseR tid ssh csh $ CLecInviteR email
-        , formSubmit = FormNoSubmit
-        }
-
-  formResult btnResult $ \case
-    (lType, BtnLecInvAccept) -> do
-      runDB $ do
-        delete liId
-        insert_ $ Lecturer uid cid lType
-      MsgRenderer mr <- getMsgRenderer
-      addMessageI Success $ MsgLecturerInvitationAccepted (mr lType) csh
-      redirect $ CourseR tid ssh csh CShowR
-    (_, BtnLecInvDecline) -> do
-      runDB $
-        delete liId
-      addMessageI Info $ MsgLecturerInvitationDeclined csh
-      redirect HomeR
-
-  siteLayoutMsg (MsgCourseLecInviteHeading $ CI.original courseName) $ do
-    setTitleI . MsgCourseLecInviteHeading $ CI.original courseName
-    $(widgetFile "courseLecInvite")
+postCLecInviteR = invitationR lecturerInvitationConfig
diff --git a/src/Handler/Utils/Invitations.hs b/src/Handler/Utils/Invitations.hs
index 480282060..257881ea1 100644
--- a/src/Handler/Utils/Invitations.hs
+++ b/src/Handler/Utils/Invitations.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE AllowAmbiguousTypes #-}
 
 module Handler.Utils.Invitations
   ( -- * Procedure
@@ -6,9 +7,10 @@ module Handler.Utils.Invitations
     -- $procedure
     IsInvitableJunction(..)
   , _invitationDBData, _invitationTokenData
+  , InvitationReference(..), invRef
   , InvitationConfig(..), InvitationTokenConfig(..)
   , sinkInvitations, sinkInvitationsF
-  , invitationR
+  , invitationR', InvitationR(..)
   ) where
 
 import Import
@@ -30,11 +32,15 @@ import Data.Aeson (fromJSON)
 import qualified Data.Aeson as JSON
 import Data.Aeson.TH
 
+import Data.Proxy (Proxy(..))
+import Data.Typeable
+
 
 class ( PersistRecordBackend junction (YesodPersistBackend UniWorX)
       , ToJSON (InvitationDBData junction), ToJSON (InvitationTokenData junction)
       , FromJSON (InvitationDBData junction), FromJSON (InvitationTokenData junction)
       , PersistRecordBackend (InvitationFor junction) (YesodPersistBackend UniWorX)
+      , Typeable junction
       ) => IsInvitableJunction junction where
   -- | One side of the junction is always `User`; `InvitationFor junction` is the other
   type InvitationFor       junction :: *
@@ -72,6 +78,32 @@ _invitationTokenData :: IsInvitableJunction junction => Lens' (InvitationData ju
 _invitationTokenData = _InvitationData . _2
 
 
+data InvitationReference junction = IsInvitableJunction junction => InvRef (Key (InvitationFor junction))
+
+deriving instance Eq (InvitationReference junction)
+deriving instance Ord (InvitationReference junction)
+deriving instance IsInvitableJunction junction => Read (InvitationReference junction)
+deriving instance Show (InvitationReference junction)
+
+instance ToJSON (InvitationReference junction) where
+  toJSON (InvRef fId) = JSON.object
+    [ "type" JSON..= show (typeRep (Proxy @junction))
+    , "key"  JSON..= fId
+    ]
+instance IsInvitableJunction junction => FromJSON (InvitationReference junction) where
+  parseJSON = JSON.withObject "InvitationReference" $ \o -> do
+    table <- o JSON..: "type"
+    key   <- o JSON..: "key"
+
+    unless (table == show (typeRep (Proxy @junction))) $
+      fail "Unexpected table"
+
+    return $ InvRef key
+
+invRef :: forall junction. IsInvitableJunction junction => Key (InvitationFor junction) -> JSON.Value
+invRef = toJSON . InvRef @junction
+
+
 -- | Configuration needed for creating and accepting/declining `Invitation`s
 --
 -- It is advisable to define this once per `junction` in a global constant
@@ -147,13 +179,13 @@ sinkInvitations InvitationConfig{..} = determineExists .| C.foldMap pure >>= lif
       = C.map Right
       | otherwise
       = C.mapM $ \inp@(email, fid, dat) ->
-          maybe (Right inp) (Left . (, dat)) <$> getKeyBy (UniqueInvitation email (toJSON fid))
+          maybe (Right inp) (Left . (, dat)) <$> getKeyBy (UniqueInvitation email (toJSON $ InvRef @junction fid))
 
     sinkInvitations' :: [Either (InvitationId, InvitationData junction) (UserEmail, Key (InvitationFor junction), InvitationData junction)]
                      -> YesodJobDB UniWorX ()
     sinkInvitations' (partitionEithers -> (existing, new)) = do
       when (is _Nothing (ephemeralInvitation @junction)) $ do
-        insertMany_ $ map (\(email, fid, dat) -> Invitation email (toJSON fid) (toJSON $ dat ^. _invitationDBData)) new
+        insertMany_ $ map (\(email, fid, dat) -> Invitation email (toJSON $ InvRef @junction fid) (toJSON $ dat ^. _invitationDBData)) new
         forM_ existing $ \(iid, dat) -> update iid [ InvitationData =. toJSON (dat ^. _invitationDBData) ]
       forM_ new $ \(jInvitee, fid, dat) -> do
         app <- getYesod
@@ -201,15 +233,15 @@ instance Button UniWorX ButtonInvite where
   btnValidate _ BtnInviteAccept  = True
   btnValidate _ BtnInviteDecline = False
 
-invitationR :: forall junction m.
-               ( IsInvitableJunction junction
-               , MonadHandler m
-               , HandlerSite m ~ UniWorX
-               )
-            => InvitationConfig junction
-            -> m Html
+invitationR' :: forall junction m.
+                ( IsInvitableJunction junction
+                , MonadHandler m
+                , HandlerSite m ~ UniWorX
+                )
+             => InvitationConfig junction
+             -> m Html
 -- | Generic handler for incoming invitations
-invitationR InvitationConfig{..} = liftHandlerT $ do
+invitationR' InvitationConfig{..} = liftHandlerT $ do
   InvitationTokenRestriction{..} <- maybeM (invalidArgsI [MsgInvitationMissingRestrictions]) return currentTokenRestrictions :: Handler (InvitationTokenRestriction junction)
   invitee <- requireAuthId
   Just cRoute <- getCurrentRoute
@@ -218,7 +250,7 @@ invitationR InvitationConfig{..} = liftHandlerT $ do
     Entity fid fRec <- invitationResolveFor >>= (\k -> Entity k <$> get404 k)
     dbData <- case ephemeralInvitation @junction of
       Nothing -> do
-        Invitation{..} <- entityVal <$> getBy404 (UniqueInvitation itEmail $ toJSON fid)
+        Invitation{..} <- entityVal <$> getBy404 (UniqueInvitation itEmail . toJSON $ InvRef @junction fid)
         case fromJSON invitationData of
           JSON.Success dbData -> return dbData
           JSON.Error   str    -> fail $ "Could not decode invitationData: " <> str
@@ -243,7 +275,7 @@ invitationR InvitationConfig{..} = liftHandlerT $ do
     fmap (, (dataWidget, dataEnctype), heading, explanation) . formResultMaybe dataRes $ \case
       Nothing -> do
         addMessageI Info MsgInvitationDeclined
-        deleteBy . UniqueInvitation itEmail $ toJSON fid
+        deleteBy . UniqueInvitation itEmail . toJSON $ InvRef @junction fid
         return . Just $ SomeRoute HomeR
       Just jData -> do
         mResult <- insertUniqueEntity $ review _InvitableJunction (invitee, fid, jData)
@@ -265,6 +297,20 @@ invitationR InvitationConfig{..} = liftHandlerT $ do
   siteLayoutMsg heading $(widgetFile "widgets/invitation-site")
 
 
+class InvitationR a where
+  invitationR :: forall junction.
+                ( IsInvitableJunction junction
+                )
+              => InvitationConfig junction
+              -> a
+
+instance InvitationR (Handler Html) where
+  invitationR = invitationR'
+
+instance InvitationR b => InvitationR (a -> b) where
+  invitationR cfg _ = invitationR cfg
+  
+
 -- $procedure
 --
 -- `Invitation`s encode a pending entry of some junction table between some
diff --git a/src/Jobs.hs b/src/Jobs.hs
index b44642d15..13696ec82 100644
--- a/src/Jobs.hs
+++ b/src/Jobs.hs
@@ -60,7 +60,6 @@ import Jobs.Handler.HelpRequest
 import Jobs.Handler.SetLogSettings
 import Jobs.Handler.DistributeCorrections
 import Jobs.Handler.SendCourseCommunication
-import Jobs.Handler.LecturerInvitation
 import Jobs.Handler.CorrectorInvitation
 import Jobs.Handler.Invitation
 
diff --git a/src/Jobs/Handler/LecturerInvitation.hs b/src/Jobs/Handler/LecturerInvitation.hs
deleted file mode 100644
index e3fd03a6d..000000000
--- a/src/Jobs/Handler/LecturerInvitation.hs
+++ /dev/null
@@ -1,41 +0,0 @@
-module Jobs.Handler.LecturerInvitation
-  ( dispatchJobLecturerInvitation
-  ) where
-
-import Import
-
-import Text.Hamlet
-
-import qualified Data.HashSet as HashSet
-
-import qualified Data.CaseInsensitive as CI
-
-import Utils.Lens
-
-
-dispatchJobLecturerInvitation :: UserId -> LecturerInvitation -> Handler ()
-dispatchJobLecturerInvitation jInviter jLecturerInvitation@LecturerInvitation{..} = do
-  ctx <- runDB . runMaybeT $ do
-    course <- MaybeT $ get lecturerInvitationCourse
-    void . MaybeT $ getByValue jLecturerInvitation
-    user <- MaybeT $ get jInviter
-    return (course, user)
-
-  case ctx of
-    Just (Course{..}, User{..}) -> do
-      let baseRoute = CourseR courseTerm courseSchool courseShorthand $ CLecInviteR lecturerInvitationEmail
-      jwt <- encodeToken =<< bearerToken jInviter (Just $ HashSet.singleton baseRoute) Nothing Nothing Nothing
-      let
-        invitationUrl :: SomeRoute UniWorX
-        invitationUrl = SomeRoute (baseRoute, [(toPathPiece GetBearer, toPathPiece jwt)])
-      invitationUrl' <- toTextUrl invitationUrl
-
-      mailT def $ do
-        _mailTo .= [Address Nothing $ CI.original lecturerInvitationEmail]
-        replaceMailHeader "Reply-To" . Just . renderAddress $ Address (Just userDisplayName) (CI.original userEmail)
-        replaceMailHeader "Auto-Submitted" $ Just "auto-generated"
-        setSubjectI $ MsgMailSubjectLecturerInvitation courseTerm courseSchool courseShorthand
-      
-        addPart ($(ihamletFile "templates/mail/lecturerInvitation.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX))
-    Nothing -> runDB .
-      deleteBy $ UniqueLecturerInvitation lecturerInvitationEmail lecturerInvitationCourse
diff --git a/src/Jobs/Types.hs b/src/Jobs/Types.hs
index 4dcf0de35..c5a0aa763 100644
--- a/src/Jobs/Types.hs
+++ b/src/Jobs/Types.hs
@@ -31,9 +31,6 @@ data Job = JobSendNotification { jRecipient :: UserId, jNotification :: Notifica
                                       , jSubject :: Maybe Text
                                       , jMailContent :: Html
                                       }
-         | JobLecturerInvitation { jInviter :: UserId
-                                 , jLecturerInvitation :: LecturerInvitation
-                                 }
          | JobCorrectorInvitation { jInviter :: UserId
                                   , jCorrectorInvitation :: SheetCorrectorInvitation
                                   }
diff --git a/templates/courseLecInvite.hamlet b/templates/courseLecInvite.hamlet
deleted file mode 100644
index 408556fb7..000000000
--- a/templates/courseLecInvite.hamlet
+++ /dev/null
@@ -1,3 +0,0 @@
-<p>
-  _{MsgCourseLecInviteExplanation}
-^{btnWidget}

From dfe0b4de5ebb27741f340306d81c571f29808e27 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 23 Apr 2019 01:34:18 +0200
Subject: [PATCH 130/238] Rename fields of InvitationReference

---
 src/Handler/Utils/Invitations.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Handler/Utils/Invitations.hs b/src/Handler/Utils/Invitations.hs
index 257881ea1..ab73a7152 100644
--- a/src/Handler/Utils/Invitations.hs
+++ b/src/Handler/Utils/Invitations.hs
@@ -87,13 +87,13 @@ deriving instance Show (InvitationReference junction)
 
 instance ToJSON (InvitationReference junction) where
   toJSON (InvRef fId) = JSON.object
-    [ "type" JSON..= show (typeRep (Proxy @junction))
-    , "key"  JSON..= fId
+    [ "junction" JSON..= show (typeRep (Proxy @junction))
+    , "record"   JSON..= fId
     ]
 instance IsInvitableJunction junction => FromJSON (InvitationReference junction) where
   parseJSON = JSON.withObject "InvitationReference" $ \o -> do
-    table <- o JSON..: "type"
-    key   <- o JSON..: "key"
+    table <- o JSON..: "junction"
+    key   <- o JSON..: "record"
 
     unless (table == show (typeRep (Proxy @junction))) $
       fail "Unexpected table"

From 2a0bee58b58b469f1a35ce8168ff1caf19c85a54 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 23 Apr 2019 11:17:43 +0200
Subject: [PATCH 131/238] More idiomatic usage of `invRef`

---
 src/Handler/Utils/Invitations.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Handler/Utils/Invitations.hs b/src/Handler/Utils/Invitations.hs
index ab73a7152..0061b730a 100644
--- a/src/Handler/Utils/Invitations.hs
+++ b/src/Handler/Utils/Invitations.hs
@@ -179,13 +179,13 @@ sinkInvitations InvitationConfig{..} = determineExists .| C.foldMap pure >>= lif
       = C.map Right
       | otherwise
       = C.mapM $ \inp@(email, fid, dat) ->
-          maybe (Right inp) (Left . (, dat)) <$> getKeyBy (UniqueInvitation email (toJSON $ InvRef @junction fid))
+          maybe (Right inp) (Left . (, dat)) <$> getKeyBy (UniqueInvitation email (invRef @junction fid))
 
     sinkInvitations' :: [Either (InvitationId, InvitationData junction) (UserEmail, Key (InvitationFor junction), InvitationData junction)]
                      -> YesodJobDB UniWorX ()
     sinkInvitations' (partitionEithers -> (existing, new)) = do
       when (is _Nothing (ephemeralInvitation @junction)) $ do
-        insertMany_ $ map (\(email, fid, dat) -> Invitation email (toJSON $ InvRef @junction fid) (toJSON $ dat ^. _invitationDBData)) new
+        insertMany_ $ map (\(email, fid, dat) -> Invitation email (invRef @junction fid) (toJSON $ dat ^. _invitationDBData)) new
         forM_ existing $ \(iid, dat) -> update iid [ InvitationData =. toJSON (dat ^. _invitationDBData) ]
       forM_ new $ \(jInvitee, fid, dat) -> do
         app <- getYesod
@@ -250,7 +250,7 @@ invitationR' InvitationConfig{..} = liftHandlerT $ do
     Entity fid fRec <- invitationResolveFor >>= (\k -> Entity k <$> get404 k)
     dbData <- case ephemeralInvitation @junction of
       Nothing -> do
-        Invitation{..} <- entityVal <$> getBy404 (UniqueInvitation itEmail . toJSON $ InvRef @junction fid)
+        Invitation{..} <- entityVal <$> getBy404 (UniqueInvitation itEmail $ invRef @junction fid)
         case fromJSON invitationData of
           JSON.Success dbData -> return dbData
           JSON.Error   str    -> fail $ "Could not decode invitationData: " <> str
@@ -275,7 +275,7 @@ invitationR' InvitationConfig{..} = liftHandlerT $ do
     fmap (, (dataWidget, dataEnctype), heading, explanation) . formResultMaybe dataRes $ \case
       Nothing -> do
         addMessageI Info MsgInvitationDeclined
-        deleteBy . UniqueInvitation itEmail . toJSON $ InvRef @junction fid
+        deleteBy . UniqueInvitation itEmail $ invRef @junction fid
         return . Just $ SomeRoute HomeR
       Just jData -> do
         mResult <- insertUniqueEntity $ review _InvitableJunction (invitee, fid, jData)

From 48e42d41e1273c6c59afec7fbdf0dc9a5705c951 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 23 Apr 2019 22:20:13 +0200
Subject: [PATCH 132/238] add julius file for communication recipientLayout

---
 templates/widgets/communication/recipientLayout.julius | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 templates/widgets/communication/recipientLayout.julius

diff --git a/templates/widgets/communication/recipientLayout.julius b/templates/widgets/communication/recipientLayout.julius
new file mode 100644
index 000000000..d38d48a6d
--- /dev/null
+++ b/templates/widgets/communication/recipientLayout.julius
@@ -0,0 +1 @@
+// TODO: js utility to check all/none of the checkboxes in a recipient category at once

From 8e5bebc96fb5639cda30b326be92cea6b3f52d70 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 24 Apr 2019 14:59:31 +0200
Subject: [PATCH 133/238] Workaround library bug disallowing 'none' as
 PathPiece

Fixes #336
---
 src/Model/Types.hs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Model/Types.hs b/src/Model/Types.hs
index 527c748f1..c690483a2 100644
--- a/src/Model/Types.hs
+++ b/src/Model/Types.hs
@@ -342,7 +342,15 @@ data SubmissionModeDescr = SubmissionModeNone
 instance Universe SubmissionModeDescr
 instance Finite SubmissionModeDescr
 
-nullaryPathPiece ''SubmissionModeDescr $ camelToPathPiece' 2
+instance PathPiece SubmissionModeDescr where
+  toPathPiece = (Map.fromList (zip universeF verbs) !)
+    where
+      verbs = [ "no-submissions"
+              , "correctors"
+              , "users"
+              , "correctors+users"
+              ]
+  fromPathPiece = finiteFromPathPiece
 
 classifySubmissionMode :: SubmissionMode -> SubmissionModeDescr
 classifySubmissionMode (SubmissionMode False Nothing ) = SubmissionModeNone

From 816ce0595e2636d98f2c347828e05ad92e029841 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 24 Apr 2019 15:13:06 +0200
Subject: [PATCH 134/238] Cleanup

---
 src/Model/Types.hs     | 38 ++++++++++++++++----------------------
 src/Utils/PathPiece.hs | 14 +++++++++++++-
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/Model/Types.hs b/src/Model/Types.hs
index c690483a2..575d86403 100644
--- a/src/Model/Types.hs
+++ b/src/Model/Types.hs
@@ -320,19 +320,16 @@ deriveJSON defaultOptions
   } ''SubmissionMode
 derivePersistFieldJSON ''SubmissionMode
 
-instance PathPiece SubmissionMode where
-  toPathPiece = (Map.fromList (zip universeF verbs) !)
-    where
-      verbs = [ "no-submissions"
-              , "no-upload"
-              , "no-unpack"
-              , "unpack"
-              , "correctors"
-              , "correctors+no-upload"
-              , "correctors+no-unpack"
-              , "correctors+unpack"
-              ]
-  fromPathPiece = finiteFromPathPiece
+finitePathPiece ''SubmissionMode
+  [ "no-submissions"
+  , "no-upload"
+  , "no-unpack"
+  , "unpack"
+  , "correctors"
+  , "correctors+no-upload"
+  , "correctors+no-unpack"
+  , "correctors+unpack"
+  ]
 
 data SubmissionModeDescr = SubmissionModeNone
                          | SubmissionModeCorrector
@@ -342,15 +339,12 @@ data SubmissionModeDescr = SubmissionModeNone
 instance Universe SubmissionModeDescr
 instance Finite SubmissionModeDescr
 
-instance PathPiece SubmissionModeDescr where
-  toPathPiece = (Map.fromList (zip universeF verbs) !)
-    where
-      verbs = [ "no-submissions"
-              , "correctors"
-              , "users"
-              , "correctors+users"
-              ]
-  fromPathPiece = finiteFromPathPiece
+finitePathPiece ''SubmissionModeDescr
+  [ "no-submissions"
+  , "correctors"
+  , "users"
+  , "correctors+users"
+  ]
 
 classifySubmissionMode :: SubmissionMode -> SubmissionModeDescr
 classifySubmissionMode (SubmissionMode False Nothing ) = SubmissionModeNone
diff --git a/src/Utils/PathPiece.hs b/src/Utils/PathPiece.hs
index 7a391bc01..334133695 100644
--- a/src/Utils/PathPiece.hs
+++ b/src/Utils/PathPiece.hs
@@ -1,7 +1,7 @@
 module Utils.PathPiece
   ( finiteFromPathPiece
   , nullaryToPathPiece
-  , nullaryPathPiece
+  , nullaryPathPiece, finitePathPiece
   , splitCamel
   , camelToPathPiece, camelToPathPiece'
   , tuplePathPiece
@@ -16,6 +16,8 @@ import Data.Universe
 import qualified Data.Text as Text
 import qualified Data.Char as Char
 
+import qualified Data.Map as Map
+
 import Numeric.Natural
 
 import Data.List (foldl)
@@ -44,6 +46,16 @@ nullaryPathPiece nullaryType mangle =
     , funD 'fromPathPiece
       [ clause [] (normalB [e|finiteFromPathPiece|]) [] ]
     ]
+
+finitePathPiece :: Name -> [Text] -> DecsQ
+finitePathPiece finiteType verbs =
+  pure <$> instanceD (cxt []) [t|PathPiece $(conT finiteType)|]
+    [ funD 'toPathPiece
+      [ clause [] (normalB [|(Map.fromList (zip universeF verbs) !)|]) [] ]
+    , funD 'fromPathPiece
+      [ clause [] (normalB [e|(Map.fromList (zip verbs universeF) !?)|]) [] ]
+    ]
+  
   
 splitCamel :: Textual t => t -> [t]
 splitCamel = map fromList . reverse . helper (error "hasChange undefined at start of string") [] "" . otoList

From dc4480431035340459a469de47110f38b2fab9c7 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 24 Apr 2019 16:49:52 +0200
Subject: [PATCH 135/238] Fix build

---
 src/Utils/PathPiece.hs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Utils/PathPiece.hs b/src/Utils/PathPiece.hs
index 334133695..c7434b54f 100644
--- a/src/Utils/PathPiece.hs
+++ b/src/Utils/PathPiece.hs
@@ -16,6 +16,7 @@ import Data.Universe
 import qualified Data.Text as Text
 import qualified Data.Char as Char
 
+import Data.Map ((!), (!?))
 import qualified Data.Map as Map
 
 import Numeric.Natural

From 5ec553edde99c2490aa97257f9bf9c8e324ad39e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 24 Apr 2019 16:54:09 +0200
Subject: [PATCH 136/238] Fix build

---
 src/Model/Types.hs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Model/Types.hs b/src/Model/Types.hs
index 575d86403..ab73b6ba7 100644
--- a/src/Model/Types.hs
+++ b/src/Model/Types.hs
@@ -16,7 +16,6 @@ import Utils
 import Control.Lens hiding (universe)
 import Utils.Lens.TH
 
-import Data.Map ((!))
 import Data.Set (Set)
 import qualified Data.Set as Set
 import qualified Data.Map as Map

From 60c9de44c5c7210a5d9cff5b12c342741abb4c43 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 24 Apr 2019 19:16:58 +0200
Subject: [PATCH 137/238] special styling for checkboxes in table headers

---
 static/css/utils/checkbox.scss | 6 ++++++
 static/js/utils/checkAll.js    | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/static/css/utils/checkbox.scss b/static/css/utils/checkbox.scss
index 9a73b01e7..6db7f97e3 100644
--- a/static/css/utils/checkbox.scss
+++ b/static/css/utils/checkbox.scss
@@ -74,3 +74,9 @@
     filter: grayscale(1);
   }
 }
+
+/* special treatment for checkboxes in table headers */
+th .checkbox {
+  margin-right: 7px;
+  vertical-align: bottom;
+}
diff --git a/static/js/utils/checkAll.js b/static/js/utils/checkAll.js
index 86749f2a9..5a15e0ac7 100644
--- a/static/js/utils/checkAll.js
+++ b/static/js/utils/checkAll.js
@@ -96,9 +96,9 @@
       checkAllCheckbox.setAttribute('id', getCheckboxId());
       th.insertBefore(checkAllCheckbox, th.firstChild);
 
-      // manually set up newly created checkbox
+      // manually set up new checkbox
       if (UtilRegistry) {
-        UtilRegistry.setup(UtilRegistry.find('checkbox'));
+        UtilRegistry.setup(UtilRegistry.find('checkbox'), th);
       }
 
       checkAllCheckbox.addEventListener('input', onCheckAllCheckboxInput);

From 7e7ba291f20981af58c9c67aa339bcd20ae7f95f Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 23 Apr 2019 13:38:08 +0200
Subject: [PATCH 138/238] wrap recipient form categories in wrapper and only
 show when necessary

---
 .../communication/recipientLayout.hamlet      | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/templates/widgets/communication/recipientLayout.hamlet b/templates/widgets/communication/recipientLayout.hamlet
index c52ff534d..f3f759de1 100644
--- a/templates/widgets/communication/recipientLayout.hamlet
+++ b/templates/widgets/communication/recipientLayout.hamlet
@@ -1,14 +1,16 @@
 $newline never
-$forall category <- activeCategories
-  <div .recipient-category>
-    <input type=checkbox id=#{checkedIdent category} :elem category checkedCategories:checked>
-    <label .recipient-category__label for=#{checkedIdent category}>
-      _{category}
+$if not (null activeCategories)
+  <div .recipient-categories>
+    $forall category <- activeCategories
+      <div .recipient-category>
+        <input type=checkbox id=#{checkedIdent category} :elem category checkedCategories:checked>
+        <label .recipient-category__label for=#{checkedIdent category}>
+          _{category}
 
-    $if hasContent category
-      <fieldset .recipient-category__fieldset uw-interactive-fieldset .interactive-fieldset__target data-conditional-input=#{checkedIdent category}>
-        $forall optIx <- categoryIndices category
-          ^{cellWdgts ! optIx}
+        $if hasContent category
+          <fieldset .recipient-category__fieldset uw-interactive-fieldset .interactive-fieldset__target data-conditional-input=#{checkedIdent category}>
+            $forall optIx <- categoryIndices category
+              ^{cellWdgts ! optIx}
 
-        $maybe addWdgt <- addWdgts !? (1, (EnumPosition category, 0))
-          ^{addWdgt}
+            $maybe addWdgt <- addWdgts !? (1, (EnumPosition category, 0))
+              ^{addWdgt}

From 484b5916c0f8cbea925e58079197ddedaa7832f2 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 23 Apr 2019 13:37:25 +0200
Subject: [PATCH 139/238] remove implicit submit js util for mass-input

---
 templates/widgets/massinput/massinput.julius | 37 --------------------
 1 file changed, 37 deletions(-)
 delete mode 100644 templates/widgets/massinput/massinput.julius

diff --git a/templates/widgets/massinput/massinput.julius b/templates/widgets/massinput/massinput.julius
deleted file mode 100644
index 3c6c2a25b..000000000
--- a/templates/widgets/massinput/massinput.julius
+++ /dev/null
@@ -1,37 +0,0 @@
-document.addEventListener('DOMContentLoaded', function() {
-  var form = document.getElementById(#{String fvId}).closest('form');
-
-
-  var formSubmit = form.querySelector('input[type=submit], button[type=submit]:not(.btn-mass-input-add):not(.btn-mass-input-delete)');
-  var cellInputs = Array.from(form.querySelectorAll('.massinput--cell input:not([type=hidden])'));
-
-  cellInputs.forEach(function(input) {
-      makeImplicitSubmit(input, formSubmit);
-  });
-
-
-  Array.from(form.querySelectorAll('.massinput--add')).forEach(function(wrapper) {
-    var addSubmit = wrapper.querySelector('.btn-mass-input-add');
-    var addInputs = Array.from(wrapper.querySelectorAll('input:not([type=hidden]):not(.btn-mass-input-add)'));
-
-    addInputs.forEach(function(input) {
-      makeImplicitSubmit(input, addSubmit);
-    });
-  });
-
-  // Override implicit submit (pressing enter) behaviour to trigger a specified submit button instead of the default
-  function makeImplicitSubmit(input, submit) {
-    if (!submit) {
-      throw new Error('implicitSubmit(input, options) needs to be passed a submit element via options');
-    }
-
-    var doSubmit = function(event) {
-      if (event.keyCode == 13) {
-        event.preventDefault();
-        submit.click();
-      }
-    };
-
-    input.addEventListener('keypress', doSubmit);
-  }
-});

From c01bfd4fb374519184feaa7a50d6a4bb51786c44 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 23 Apr 2019 13:38:08 +0200
Subject: [PATCH 140/238] wrap recipient form categories in wrapper and only
 show when necessary

---
 .../communication/recipientLayout.hamlet      | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/templates/widgets/communication/recipientLayout.hamlet b/templates/widgets/communication/recipientLayout.hamlet
index c52ff534d..f3f759de1 100644
--- a/templates/widgets/communication/recipientLayout.hamlet
+++ b/templates/widgets/communication/recipientLayout.hamlet
@@ -1,14 +1,16 @@
 $newline never
-$forall category <- activeCategories
-  <div .recipient-category>
-    <input type=checkbox id=#{checkedIdent category} :elem category checkedCategories:checked>
-    <label .recipient-category__label for=#{checkedIdent category}>
-      _{category}
+$if not (null activeCategories)
+  <div .recipient-categories>
+    $forall category <- activeCategories
+      <div .recipient-category>
+        <input type=checkbox id=#{checkedIdent category} :elem category checkedCategories:checked>
+        <label .recipient-category__label for=#{checkedIdent category}>
+          _{category}
 
-    $if hasContent category
-      <fieldset .recipient-category__fieldset uw-interactive-fieldset .interactive-fieldset__target data-conditional-input=#{checkedIdent category}>
-        $forall optIx <- categoryIndices category
-          ^{cellWdgts ! optIx}
+        $if hasContent category
+          <fieldset .recipient-category__fieldset uw-interactive-fieldset .interactive-fieldset__target data-conditional-input=#{checkedIdent category}>
+            $forall optIx <- categoryIndices category
+              ^{cellWdgts ! optIx}
 
-        $maybe addWdgt <- addWdgts !? (1, (EnumPosition category, 0))
-          ^{addWdgt}
+            $maybe addWdgt <- addWdgts !? (1, (EnumPosition category, 0))
+              ^{addWdgt}

From 11c5cd36534729c2d03d975be6c7d06a001f3208 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 23 Apr 2019 13:40:03 +0200
Subject: [PATCH 141/238] add massInput js util

---
 src/Foundation.hs                            |   1 +
 static/js/utils/massInput.js                 | 127 +++++++++++++++++++
 templates/widgets/massinput/massinput.hamlet |   2 +-
 3 files changed, 129 insertions(+), 1 deletion(-)
 create mode 100644 static/js/utils/massInput.js

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 46e176a19..a05a45558 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1175,6 +1175,7 @@ siteLayout' headingOverride widget = do
       addScript $ StaticR js_utils_checkAll_js
       addScript $ StaticR js_utils_form_js
       addScript $ StaticR js_utils_inputs_js
+      addScript $ StaticR js_utils_massInput_js
       addScript $ StaticR js_utils_modal_js
       addScript $ StaticR js_utils_showHide_js
       -- addScript $ StaticR js_utils_tabber_js
diff --git a/static/js/utils/massInput.js b/static/js/utils/massInput.js
new file mode 100644
index 000000000..7b58bb625
--- /dev/null
+++ b/static/js/utils/massInput.js
@@ -0,0 +1,127 @@
+(function() {
+  'use strict';
+
+  /**
+   *
+   * Mass Input Utility
+   *  allows form shapes to be manipulated asynchronously:
+   *  will asynchronously submit the form and replace the contents of the
+   *  mass input with the one from the BE response
+   *
+   * Attribute:   uw-mass-input
+   *   (will be set up automatically on tables)
+   *
+   * Example usage:
+   *  (table with one column thats only checkboxes)
+   */
+
+  var MASS_INPUT_UTIL_NAME = 'massInput';
+  var MASS_INPUT_UTIL_SELECTOR = '[uw-mass-input]';
+
+  var MASS_INPUT_INITIALIZED_CLASS = 'mass-input--initialized';
+
+  var massInputUtil = function(element) {
+    var massInputId;
+    var massInputFormSubmitHandler;
+    var massInputForm;
+
+    function init() {
+      if (!element) {
+        throw new Error('Mass Input utility cannot be setup without an element!');
+      }
+
+      massInputId = element.id;
+      massInputForm = element.closest('form');
+
+      if (!massInputForm) {
+        throw new Error('Mass Input utility cannot be setup without being wrapped in a <form>!');
+      }
+
+      massInputFormSubmitHandler = makeSubmitHandler(massInputForm);
+      massInputForm.addEventListener('submit', massInputFormSubmitHandler);
+
+      // mark initialized
+      element.classList.add(MASS_INPUT_INITIALIZED_CLASS);
+
+      return {
+        name: MASS_INPUT_UTIL_NAME,
+        element: element,
+        destroy: function() {},
+      };
+    }
+
+    function makeSubmitHandler(massInputForm) {
+      if (!HttpClient) {
+        throw new Error('HttpClient not found!');
+      }
+
+      var method = massInputForm.getAttribute('method') || 'POST';
+      var url = massInputForm.getAttribute('action') || window.location.href;
+      var enctype = massInputForm.getAttribute('enctype') || 'application/json';
+
+      var requestFn;
+      if (HttpClient[method.toLowerCase()]) {
+        requestFn = HttpClient[method.toLowerCase()];
+      }
+
+      return function(event) {
+        event.preventDefault();
+        var formData = new FormData(massInputForm);
+
+        var formBody = [];
+
+        for(var formField of formData) {
+          var encodedKey = encodeURIComponent(formField[0]);
+          var encodedValue = encodeURIComponent(formField[1]);
+          formBody.push(encodedKey + "=" + encodedValue);
+        }
+        var requestBody = formBody.join("&");
+
+        if (requestFn) {
+          requestFn(
+            url,
+            {
+              'Content-Type': enctype,
+              'Mass-Input-Shortcircuit': massInputId,
+              'Upgrade-Insecure-Requests': 1,
+            },
+            requestBody,
+          ).then(function(response) {
+            return response.text()
+          }).then(function(response) {
+            processResponse(response);
+          });
+        }
+      };
+    }
+
+    function processResponse(response) {
+      var responseElement = document.createElement('div');
+      responseElement.innerHTML = response;
+      var newWrapperContents = responseElement.querySelector('#' + massInputId);
+      element.innerHTML = newWrapperContents.innerHTML;
+
+      reset()
+
+      if (UtilRegistry) {
+        UtilRegistry.setupAll(element);
+      }
+    }
+
+    function reset() {
+      element.classList.remove(MASS_INPUT_INITIALIZED_CLASS);
+      massInputForm.removeEventListener('submit', massInputFormSubmitHandler)
+    }
+
+    return init();
+  };
+
+  // register mass input util
+  if (UtilRegistry) {
+    UtilRegistry.register({
+      name: MASS_INPUT_UTIL_NAME,
+      selector: MASS_INPUT_UTIL_SELECTOR,
+      setup: massInputUtil
+    });
+  }
+})();
diff --git a/templates/widgets/massinput/massinput.hamlet b/templates/widgets/massinput/massinput.hamlet
index 3dde7384d..9a8ef2534 100644
--- a/templates/widgets/massinput/massinput.hamlet
+++ b/templates/widgets/massinput/massinput.hamlet
@@ -1,5 +1,5 @@
 $newline never
-<div .massinput ##{fvId}>
+<div .massinput uw-mass-input ##{fvId}>
   #{csrf}
   ^{shapeInput}
   ^{miWidget}

From 965e3947f91a785054ee03cefe4eb910c3560164 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 23 Apr 2019 14:19:52 +0200
Subject: [PATCH 142/238] dont async handle massinput if from outside massinput
 element

---
 static/js/utils/massInput.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/static/js/utils/massInput.js b/static/js/utils/massInput.js
index 7b58bb625..9120f97d2 100644
--- a/static/js/utils/massInput.js
+++ b/static/js/utils/massInput.js
@@ -65,6 +65,13 @@
       }
 
       return function(event) {
+        // check if event occured from either a mass input add/delete button or
+        // from inside one of massinput's inputs (i.e. they are focused/active)
+        var activeElement = element.querySelector(':focus, :active');
+        if (!activeElement) {
+          return false;
+        }
+
         event.preventDefault();
         var formData = new FormData(massInputForm);
 
@@ -83,7 +90,6 @@
             {
               'Content-Type': enctype,
               'Mass-Input-Shortcircuit': massInputId,
-              'Upgrade-Insecure-Requests': 1,
             },
             requestBody,
           ).then(function(response) {

From c36dc6f2619f6dbcddfcecfbd08f5e6afc229243 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 23 Apr 2019 14:20:14 +0200
Subject: [PATCH 143/238] styling for mass input add/delete buttons

---
 messages/uniworx/de.msg                      | 8 ++++----
 templates/widgets/massinput/massinput.lucius | 8 ++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 templates/widgets/massinput/massinput.lucius

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index c29f933d6..75e54f8d6 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -212,7 +212,7 @@ CorrectorAssignTitle: Korrektor zuweisen
 Unauthorized: Sie haben hierfür keine explizite Berechtigung.
 UnauthorizedAnd l@Text r@Text: (#{l} UND #{r})
 UnauthorizedOr  l@Text r@Text: (#{l} ODER #{r})
-UnauthorizedNoToken: Ihrer Anfrage war kein Authorisierungs-Token beigefügt. 
+UnauthorizedNoToken: Ihrer Anfrage war kein Authorisierungs-Token beigefügt.
 UnauthorizedTokenExpired: Ihr Authorisierungs-Token ist abgelaufen.
 UnauthorizedTokenNotStarted: Ihr Authorisierungs-Token ist noch nicht gültig.
 UnauthorizedTokenInvalid: Ihr Authorisierungs-Token konnte nicht verarbeitet werden.
@@ -760,8 +760,8 @@ DeleteConfirmationWrong: Bestätigung muss genau dem angezeigten Text entspreche
 
 DBTIRowsMissing n@Int: #{pluralDE n "Eine Zeile ist" "Einige Zeilen sind"} aus der Datenbank verschwunden, seit das Formular für Sie generiert wurde
 
-MassInputAddDimension: Hinzufügen
-MassInputDeleteCell: Entfernen
+MassInputAddDimension: +
+MassInputDeleteCell: -
 
 NavigationFavourites: Favoriten
 
@@ -792,4 +792,4 @@ CourseLecInviteExplanation: Sie wurden eingeladen, Verwalter für einen Kurs zu
 CorrectorInvitationAccepted shn@SheetName: Sie wurden als Korrektor für #{shn} eingetragen
 CorrectorInvitationDeclined shn@SheetName: Sie haben die Einladung, Korrektor für #{shn} zu werden, abgelehnt
 SheetCorrInviteHeading shn@SheetName: Einladung zum Korrektor für #{shn}
-SheetCorrInviteExplanation: Sie wurden eingeladen, Korrektor für ein Übungsblatt zu sein.
\ No newline at end of file
+SheetCorrInviteExplanation: Sie wurden eingeladen, Korrektor für ein Übungsblatt zu sein.
diff --git a/templates/widgets/massinput/massinput.lucius b/templates/widgets/massinput/massinput.lucius
new file mode 100644
index 000000000..a0d1208de
--- /dev/null
+++ b/templates/widgets/massinput/massinput.lucius
@@ -0,0 +1,8 @@
+.btn-mass-input-delete,
+.btn-mass-input-add {
+  background-color: #999;
+  min-width: auto;
+  padding: 5px 15px;
+  font-weight: 700;
+  font-size: 1.3rem;
+}

From bdd1878aed7c5da90dc7ecb972b3d6f675d7ab09 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 23 Apr 2019 14:25:37 +0200
Subject: [PATCH 144/238] fix styling for mass input buttons

---
 templates/widgets/massinput/massinput.lucius | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/widgets/massinput/massinput.lucius b/templates/widgets/massinput/massinput.lucius
index a0d1208de..6af5274b0 100644
--- a/templates/widgets/massinput/massinput.lucius
+++ b/templates/widgets/massinput/massinput.lucius
@@ -1,7 +1,7 @@
-.btn-mass-input-delete,
-.btn-mass-input-add {
+.btn.btn-mass-input-delete,
+.btn.btn-mass-input-add {
   background-color: #999;
-  min-width: auto;
+  min-width: 50px;
   padding: 5px 15px;
   font-weight: 700;
   font-size: 1.3rem;

From feb385b418a787ec8a0c495886b9ec5d84c22f19 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 23 Apr 2019 21:44:26 +0200
Subject: [PATCH 145/238] massinput js util cleanup

---
 static/js/utils/massInput.js | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/static/js/utils/massInput.js b/static/js/utils/massInput.js
index 9120f97d2..2e8b66863 100644
--- a/static/js/utils/massInput.js
+++ b/static/js/utils/massInput.js
@@ -37,7 +37,7 @@
         throw new Error('Mass Input utility cannot be setup without being wrapped in a <form>!');
       }
 
-      massInputFormSubmitHandler = makeSubmitHandler(massInputForm);
+      massInputFormSubmitHandler = makeSubmitHandler();
       massInputForm.addEventListener('submit', massInputFormSubmitHandler);
 
       // mark initialized
@@ -50,7 +50,7 @@
       };
     }
 
-    function makeSubmitHandler(massInputForm) {
+    function makeSubmitHandler() {
       if (!HttpClient) {
         throw new Error('HttpClient not found!');
       }
@@ -73,16 +73,7 @@
         }
 
         event.preventDefault();
-        var formData = new FormData(massInputForm);
-
-        var formBody = [];
-
-        for(var formField of formData) {
-          var encodedKey = encodeURIComponent(formField[0]);
-          var encodedValue = encodeURIComponent(formField[1]);
-          formBody.push(encodedKey + "=" + encodedValue);
-        }
-        var requestBody = formBody.join("&");
+        var requestBody = serializeForm();
 
         if (requestFn) {
           requestFn(
@@ -93,7 +84,7 @@
             },
             requestBody,
           ).then(function(response) {
-            return response.text()
+            return response.text();
           }).then(function(response) {
             processResponse(response);
           });
@@ -114,6 +105,19 @@
       }
     }
 
+    function serializeForm() {
+      var formData = new FormData(massInputForm);
+      var formBody = [];
+
+      for(var formField of formData) {
+        var encodedKey = encodeURIComponent(formField[0]);
+        var encodedValue = encodeURIComponent(formField[1]);
+        formBody.push(encodedKey + "=" + encodedValue);
+      }
+
+      return formBody.join("&");
+    }
+
     function reset() {
       element.classList.remove(MASS_INPUT_INITIALIZED_CLASS);
       massInputForm.removeEventListener('submit', massInputFormSubmitHandler)

From 8fd16c35459e21fa923560b6e38225727a04527f Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Thu, 25 Apr 2019 10:03:08 +0200
Subject: [PATCH 146/238] preparation for toggle all/none checkbox in
 recipientLayout

---
 .../communication/recipientLayout.hamlet      |  8 +++--
 .../communication/recipientLayout.julius      | 33 +++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/templates/widgets/communication/recipientLayout.hamlet b/templates/widgets/communication/recipientLayout.hamlet
index f3f759de1..646bc7e01 100644
--- a/templates/widgets/communication/recipientLayout.hamlet
+++ b/templates/widgets/communication/recipientLayout.hamlet
@@ -9,8 +9,12 @@ $if not (null activeCategories)
 
         $if hasContent category
           <fieldset .recipient-category__fieldset uw-interactive-fieldset .interactive-fieldset__target data-conditional-input=#{checkedIdent category}>
-            $forall optIx <- categoryIndices category
-              ^{cellWdgts ! optIx}
+            $if not (null (categoryIndices category))
+              $# TODO: unique id for this all/none checkbox
+              <input type=checkbox id=tbd .recipient-category__toggle-all>
+              <label for=tbd>Label
+              $forall optIx <- categoryIndices category
+                ^{cellWdgts ! optIx}
 
             $maybe addWdgt <- addWdgts !? (1, (EnumPosition category, 0))
               ^{addWdgt}
diff --git a/templates/widgets/communication/recipientLayout.julius b/templates/widgets/communication/recipientLayout.julius
index d38d48a6d..87dfead6b 100644
--- a/templates/widgets/communication/recipientLayout.julius
+++ b/templates/widgets/communication/recipientLayout.julius
@@ -1 +1,34 @@
 // TODO: js utility to check all/none of the checkboxes in a recipient category at once
+(function() {
+
+  var RECIPIENT_CATEGORIES_SELECTOR = '.recipient-categories';
+  var RECIPIENT_CATEGORY_SELECTOR = '.recipient-category';
+  var RECIPIENT_CATEGORY_FIELDSET_SELECTOR = '.recipient-category__fieldset';
+  var RECIPIENT_CATEGORY_TOGGLE_ALL_SELECTOR = '.recipient-category__toggle-all';
+
+  document.addEventListener('DOMContentLoaded', function() {
+
+    var recipientCategoriesElement = document.querySelector(RECIPIENT_CATEGORIES_SELECTOR);
+    var recipientCategoryElements = Array.from(recipientCategoriesElement.querySelectorAll(RECIPIENT_CATEGORY_SELECTOR));
+
+    recipientCategoryElements.forEach(function(element) {
+      setupRecipientCategory(element);
+    });
+  });
+
+  function setupRecipientCategory(recipientCategoryElement) {
+    var fieldset = recipientCategoryElement.querySelector(RECIPIENT_CATEGORY_FIELDSET_SELECTOR);
+    var categoryCheckboxes = Array.from(fieldset.querySelectorAll('[type="checkbox"]'));
+
+    if (categoryCheckboxes) {
+      var toggleAllCheckbox = recipientCategoryElement.querySelector(RECIPIENT_CATEGORY_TOGGLE_ALL_SELECTOR);
+
+      if (toggleAllCheckbox) {
+        toggleAllCheckbox.addEventListener('change', function() {
+          console.log('TBD: setting up toggle all checkbox');
+        });
+      }
+    }
+  }
+
+})();

From d2aa7e9e3724b459167adf78bcba2334b73eb28e Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 23 Apr 2019 22:00:33 +0200
Subject: [PATCH 147/238] update documentation for mass input js util

---
 static/js/utils/massInput.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/static/js/utils/massInput.js b/static/js/utils/massInput.js
index 2e8b66863..2ddbda70c 100644
--- a/static/js/utils/massInput.js
+++ b/static/js/utils/massInput.js
@@ -5,14 +5,19 @@
    *
    * Mass Input Utility
    *  allows form shapes to be manipulated asynchronously:
-   *  will asynchronously submit the form and replace the contents of the
-   *  mass input with the one from the BE response
+   *  will asynchronously submit the containing form and replace the contents
+   *  of the mass input element with the one from the BE response
+   *  The utility will only trigger an AJAX request if the mass input element has
+   *  an active/focused element whilst the form is being submitted.
    *
    * Attribute:   uw-mass-input
-   *   (will be set up automatically on tables)
    *
    * Example usage:
-   *  (table with one column thats only checkboxes)
+   *  <form method="POST" action="...">
+   *   <input type="text">
+   *   <div uw-mass-input>
+   *     <input type="text">
+   *     <button type="submit">
    */
 
   var MASS_INPUT_UTIL_NAME = 'massInput';

From 530eb09ebb038b46efdcb3a2589d9540a6cdc53e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 25 Apr 2019 10:42:11 +0200
Subject: [PATCH 148/238] Fix double identifyForm in ProfileR

---
 src/Handler/Profile.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs
index 38f47c3e1..403e133c7 100644
--- a/src/Handler/Profile.hs
+++ b/src/Handler/Profile.hs
@@ -27,7 +27,7 @@ data SettingsForm = SettingsForm
       }
 
 makeSettingForm :: Maybe SettingsForm -> Form SettingsForm
-makeSettingForm template = identifyForm FIDsettings $ \html -> do
+makeSettingForm template html = do
     (result, widget) <- flip (renderAForm FormStandard) html $ SettingsForm
         <$  aformSection MsgFormCosmetics
         <*> areq (natFieldI $ MsgNatField "Favoriten") -- TODO: natFieldI not working here

From 8b9843a321b39b2bb8ef92d1bc16cacee43bef9e Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Thu, 25 Apr 2019 11:15:24 +0200
Subject: [PATCH 149/238] properly handle response from async mass-input
 requests (after moving commits)

---
 static/js/utils/massInput.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/static/js/utils/massInput.js b/static/js/utils/massInput.js
index 2ddbda70c..302afd995 100644
--- a/static/js/utils/massInput.js
+++ b/static/js/utils/massInput.js
@@ -98,10 +98,7 @@
     }
 
     function processResponse(response) {
-      var responseElement = document.createElement('div');
-      responseElement.innerHTML = response;
-      var newWrapperContents = responseElement.querySelector('#' + massInputId);
-      element.innerHTML = newWrapperContents.innerHTML;
+      element.innerHTML = response;
 
       reset()
 

From ddd795d0a8571852271af3bbce1290b9ac8a87e1 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 25 Apr 2019 13:06:12 +0200
Subject: [PATCH 150/238] Bugfix participant note icon no longer crosscourse

---
 src/Handler/Course.hs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 5697b7bd4..4c1d7a153 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -553,7 +553,7 @@ courseEditHandler miButtonAction mbCourseForm = do
                         case insertRes of
                           Just _  ->
                             queueDBJob . JobLecturerInvitation aid $ LecturerInvitation lEmail cid mLTy
-                          Nothing -> 
+                          Nothing ->
                             updateBy (UniqueLecturerInvitation lEmail cid) [ LecturerInvitationType =. mLTy ]
                     insert_ $ CourseEdit aid now cid
                     addMessageI Success $ MsgCourseEditOk tid ssh csh
@@ -803,8 +803,9 @@ userTableQuery :: CourseId -> UserTableExpr -> E.SqlQuery ( E.SqlExpr (Entity Us
 userTableQuery cid ((user `E.InnerJoin` participant) `E.LeftOuterJoin` note `E.LeftOuterJoin` studyFeatures) = do
   -- Note that order of E.on for nested joins is seemingly right-to-left, ignoring nesting paranthesis
   features <- studyFeaturesQuery' (participant E.^. CourseParticipantField) studyFeatures
-  E.on $ E.just (participant E.^. CourseParticipantUser) E.==. note E.?. CourseUserNoteUser
-  E.on $         participant E.^. CourseParticipantUser  E.==. user E.^. UserId
+  E.on $  (note E.?. CourseUserNoteUser   E.==. E.just (participant E.^. CourseParticipantUser))
+    E.&&. (note E.?. CourseUserNoteCourse E.==. E.just (E.val cid))
+  E.on $     participant E.^. CourseParticipantUser   E.==. user E.^. UserId
   E.where_ $ participant E.^. CourseParticipantCourse E.==. E.val cid
   return (user, participant E.^. CourseParticipantRegistration, note E.?. CourseUserNoteId, features)
 
@@ -1130,7 +1131,7 @@ postCCommR tid ssh csh = do
         evalAccessDB (CourseR tid ssh csh $ CUserR cID) False
     }
 
- 
+
 data ButtonLecInvite = BtnLecInvAccept | BtnLecInvDecline
   deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
 instance Universe ButtonLecInvite

From 39f5c5ece22bbd34538f0db63f1fe51d2a94b083 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 25 Apr 2019 13:12:36 +0200
Subject: [PATCH 151/238] Make new sorting stable wrt old settings

Fixes #317
---
 src/Handler/Utils/Table/Pagination.hs | 1 +
 templates/table/cell/header.hamlet    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Handler/Utils/Table/Pagination.hs b/src/Handler/Utils/Table/Pagination.hs
index 81ca65bd4..ce39f6300 100644
--- a/src/Handler/Utils/Table/Pagination.hs
+++ b/src/Handler/Utils/Table/Pagination.hs
@@ -727,6 +727,7 @@ dbTable PSValidator{..} dbtable@DBTable{ dbtIdent = dbtIdent'@(toPathPiece -> db
             isSortable = isJust sortableKey
             isSorted = (`elem` directions)
             attrs = sortableContent ^. cellAttrs
+            piSorting' = [ sSet | sSet <- fromMaybe [] piSorting, Just (sortKey sSet) /= sortableKey ]
           return $(widgetFile "table/cell/header")
 
         columnCount :: Int64
diff --git a/templates/table/cell/header.hamlet b/templates/table/cell/header.hamlet
index 5322aef4d..408dc4561 100644
--- a/templates/table/cell/header.hamlet
+++ b/templates/table/cell/header.hamlet
@@ -2,10 +2,10 @@
   $maybe flag <- sortableKey
     $case directions
       $of [SortAsc]
-        <a .table__th-link href=^{tblLink' $ setParam (wIdent "sorting") (Just $ toPathPiece (SortingSetting flag SortDesc))}>
+        <a .table__th-link href=^{tblLink' $ setParams (wIdent "sorting") (map toPathPiece (SortingSetting flag SortDesc : piSorting'))}>
           ^{widget}
       $of _
-        <a .table__th-link href=^{tblLink' $ setParam (wIdent "sorting") (Just $ toPathPiece (SortingSetting flag SortAsc))}>
+        <a .table__th-link href=^{tblLink' $ setParams (wIdent "sorting") (map toPathPiece (SortingSetting flag SortAsc : piSorting'))}>
           ^{widget}
   $nothing
     ^{widget}

From d5e1c92794368c2bb324181e61131b27ca1c604c Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 25 Apr 2019 14:01:24 +0200
Subject: [PATCH 152/238] Initial Stubs

---
 messages/uniworx/de.msg | 15 +++++++--
 models/materials        | 11 +++++++
 routes                  |  9 +++--
 src/Application.hs      | 13 ++++----
 src/Handler/Material.hs | 73 +++++++++++++++++++++++++++++++++++++++++
 src/Handler/Sheet.hs    |  3 +-
 src/Model/Types.hs      |  5 +--
 src/Utils/Form.hs       |  1 +
 8 files changed, 117 insertions(+), 13 deletions(-)
 create mode 100644 models/materials
 create mode 100644 src/Handler/Material.hs

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 7a8c55085..4d0be8c42 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -166,7 +166,7 @@ SheetName: Name
 SheetDescription: Hinweise für Teilnehmer
 SheetGroup: Gruppenabgabe
 SheetVisibleFrom: Sichtbar für Teilnehmer ab
-SheetVisibleFromTip: Ohne Datum nie sichtbar und keine Abgabe möglich; nur für unfertige Blätter leer lassen, deren Fristen/Bewertung sich noch ändern kann
+SheetVisibleFromTip: Ohne Datum nie sichtbar und keine Abgabe möglich; nur für unfertige Blätter leer lassen, deren Bewertung/Fristen sich noch ändern können
 SheetActiveFrom: Beginn Abgabezeitraum
 SheetActiveFromTip: Download der Aufgabenstellung erst ab diesem Datum möglich
 SheetActiveTo: Ende Abgabezeitraum
@@ -208,11 +208,22 @@ CourseCorrectionsTitle: Korrekturen für diesen Kurs
 CorrectorsHead sheetName@SheetName: Korrektoren für #{sheetName}
 CorrectorAssignTitle: Korrektor zuweisen
 
+MaterialName: Name
+MaterialType: Art
+MaterialTypePlaceholder: Folien, Code, Beispiel, ...
+MaterialTypeSlides: Folien
+MaterialTypeCode: Code
+MaterialTypeExample: Beispiel
+MaterialDescription: Beschreibung
+MaterialVisibleFrom: Sichtbar für Teilnehmer ab
+MaterialVisibleFromTip: Ohne Datum nie sichtbar für Teilnehmer; leer lassen ist nur sinnvoll für unfertige Materialien oder zur ausschließlichen Verteilung an Korrektoren
+MaterialFiles: Dateien
+
 
 Unauthorized: Sie haben hierfür keine explizite Berechtigung.
 UnauthorizedAnd l@Text r@Text: (#{l} UND #{r})
 UnauthorizedOr  l@Text r@Text: (#{l} ODER #{r})
-UnauthorizedNoToken: Ihrer Anfrage war kein Authorisierungs-Token beigefügt. 
+UnauthorizedNoToken: Ihrer Anfrage war kein Authorisierungs-Token beigefügt.
 UnauthorizedTokenExpired: Ihr Authorisierungs-Token ist abgelaufen.
 UnauthorizedTokenNotStarted: Ihr Authorisierungs-Token ist noch nicht gültig.
 UnauthorizedTokenInvalid: Ihr Authorisierungs-Token konnte nicht verarbeitet werden.
diff --git a/models/materials b/models/materials
new file mode 100644
index 000000000..d715abc63
--- /dev/null
+++ b/models/materials
@@ -0,0 +1,11 @@
+Material -- course material for disemination to course participants
+  course          CourseId
+  name            (CI Text)
+  type            Text Maybe
+  description     Html Maybe
+  visibleFrom     UTCTime Maybe    -- Invisible to enrolled participants before
+  lastEdit        UTCTime
+  UniqueMaterial course name
+MaterialFile -- a file that is part of a material distribution
+  material MaterialId
+  file     FileId
\ No newline at end of file
diff --git a/routes b/routes
index 0e801e22b..a86f39945 100644
--- a/routes
+++ b/routes
@@ -13,7 +13,7 @@
 --    !free           -- free for all
 --    !lecturer       -- lecturer    for this course (or for any school, if route is not connected to a course)
 --    !corrector      -- corrector   for this sheet  (or the submission, if route is connected to a submission, or the course, if route is not connected to a sheet, or any course, if route is not connected to a course)
---    !registered     -- participant for this course (no effect outside of courses)
+--    !registered     -- current user is participant for this course (no effect outside of courses)
 --    !participant    -- connected with a given course (not necessarily registered), i.e. has a submission, is a corrector, etc. (no effect outside of courses)
 --    !owner          -- part of the group of owners of this submission
 --    !self           -- route refers to the currently logged in user themselves
@@ -106,7 +106,12 @@
     /pseudonym                  SPseudonymR   GET POST        !registeredANDcorrector-submissions
     /corrector-invite/#UserEmail SCorrInviteR     GET POST
     !/#SheetFileType/*FilePath  SFileR        GET             !timeANDregistered !timeANDmaterials !corrector
-
+  /mat                          MaterialListR GET             !materials !registered !corrector
+  /mat/new                      MaterialNewR  GET POST
+  /mat/#MaterialName MaterialR:
+    /show                       MShowR        GET             !timeANDregistered !timeANDmaterials !corrector
+    /edit                       MEditR        GET POST
+    /delete                     MDelR         GET POST
 
 /subs  CorrectionsR GET POST !corrector !lecturer
 /subs/upload CorrectionsUploadR GET POST !corrector !lecturer
diff --git a/src/Application.hs b/src/Application.hs
index 5b130dd50..e1dc1904e 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -71,7 +71,7 @@ import qualified Data.Aeson as Aeson
 import System.Exit (exitFailure)
 
 import qualified Database.Memcached.Binary.IO as Memcached
-  
+
 -- Import all relevant handler modules here.
 -- (HPack takes care to add new modules to our cabal file nowadays.)
 import Handler.Common
@@ -87,6 +87,7 @@ import Handler.Course
 import Handler.Sheet
 import Handler.Submission
 import Handler.Corrections
+import Handler.Material
 import Handler.CryptoIDDispatch
 import Handler.SystemMessage
 
@@ -172,7 +173,7 @@ makeFoundation appSettings'@AppSettings{..} = do
         (pgPoolSize appDatabaseConf)
 
       ldapPool <- for appLdapConf $ \LdapConf{..} -> createLdapPool ldapHost ldapPort (poolStripes ldapPool) (poolTimeout ldapPool) ldapTimeout (poolLimit ldapPool)
-    
+
       -- Perform database migration using our application's logging settings.
       migrateAll `runSqlPool` sqlPool
       appCryptoIDKey <- clusterSetting (Proxy :: Proxy 'ClusterCryptoIDKey) `runSqlPool` sqlPool
@@ -205,7 +206,7 @@ clusterSetting proxy@(knownClusterSetting -> key) = do
       new <- initClusterSetting proxy
       void . insert $ ClusterConfig key (Aeson.toJSON new)
       return new
-  
+
 readInstanceIDFile :: MonadIO m => FilePath -> m UUID
 readInstanceIDFile idFile = liftIO . handle generateInstead $ LBS.readFile idFile >>= parseBS
   where
@@ -226,7 +227,7 @@ createSmtpPool SmtpConf{ smtpPool = ResourcePoolConf{..}, .. } = do
   let
     withLogging :: LoggingT IO a -> IO a
     withLogging = flip runLoggingT logFunc
-    
+
     mkConnection = withLogging $ do
       $logInfoS "SMTP" "Opening new connection"
       liftIO mkConnection'
@@ -346,7 +347,7 @@ appMain = runResourceT $ do
 --------------------------------------------------------------
 foundationStoreNum :: Word32
 foundationStoreNum = 2
-  
+
 getApplicationRepl :: (MonadResource m, MonadBaseControl IO m) => m (Int, UniWorX, Application)
 getApplicationRepl = do
     settings <- getAppDevSettings
@@ -357,7 +358,7 @@ getApplicationRepl = do
     let foundationStore = Store foundationStoreNum
     liftIO $ deleteStore foundationStore
     liftIO $ writeStore foundationStore foundation
-  
+
     return (getPort wsettings, foundation, app1)
 
 shutdownApp :: MonadIO m => UniWorX -> m ()
diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
new file mode 100644
index 000000000..b738e0105
--- /dev/null
+++ b/src/Handler/Material.hs
@@ -0,0 +1,73 @@
+module Handler.Material where
+
+import Import
+
+import Data.Set (Set)
+import qualified Data.Set as Set
+import qualified Data.Conduit.List as C
+
+import qualified Database.Esqueleto as E
+
+import Utils.Lens
+import Utils.Form
+import Handler.Utils.Form
+
+
+data MaterialForm = MaterialForm  {
+        mfName         :: MaterialName
+      , mfType         :: Maybe Text
+      , mfDescription  :: Maybe Html
+      , mfVisibleFrom  :: Maybe UTCTime
+      , mfFiles        :: Maybe (Source Handler (Either FileId File))
+      }
+
+makeMaterialForm :: CourseId -> Maybe MaterialForm -> Form MaterialForm
+makeMaterialForm cid template = identifyForm FIDmaterial $ \html -> do
+  MsgRenderer mr <- getMsgRenderer
+  let setIds :: Either FileId File -> Set FileId
+      setIds = either Set.singleton $ const Set.empty
+      oldFileIds
+        | Just source <- template >>= mfFiles
+                    = runConduit $ source .| C.foldMap setIds
+        | otherwise = return Set.empty
+      typeOptions :: WidgetT UniWorX IO (Set Text)
+      typeOptions = do
+        let defaults = Set.fromList $ map mr [MsgMaterialTypeSlides,MsgMaterialTypeCode,MsgMaterialTypeExample]
+        previouslyUsed <- liftHandlerT . runDB $
+          E.select $ E.from $ \material ->
+            E.distinctOnOrderBy [E.asc $ material E.^. MaterialType] $ do
+              E.where_ $ (material E.^. MaterialCourse E.==. E.val cid)
+                  E.&&.  (E.not_ $ E.isNothing $ material E.^. MaterialType)
+              return $ material E.^. MaterialType
+        return $ defaults <> (Set.fromList $ mapMaybe E.unValue previouslyUsed)
+
+  ctime <- liftIO $ getCurrentTime
+  flip (renderAForm FormStandard) html $ MaterialForm
+      <$> areq ciField        (fslI MsgMaterialName)         (mfName        <$> template)
+      <*> aopt (textField & addDatalist typeOptions)
+                              (fslpI MsgMaterialType $ mr MsgMaterialTypePlaceholder)
+                                                             (mfType        <$> template)
+      <*> aopt htmlField      (fslpI MsgMaterialDescription "Html")
+                                                             (mfDescription <$> template)
+      <*> aopt utcTimeField   (fslI MsgMaterialVisibleFrom
+            & setTooltip MsgMaterialVisibleFromTip)          ((mfVisibleFrom  <$> template) <|> pure (Just ctime))
+      <*> aopt (multiFileField oldFileIds)
+                              (fslI MsgMaterialFiles)        (mfFiles <$> template)
+
+getMaterialListR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
+getMaterialListR = error "unimplemented" -- TODO
+
+getMaterialNewR, postMaterialNewR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
+getMaterialNewR = postMaterialNewR
+postMaterialNewR = error "unimplemented" -- TODO
+
+getMShowR :: TermId -> SchoolId -> CourseShorthand -> MaterialName -> Handler Html
+getMShowR = error "unimplemented" -- TODO
+
+getMEditR, postMEditR :: TermId -> SchoolId -> CourseShorthand ->  MaterialName -> Handler Html
+getMEditR = postMEditR
+postMEditR = error "unimplemented" -- TODO
+
+getMDelR, postMDelR :: TermId -> SchoolId -> CourseShorthand ->  MaterialName -> Handler Html
+getMDelR = postMDelR
+postMDelR = error "unimplemented" -- TODO
\ No newline at end of file
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 5016f8662..92f79ed39 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -99,7 +99,8 @@ makeSheetForm msId template = identifyForm FIDsheet $ \html -> do
     ctime <- liftIO $ getCurrentTime
     (result, widget) <- flip (renderAForm FormStandard) html $ SheetForm
       <$> areq ciField        (fslI MsgSheetName)         (sfName        <$> template)
-      <*> aopt htmlField      (fslI MsgSheetDescription)  (sfDescription <$> template)
+      <*> aopt htmlField      (fslpI MsgSheetDescription "Html")
+                                                          (sfDescription <$> template)
       <*> sheetTypeAFormReq   (fslI MsgSheetType
             & setTooltip (uniworxMessages [MsgSheetTypeInfoBonus,MsgSheetTypeInfoNotGraded]))
                                                           (sfType        <$> template)
diff --git a/src/Model/Types.hs b/src/Model/Types.hs
index ab73b6ba7..05d063e6a 100644
--- a/src/Model/Types.hs
+++ b/src/Model/Types.hs
@@ -83,7 +83,7 @@ import Data.Text.Metrics (damerauLevenshtein)
 
 import Data.Binary (Binary)
 import qualified Data.Binary as Binary
-  
+
 
 instance PathPiece UUID where
   fromPathPiece = UUID.fromString . unpack
@@ -350,7 +350,7 @@ classifySubmissionMode (SubmissionMode False Nothing ) = SubmissionModeNone
 classifySubmissionMode (SubmissionMode True  Nothing ) = SubmissionModeCorrector
 classifySubmissionMode (SubmissionMode False (Just _)) = SubmissionModeUser
 classifySubmissionMode (SubmissionMode True  (Just _)) = SubmissionModeBoth
-  
+
 
 data ExamStatus = Attended | NoShow | Voided
   deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic)
@@ -880,6 +880,7 @@ type SchoolShorthand = CI Text
 type CourseName      = CI Text
 type CourseShorthand = CI Text
 type SheetName       = CI Text
+type MaterialName    = CI Text
 type UserEmail       = CI Email
 
 type PWHashAlgorithm = ByteString -> PWStore.Salt -> Int -> ByteString
diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index 25180df04..0cd5d0335 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -168,6 +168,7 @@ data FormIdentifier
   = FIDcourse
   | FIDcourseRegister
   | FIDsheet
+  | FIDmaterial
   | FIDsubmission
   | FIDsettings
   | FIDcorrectors

From 016566d06e533f8529d75eff1e01261024a27e75 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Thu, 25 Apr 2019 15:18:29 +0200
Subject: [PATCH 153/238] add toggle all checkbox and checked counter to
 recipientLayout

---
 messages/uniworx/de.msg                       |  1 +
 .../communication/recipientLayout.hamlet      | 14 ++--
 .../communication/recipientLayout.julius      | 73 ++++++++++++++++---
 .../communication/recipientLayout.lucius      | 18 +++++
 4 files changed, 90 insertions(+), 16 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index c29f933d6..1de52b772 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -775,6 +775,7 @@ CommSuccess n@Int: Nachricht wurde an #{tshow n} Empfänger versandt
 CommCourseHeading: Kursmitteilung
 
 RecipientCustom: Weitere Empfänger
+RecipientToggleAll: Alle/Keine
 
 RGCourseParticipants: Kursteilnehmer
 RGCourseLecturers: Kursverwalter
diff --git a/templates/widgets/communication/recipientLayout.hamlet b/templates/widgets/communication/recipientLayout.hamlet
index 646bc7e01..5f47cb7b7 100644
--- a/templates/widgets/communication/recipientLayout.hamlet
+++ b/templates/widgets/communication/recipientLayout.hamlet
@@ -3,18 +3,20 @@ $if not (null activeCategories)
   <div .recipient-categories>
     $forall category <- activeCategories
       <div .recipient-category>
-        <input type=checkbox id=#{checkedIdent category} :elem category checkedCategories:checked>
+        <input type=checkbox id=#{checkedIdent category} .recipient-category__checkbox :elem category checkedCategories:checked>
         <label .recipient-category__label for=#{checkedIdent category}>
           _{category}
 
         $if hasContent category
           <fieldset .recipient-category__fieldset uw-interactive-fieldset .interactive-fieldset__target data-conditional-input=#{checkedIdent category}>
             $if not (null (categoryIndices category))
-              $# TODO: unique id for this all/none checkbox
-              <input type=checkbox id=tbd .recipient-category__toggle-all>
-              <label for=tbd>Label
-              $forall optIx <- categoryIndices category
-                ^{cellWdgts ! optIx}
+              <div .recipient-category__checked-counter>
+              <div .recipient-category__toggle-all>
+                <input type=checkbox id=#{checkedIdent category}-toggle-all>
+                <label for=#{checkedIdent category}-toggle-all .recipient-category__option-label>_{MsgRecipientToggleAll}
+              <div .recipient-category__options>
+                $forall optIx <- categoryIndices category
+                  ^{cellWdgts ! optIx}
 
             $maybe addWdgt <- addWdgts !? (1, (EnumPosition category, 0))
               ^{addWdgt}
diff --git a/templates/widgets/communication/recipientLayout.julius b/templates/widgets/communication/recipientLayout.julius
index 87dfead6b..d2fc512ab 100644
--- a/templates/widgets/communication/recipientLayout.julius
+++ b/templates/widgets/communication/recipientLayout.julius
@@ -1,34 +1,87 @@
-// TODO: js utility to check all/none of the checkboxes in a recipient category at once
 (function() {
 
+  var MASS_INPUT_SELECTOR = '.massinput';
   var RECIPIENT_CATEGORIES_SELECTOR = '.recipient-categories';
   var RECIPIENT_CATEGORY_SELECTOR = '.recipient-category';
-  var RECIPIENT_CATEGORY_FIELDSET_SELECTOR = '.recipient-category__fieldset';
-  var RECIPIENT_CATEGORY_TOGGLE_ALL_SELECTOR = '.recipient-category__toggle-all';
+  var RECIPIENT_CATEGORY_CHECKBOX_SELECTOR = '.recipient-category__checkbox ';
+  var RECIPIENT_CATEGORY_OPTIONS_SELECTOR = '.recipient-category__options';
+  var RECIPIENT_CATEGORY_TOGGLE_ALL_SELECTOR = '.recipient-category__toggle-all [type="checkbox"]';
+  var RECIPIENT_CATEGORY_CHECKED_COUNTER_SELECTOR = '.recipient-category__checked-counter';
+
+  var massInputElement;
 
   document.addEventListener('DOMContentLoaded', function() {
-
     var recipientCategoriesElement = document.querySelector(RECIPIENT_CATEGORIES_SELECTOR);
-    var recipientCategoryElements = Array.from(recipientCategoriesElement.querySelectorAll(RECIPIENT_CATEGORY_SELECTOR));
+    massInputElement = recipientCategoriesElement.closest(MASS_INPUT_SELECTOR);
+
+    setupRecipientCategories();
+
+    var recipientObserver = new MutationObserver(setupRecipientCategories);
+    recipientObserver.observe(massInputElement, { childList: true });
+  });
+
+  function setupRecipientCategories() {
+    var recipientCategoryElements = Array.from(massInputElement.querySelectorAll(RECIPIENT_CATEGORY_SELECTOR));
 
     recipientCategoryElements.forEach(function(element) {
       setupRecipientCategory(element);
     });
-  });
+  }
 
   function setupRecipientCategory(recipientCategoryElement) {
-    var fieldset = recipientCategoryElement.querySelector(RECIPIENT_CATEGORY_FIELDSET_SELECTOR);
-    var categoryCheckboxes = Array.from(fieldset.querySelectorAll('[type="checkbox"]'));
+    var categoryCheckbox = recipientCategoryElement.querySelector(RECIPIENT_CATEGORY_CHECKBOX_SELECTOR);
+    var categoryOptions = recipientCategoryElement.querySelector(RECIPIENT_CATEGORY_OPTIONS_SELECTOR);
+    if (categoryOptions) {
 
-    if (categoryCheckboxes) {
+      var categoryCheckboxes = Array.from(categoryOptions.querySelectorAll('[type="checkbox"]'));
       var toggleAllCheckbox = recipientCategoryElement.querySelector(RECIPIENT_CATEGORY_TOGGLE_ALL_SELECTOR);
 
+      // setup category checkbox to toggle all child checkboxes if changed
+      categoryCheckbox.addEventListener('change', function() {
+        categoryCheckboxes.forEach(function(checkbox) {
+          checkbox.checked = categoryCheckbox.checked;
+        });
+        updateCheckedCounter(recipientCategoryElement, categoryCheckboxes);
+        updateToggleAllCheckbox(toggleAllCheckbox, categoryCheckboxes);
+      });
+
+      // update counter and toggle checkbox initially
+      updateCheckedCounter(recipientCategoryElement, categoryCheckboxes);
+      updateToggleAllCheckbox(toggleAllCheckbox, categoryCheckboxes);
+
+      // register change listener for individual checkboxes
+      categoryCheckboxes.forEach(function(checkbox) {
+        checkbox.addEventListener('change', function() {
+          updateCheckedCounter(recipientCategoryElement, categoryCheckboxes);
+          updateToggleAllCheckbox(toggleAllCheckbox, categoryCheckboxes);
+        });
+      });
+
+      // register change listener for toggle all checkbox
       if (toggleAllCheckbox) {
         toggleAllCheckbox.addEventListener('change', function() {
-          console.log('TBD: setting up toggle all checkbox');
+          categoryCheckboxes.forEach(function(checkbox) {
+            checkbox.checked = toggleAllCheckbox.checked;
+          });
+          updateCheckedCounter(recipientCategoryElement, categoryCheckboxes);
         });
       }
     }
   }
 
+  // update checked state of toggle all checkbox based on all other checkboxes
+  function updateToggleAllCheckbox(toggleAllCheckbox, categoryCheckboxes) {
+    var allChecked = categoryCheckboxes.reduce(function(acc, checkbox) {
+      return acc && checkbox.checked;
+    }, true);
+    toggleAllCheckbox.checked = allChecked;
+  }
+
+  // update value of checked counter
+  function updateCheckedCounter(recipientCategoryElement, categoryCheckboxes) {
+    var checkedCounter = recipientCategoryElement.querySelector(RECIPIENT_CATEGORY_CHECKED_COUNTER_SELECTOR);
+    var checkedCheckboxes = categoryCheckboxes.reduce(function(acc, checkbox) { return checkbox.checked ? acc + 1 : acc; }, 0);
+    checkedCounter.innerHTML = checkedCheckboxes + '/' + categoryCheckboxes.length;
+  }
+
 })();
diff --git a/templates/widgets/communication/recipientLayout.lucius b/templates/widgets/communication/recipientLayout.lucius
index df68114dd..a48065a68 100644
--- a/templates/widgets/communication/recipientLayout.lucius
+++ b/templates/widgets/communication/recipientLayout.lucius
@@ -32,6 +32,7 @@
   padding-left: 16px;
   max-height: 200px;
   overflow-y: auto;
+  position: relative;
 }
 
 .recipient-category__option-add {
@@ -42,3 +43,20 @@
     padding: 10px 0;
   }
 }
+
+.recipient-category__options + .recipient-category__option-add {
+  margin-top: 10px;
+}
+
+.recipient-category__toggle-all {
+  display: flex;
+  border-bottom: 1px solid #bcbcbc;
+  padding-bottom: 8px;
+  margin-bottom: 8px;
+}
+
+.recipient-category__checked-counter {
+  position: absolute;
+  right: 0;
+  top: 0;
+}

From 7f38137f5367bbca7ceb6a6b459a47cb92151ca4 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Thu, 25 Apr 2019 15:24:39 +0200
Subject: [PATCH 154/238] recipientLayout: restrict height of options instead
 of whole fieldset

---
 .../widgets/communication/recipientLayout.lucius      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/templates/widgets/communication/recipientLayout.lucius b/templates/widgets/communication/recipientLayout.lucius
index a48065a68..aa4cb072d 100644
--- a/templates/widgets/communication/recipientLayout.lucius
+++ b/templates/widgets/communication/recipientLayout.lucius
@@ -11,6 +11,11 @@
   }
 }
 
+.recipient-category__options {
+  max-height: 150px;
+  overflow-y: auto;
+}
+
 .recipient-category__option {
   display: flex;
 
@@ -30,8 +35,6 @@
   padding: 5px 0 10px;
   border-left: 1px solid #bcbcbc;
   padding-left: 16px;
-  max-height: 200px;
-  overflow-y: auto;
   position: relative;
 }
 
@@ -57,6 +60,6 @@
 
 .recipient-category__checked-counter {
   position: absolute;
-  right: 0;
-  top: 0;
+  right: 5px;
+  top: 5px;
 }

From 0a48f114f84a803e9dea9780c7b0a59a8e532cba Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 23 Apr 2019 14:20:14 +0200
Subject: [PATCH 155/238] styling for mass input add/delete buttons

---
 messages/uniworx/de.msg                      | 8 ++++----
 templates/widgets/massinput/massinput.lucius | 8 ++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 templates/widgets/massinput/massinput.lucius

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 7a8c55085..c8578e589 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -212,7 +212,7 @@ CorrectorAssignTitle: Korrektor zuweisen
 Unauthorized: Sie haben hierfür keine explizite Berechtigung.
 UnauthorizedAnd l@Text r@Text: (#{l} UND #{r})
 UnauthorizedOr  l@Text r@Text: (#{l} ODER #{r})
-UnauthorizedNoToken: Ihrer Anfrage war kein Authorisierungs-Token beigefügt. 
+UnauthorizedNoToken: Ihrer Anfrage war kein Authorisierungs-Token beigefügt.
 UnauthorizedTokenExpired: Ihr Authorisierungs-Token ist abgelaufen.
 UnauthorizedTokenNotStarted: Ihr Authorisierungs-Token ist noch nicht gültig.
 UnauthorizedTokenInvalid: Ihr Authorisierungs-Token konnte nicht verarbeitet werden.
@@ -760,8 +760,8 @@ DeleteConfirmationWrong: Bestätigung muss genau dem angezeigten Text entspreche
 
 DBTIRowsMissing n@Int: #{pluralDE n "Eine Zeile ist" "Einige Zeilen sind"} aus der Datenbank verschwunden, seit das Formular für Sie generiert wurde
 
-MassInputAddDimension: Hinzufügen
-MassInputDeleteCell: Entfernen
+MassInputAddDimension: +
+MassInputDeleteCell: -
 
 NavigationFavourites: Favoriten
 
@@ -792,4 +792,4 @@ CourseLecInviteExplanation: Sie wurden eingeladen, Verwalter für einen Kurs zu
 CorrectorInvitationAccepted shn@SheetName: Sie wurden als Korrektor für #{shn} eingetragen
 CorrectorInvitationDeclined shn@SheetName: Sie haben die Einladung, Korrektor für #{shn} zu werden, abgelehnt
 SheetCorrInviteHeading shn@SheetName: Einladung zum Korrektor für #{shn}
-SheetCorrInviteExplanation: Sie wurden eingeladen, Korrektor für ein Übungsblatt zu sein.
\ No newline at end of file
+SheetCorrInviteExplanation: Sie wurden eingeladen, Korrektor für ein Übungsblatt zu sein.
diff --git a/templates/widgets/massinput/massinput.lucius b/templates/widgets/massinput/massinput.lucius
new file mode 100644
index 000000000..a0d1208de
--- /dev/null
+++ b/templates/widgets/massinput/massinput.lucius
@@ -0,0 +1,8 @@
+.btn-mass-input-delete,
+.btn-mass-input-add {
+  background-color: #999;
+  min-width: auto;
+  padding: 5px 15px;
+  font-weight: 700;
+  font-size: 1.3rem;
+}

From 203347d28a51e02334f1b1fe9bd9d24c5f5718e5 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Tue, 23 Apr 2019 14:25:37 +0200
Subject: [PATCH 156/238] fix styling for mass input buttons

---
 templates/widgets/massinput/massinput.lucius | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/widgets/massinput/massinput.lucius b/templates/widgets/massinput/massinput.lucius
index a0d1208de..6af5274b0 100644
--- a/templates/widgets/massinput/massinput.lucius
+++ b/templates/widgets/massinput/massinput.lucius
@@ -1,7 +1,7 @@
-.btn-mass-input-delete,
-.btn-mass-input-add {
+.btn.btn-mass-input-delete,
+.btn.btn-mass-input-add {
   background-color: #999;
-  min-width: auto;
+  min-width: 50px;
   padding: 5px 15px;
   font-weight: 700;
   font-size: 1.3rem;

From e1f65a8399fd3344b11825f4a6ac362a5874b3d9 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 25 Apr 2019 15:43:05 +0200
Subject: [PATCH 157/238] systemd integration

---
 package.yaml       |  1 +
 src/Application.hs | 13 +++++++++++--
 stack.yaml         |  2 ++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/package.yaml b/package.yaml
index 47917503c..217f65626 100644
--- a/package.yaml
+++ b/package.yaml
@@ -121,6 +121,7 @@ dependencies:
   - jose-jwt
   - mono-traversable
   - lens-aeson
+  - systemd
 
 other-extensions:
   - GeneralizedNewtypeDeriving
diff --git a/src/Application.hs b/src/Application.hs
index 5b130dd50..ae1ca9dbd 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -24,7 +24,8 @@ import Language.Haskell.TH.Syntax           (qLocation)
 import Network.Wai (Middleware)
 import Network.Wai.Handler.Warp             (Settings, defaultSettings,
                                              defaultShouldDisplayException,
-                                             runSettings, setHost,
+                                             runSettings, runSettingsSocket, setHost,
+                                             setBeforeMainLoop,
                                              setOnException, setPort, getPort)
 import Network.Wai.Middleware.RequestLogger (Destination (Logger),
                                              IPAddrSource (..),
@@ -71,6 +72,8 @@ import qualified Data.Aeson as Aeson
 import System.Exit (exitFailure)
 
 import qualified Database.Memcached.Binary.IO as Memcached
+
+import qualified System.Systemd.Daemon as Systemd
   
 -- Import all relevant handler modules here.
 -- (HPack takes care to add new modules to our cabal file nowadays.)
@@ -291,6 +294,7 @@ warpSettings :: UniWorX -> Settings
 warpSettings foundation = defaultSettings
     & setPort (foundation ^. _appPort)
     & setHost (foundation ^. _appHost)
+    & setBeforeMainLoop (void Systemd.notifyReady)
     & setOnException (\_req e ->
         when (defaultShouldDisplayException e) $ do
           logger <- readTVarIO . snd $ appLogger foundation
@@ -338,7 +342,12 @@ appMain = runResourceT $ do
     app <- makeApplication foundation
 
     -- Run the application with Warp
-    liftIO $ runSettings (warpSettings foundation) app
+    activatedSockets <- liftIO Systemd.getActivatedSockets
+    liftIO $ case activatedSockets of
+      Just [sock]
+        -> runSettingsSocket (warpSettings foundation) sock app
+      _other
+        -> runSettings (warpSettings foundation) app
 
 
 --------------------------------------------------------------
diff --git a/stack.yaml b/stack.yaml
index 94be126d8..df8eb7fb3 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -49,4 +49,6 @@ extra-deps:
   - quickcheck-classes-0.4.14
   - semirings-0.2.1.1
 
+  - systemd-1.1.2
+
 resolver: lts-10.5

From 53db7803b70bd7253994b2d8ae32377006c8f3dd Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 26 Apr 2019 13:22:20 +0200
Subject: [PATCH 158/238] Debugging for socket bind

---
 package.yaml       |  2 ++
 src/Application.hs | 39 +++++++++++++++++++++++++++------------
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/package.yaml b/package.yaml
index 217f65626..470e510db 100644
--- a/package.yaml
+++ b/package.yaml
@@ -122,6 +122,8 @@ dependencies:
   - mono-traversable
   - lens-aeson
   - systemd
+  - lifted-async
+  - streaming-commons
 
 other-extensions:
   - GeneralizedNewtypeDeriving
diff --git a/src/Application.hs b/src/Application.hs
index ae1ca9dbd..b214df5ad 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -24,9 +24,10 @@ import Language.Haskell.TH.Syntax           (qLocation)
 import Network.Wai (Middleware)
 import Network.Wai.Handler.Warp             (Settings, defaultSettings,
                                              defaultShouldDisplayException,
-                                             runSettings, runSettingsSocket, setHost,
+                                             runSettingsSocket, setHost,
                                              setBeforeMainLoop,
                                              setOnException, setPort, getPort)
+import Data.Streaming.Network               (bindPortTCP)
 import Network.Wai.Middleware.RequestLogger (Destination (Logger),
                                              IPAddrSource (..),
                                              OutputFormat (..), destination,
@@ -74,6 +75,7 @@ import System.Exit (exitFailure)
 import qualified Database.Memcached.Binary.IO as Memcached
 
 import qualified System.Systemd.Daemon as Systemd
+import Control.Concurrent.Async.Lifted.Safe (async, waitAnyCancel)
   
 -- Import all relevant handler modules here.
 -- (HPack takes care to add new modules to our cabal file nowadays.)
@@ -292,9 +294,9 @@ makeLogWare app = do
 -- | Warp settings for the given foundation value.
 warpSettings :: UniWorX -> Settings
 warpSettings foundation = defaultSettings
-    & setPort (foundation ^. _appPort)
-    & setHost (foundation ^. _appHost)
     & setBeforeMainLoop (void Systemd.notifyReady)
+    & setHost (foundation ^. _appHost)
+    & setPort (foundation ^. _appPort)
     & setOnException (\_req e ->
         when (defaultShouldDisplayException e) $ do
           logger <- readTVarIO . snd $ appLogger foundation
@@ -337,17 +339,30 @@ appMain = runResourceT $ do
 
     -- Generate the foundation from the settings
     foundation <- makeFoundation settings
+  
+    let logFunc loc src lvl str = do
+          f <- messageLoggerSource foundation <$> readTVarIO (snd $ foundation ^. _appLogger)
+          f loc src lvl str
 
-    -- Generate a WAI Application from the foundation
-    app <- makeApplication foundation
+    flip runLoggingT logFunc $ do
+      -- Generate a WAI Application from the foundation
+      app <- makeApplication foundation
 
-    -- Run the application with Warp
-    activatedSockets <- liftIO Systemd.getActivatedSockets
-    liftIO $ case activatedSockets of
-      Just [sock]
-        -> runSettingsSocket (warpSettings foundation) sock app
-      _other
-        -> runSettings (warpSettings foundation) app
+      -- Run the application with Warp
+      activatedSockets <- liftIO Systemd.getActivatedSocketsWithNames
+      sockets <- case activatedSockets of
+        Just socks@(_ : _) -> do
+          $logInfoS "bind" [st|Ignoring configuration and listening on #{tshow (fmap snd socks)}|]
+          return $ fmap fst socks
+        _other -> do
+          let
+            host = foundation ^. _appHost
+            port = foundation ^. _appPort
+          $logInfoS "bind" [st|Listening on #{tshow host} port #{tshow port} as per configuration|]
+          liftIO $ pure <$> bindPortTCP port host
+
+      let runWarp socket = runSettingsSocket (warpSettings foundation) socket app
+      liftIO $ void . waitAnyCancel =<< mapM (async . runWarp) sockets
 
 
 --------------------------------------------------------------

From 60d6d2eda5bbf10b5d7e5dc2df4e67e366298465 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 27 Apr 2019 10:24:47 +0200
Subject: [PATCH 159/238] printf debugging

---
 src/Application.hs | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/Application.hs b/src/Application.hs
index b214df5ad..f5cbbde08 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -164,22 +164,31 @@ makeFoundation appSettings'@AppSettings{..} = do
           f loc src lvl str
 
     flip runLoggingT logFunc $ do
-      $logDebugS "InstanceID" $ UUID.toText appInstanceID
+      $logInfoS "InstanceID" $ UUID.toText appInstanceID
       -- logDebugS "Configuration" $ tshow appSettings'
 
-      smtpPool <- traverse createSmtpPool appSmtpConf
+      smtpPool <- for appSmtpConf $ \c -> do
+        $logDebugS "setup" "SMTP-Pool"
+        createSmtpPool
 
-      appWidgetMemcached <- traverse createWidgetMemcached appWidgetMemcachedConf
+      appWidgetMemcached <- for appWdigetMemcachedConf $ \c -> do
+        $logDebugS "setup" "Widget-Memcached"
+        createWidgetMemcached
 
       -- Create the database connection pool
+      $logDebugS "setup" "PostgreSQL-Pool"
       sqlPool <- createPostgresqlPool
         (pgConnStr  appDatabaseConf)
         (pgPoolSize appDatabaseConf)
 
-      ldapPool <- for appLdapConf $ \LdapConf{..} -> createLdapPool ldapHost ldapPort (poolStripes ldapPool) (poolTimeout ldapPool) ldapTimeout (poolLimit ldapPool)
+      ldapPool <- for appLdapConf $ \LdapConf{..} -> do
+        $logDebugS "setup" "LDAP-Pool"
+        createLdapPool ldapHost ldapPort (poolStripes ldapPool) (poolTimeout ldapPool) ldapTimeout (poolLimit ldapPool)
     
       -- Perform database migration using our application's logging settings.
+      $logDebugS "setup" "Migration"
       migrateAll `runSqlPool` sqlPool
+      $logDebugS "setup" "Cluster-Config"
       appCryptoIDKey <- clusterSetting (Proxy :: Proxy 'ClusterCryptoIDKey) `runSqlPool` sqlPool
       appSessionKey <- clusterSetting (Proxy :: Proxy 'ClusterClientSessionKey) `runSqlPool` sqlPool
       appSecretBoxKey <- clusterSetting (Proxy :: Proxy 'ClusterSecretBoxKey) `runSqlPool` sqlPool
@@ -187,9 +196,11 @@ makeFoundation appSettings'@AppSettings{..} = do
 
       let foundation = mkFoundation sqlPool smtpPool ldapPool appCryptoIDKey appSessionKey appSecretBoxKey appWidgetMemcached appJSONWebKeySet
 
+      $logDebugS "setup" "Job-Handling"
       handleJobs foundation
 
       -- Return the foundation
+      $logDebugS "setup" "Done"
       return foundation
 
 clusterSetting :: forall key m p.

From 996d04574f8dbff923efa1930ff889554ebb8460 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 27 Apr 2019 10:28:25 +0200
Subject: [PATCH 160/238] Fix build

---
 src/Application.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Application.hs b/src/Application.hs
index f5cbbde08..d3e6f83df 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -169,11 +169,11 @@ makeFoundation appSettings'@AppSettings{..} = do
 
       smtpPool <- for appSmtpConf $ \c -> do
         $logDebugS "setup" "SMTP-Pool"
-        createSmtpPool
+        createSmtpPool c
 
-      appWidgetMemcached <- for appWdigetMemcachedConf $ \c -> do
+      appWidgetMemcached <- for appWidgetMemcachedConf $ \c -> do
         $logDebugS "setup" "Widget-Memcached"
-        createWidgetMemcached
+        createWidgetMemcached c
 
       -- Create the database connection pool
       $logDebugS "setup" "PostgreSQL-Pool"

From 87ecacbcce6d56ee490c5801ec12e91b5f1d10a0 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 27 Apr 2019 10:50:35 +0200
Subject: [PATCH 161/238] More printf debugging

---
 src/Model/Migration.hs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Model/Migration.hs b/src/Model/Migration.hs
index b8d960301..9897339e1 100644
--- a/src/Model/Migration.hs
+++ b/src/Model/Migration.hs
@@ -52,23 +52,28 @@ share [mkPersist sqlSettings, mkMigrate "migrateDBVersioning"]
 
 migrateAll :: (MonadLogger m, MonadBaseControl IO m, MonadIO m) => ReaderT SqlBackend m ()
 migrateAll = do
+  $logDebugS "Migration" "Initial migration"
   mapM_ ($logInfoS "Migration") <=< runMigrationSilent $ do
     -- Manual migrations to go to InitialVersion below:
     migrateEnableExtension "citext"
 
     migrateDBVersioning
 
-  appliedMigrations <- map entityKey <$> selectList [] []
+  $logDebugS "Migration" "Retrieve applied migrations"
+  appliedMigrations <- selectKeysList [] []
   let
     missingMigrations = customMigrations `Map.withoutKeys` Set.fromList appliedMigrations
     doCustomMigration acc desc migration = acc <* do
       let AppliedMigrationKey appliedMigrationFrom appliedMigrationTo = desc
+      $logInfoS "Migration" [st|#{tshow appliedMigrationFrom} -> #{tshow appliedMigrationTo}|]
       appliedMigrationTime <- liftIO getCurrentTime
       _ <- migration
       insert AppliedMigration{..} 
   -- Map.foldlWithKey traverses migrations in ascending order of AppliedMigrationKey
+  $logDebugS "Migration" "Apply missing migrations"
   Map.foldlWithKey doCustomMigration (return ()) missingMigrations 
   
+  $logDebugS "Migration" "Persistent automatic migration"
   mapM_ ($logInfoS "Migration") =<< runMigrationSilent migrateAll'
 
 {-

From 0ec3729005b7b9ffa8d57dfafe857932cac40b3b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 27 Apr 2019 10:53:13 +0200
Subject: [PATCH 162/238] Fix build

---
 src/Model/Migration.hs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Model/Migration.hs b/src/Model/Migration.hs
index 9897339e1..c111e2412 100644
--- a/src/Model/Migration.hs
+++ b/src/Model/Migration.hs
@@ -21,6 +21,8 @@ import Database.Persist.Postgresql
 import Text.Read (readMaybe)
 import Data.CaseInsensitive (CI)
 
+import Text.Shakespeare.Text (st)
+
 -- Database versions must follow https://pvp.haskell.org:
 --   - Breaking changes are instances where manual migration is necessary (via customMigrations; i.e. changing a columns format)
 --   - Non-breaking changes are instances where the automatic migration done by persistent is sufficient (i.e. adding a column or table)

From dd30a97bfa2b3c913d84d34b01c05248549e3f85 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 27 Apr 2019 14:17:13 +0200
Subject: [PATCH 163/238] Minor cleanup

---
 build.sh           |  2 +-
 src/Application.hs | 30 ++++++++++++++++++------------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/build.sh b/build.sh
index 962ccc1ee..9b4f5a2e2 100755
--- a/build.sh
+++ b/build.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-exec -- stack build --fast --flag uniworx:-library-only --flag uniworx:dev
+exec -- stack build --fast --flag uniworx:-library-only --flag uniworx:dev $@
 echo Build task completed.
diff --git a/src/Application.hs b/src/Application.hs
index d3e6f83df..3e5ace925 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -159,11 +159,8 @@ makeFoundation appSettings'@AppSettings{..} = do
           (error "secretBoxKey forced in tempFoundation")
           (error "widgetMemcached forced in tempFoundation")
           (error "JSONWebKeySet forced in tempFoundation")
-        logFunc loc src lvl str = do
-          f <- messageLoggerSource tempFoundation <$> readTVarIO (snd appLogger)
-          f loc src lvl str
 
-    flip runLoggingT logFunc $ do
+    runAppLoggingT tempFoundation $ do
       $logInfoS "InstanceID" $ UUID.toText appInstanceID
       -- logDebugS "Configuration" $ tshow appSettings'
 
@@ -203,6 +200,13 @@ makeFoundation appSettings'@AppSettings{..} = do
       $logDebugS "setup" "Done"
       return foundation
 
+runAppLoggingT :: UniWorX -> LoggingT m a -> m a
+runAppLoggingT app@(appLogger -> (_, loggerTVar)) = flip runLoggingT logFunc
+  where
+    logFunc loc src lvl str = do
+      f <- messageLoggerSource app <$> readTVarIO loggerTVar
+      f loc src lvl str
+
 clusterSetting :: forall key m p.
                   ( MonadIO m
                   , ClusterSetting key
@@ -305,7 +309,10 @@ makeLogWare app = do
 -- | Warp settings for the given foundation value.
 warpSettings :: UniWorX -> Settings
 warpSettings foundation = defaultSettings
-    & setBeforeMainLoop (void Systemd.notifyReady)
+    & setBeforeMainLoop (runAppLoggingT foundation $ do
+                            $logInfoS "setup" "Ready"
+                            void $ liftIO Systemd.notifyReady
+                        )
     & setHost (foundation ^. _appHost)
     & setPort (foundation ^. _appPort)
     & setOnException (\_req e ->
@@ -351,11 +358,7 @@ appMain = runResourceT $ do
     -- Generate the foundation from the settings
     foundation <- makeFoundation settings
   
-    let logFunc loc src lvl str = do
-          f <- messageLoggerSource foundation <$> readTVarIO (snd $ foundation ^. _appLogger)
-          f loc src lvl str
-
-    flip runLoggingT logFunc $ do
+    runAppLoggingT foundation $ do
       -- Generate a WAI Application from the foundation
       app <- makeApplication foundation
 
@@ -364,7 +367,7 @@ appMain = runResourceT $ do
       sockets <- case activatedSockets of
         Just socks@(_ : _) -> do
           $logInfoS "bind" [st|Ignoring configuration and listening on #{tshow (fmap snd socks)}|]
-          return $ fmap fst socks
+          return $ fst <$> socks
         _other -> do
           let
             host = foundation ^. _appHost
@@ -373,7 +376,10 @@ appMain = runResourceT $ do
           liftIO $ pure <$> bindPortTCP port host
 
       let runWarp socket = runSettingsSocket (warpSettings foundation) socket app
-      liftIO $ void . waitAnyCancel =<< mapM (async . runWarp) sockets
+      case sockets of
+        []  -> $logErrorS "bind" "No sockets to listen on"
+        [s] -> liftIO $ runWarp s
+        ss  -> liftIO $ void . waitAnyCancel =<< mapM (async . runWarp) ss
 
 
 --------------------------------------------------------------

From 80cf36bc3743b735b2a2477b30ab26808ac0c3e9 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Sat, 27 Apr 2019 14:46:08 +0200
Subject: [PATCH 164/238] Rounded time for visibility defaults

---
 src/Handler/Material.hs       |  6 +++---
 src/Handler/Sheet.hs          |  2 +-
 src/Handler/Utils/DateTime.hs | 15 +++++++++++++++
 src/Utils.hs                  | 13 ++++++++++++-
 4 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index b738e0105..b644fe3f4 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -10,7 +10,7 @@ import qualified Database.Esqueleto as E
 
 import Utils.Lens
 import Utils.Form
-import Handler.Utils.Form
+import Handler.Utils
 
 
 data MaterialForm = MaterialForm  {
@@ -41,7 +41,7 @@ makeMaterialForm cid template = identifyForm FIDmaterial $ \html -> do
               return $ material E.^. MaterialType
         return $ defaults <> (Set.fromList $ mapMaybe E.unValue previouslyUsed)
 
-  ctime <- liftIO $ getCurrentTime
+  ctime <- ceilingQuarterHour <$> liftIO getCurrentTime
   flip (renderAForm FormStandard) html $ MaterialForm
       <$> areq ciField        (fslI MsgMaterialName)         (mfName        <$> template)
       <*> aopt (textField & addDatalist typeOptions)
@@ -50,7 +50,7 @@ makeMaterialForm cid template = identifyForm FIDmaterial $ \html -> do
       <*> aopt htmlField      (fslpI MsgMaterialDescription "Html")
                                                              (mfDescription <$> template)
       <*> aopt utcTimeField   (fslI MsgMaterialVisibleFrom
-            & setTooltip MsgMaterialVisibleFromTip)          ((mfVisibleFrom  <$> template) <|> pure (Just ctime))
+            & setTooltip MsgMaterialVisibleFromTip)         ((mfVisibleFrom  <$> template) <|> pure (Just ctime))
       <*> aopt (multiFileField oldFileIds)
                               (fslI MsgMaterialFiles)        (mfFiles <$> template)
 
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 92f79ed39..bd65e4d09 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -96,7 +96,7 @@ makeSheetForm msId template = identifyForm FIDsheet $ \html -> do
       Nothing    -> return $ partitionFileType mempty
       (Just sId) -> liftHandlerT $ runDB $ getFtIdMap sId
     mr <- getMsgRenderer
-    ctime <- liftIO $ getCurrentTime
+    ctime <- ceilingQuarterHour <$> liftIO getCurrentTime
     (result, widget) <- flip (renderAForm FormStandard) html $ SheetForm
       <$> areq ciField        (fslI MsgSheetName)         (sfName        <$> template)
       <*> aopt htmlField      (fslpI MsgSheetDescription "Html")
diff --git a/src/Handler/Utils/DateTime.hs b/src/Handler/Utils/DateTime.hs
index 15ecfc780..8c42f549d 100644
--- a/src/Handler/Utils/DateTime.hs
+++ b/src/Handler/Utils/DateTime.hs
@@ -9,6 +9,7 @@ module Handler.Utils.DateTime
   , addOneWeek, addWeeks
   , weeksToAdd
   , setYear
+  , ceilingQuarterHour
   ) where
 
 import Import
@@ -185,3 +186,17 @@ weeksToAdd old new = loop 0 old
     loop n t
       | t > new   = n
       | otherwise = loop (succ n) (addOneWeek t)
+
+-- | round up the next full quarter hour with a margin of at least 5 minutes
+ceilingQuarterHour :: UTCTime -> UTCTime
+ceilingQuarterHour = ceilingMinuteBy 5 15
+
+-- | round up the next full @roundto@ minutes with a margin of at least @margin@ minutes
+ceilingMinuteBy :: Int -> Int -> UTCTime -> UTCTime
+ceilingMinuteBy margin roundto utct = addUTCTime bonus utct
+  where
+    oldTime = localTimeOfDay $ utcToLocalTime utct
+    oldMin  = todMin  oldTime
+    newMin  = roundToNearestMultiple roundto $ oldMin + margin
+    newTime = oldTime { todMin = newMin, todSec = 0} -- might be invalid, but correctly treated by `timeOfDayToTime`
+    bonus   = realToFrac $ (timeOfDayToTime newTime) - (timeOfDayToTime oldTime)
\ No newline at end of file
diff --git a/src/Utils.hs b/src/Utils.hs
index 40fa580ee..3ac062bcf 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -269,6 +269,17 @@ notUsedT = notUsed
 
 
 
+-------------
+-- Numeric --
+-------------
+
+-- | round n to nearest multiple of m
+roundToNearestMultiple :: Int -> Int -> Int
+roundToNearestMultiple m n = (n `div` m + 1) * m
+
+
+
+
 ------------
 -- Monoid --
 ------------
@@ -495,7 +506,7 @@ maybeMExceptT err act = lift act >>= maybe (lift err >>= throwE) return
 
 maybeTExceptT :: Monad m => e -> MaybeT m b -> ExceptT e m b
 maybeTExceptT err act = maybeExceptT err $ runMaybeT act
-  
+
 maybeTMExceptT :: Monad m => m e -> MaybeT m b -> ExceptT e m b
 maybeTMExceptT err act = maybeMExceptT err $ runMaybeT act
 

From 212533d88e4cc68d711839ebc207362ce65aa4e9 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Sat, 27 Apr 2019 20:33:28 +0200
Subject: [PATCH 165/238] Stubs expanded

---
 messages/uniworx/de.msg |  4 +++
 src/Handler/Material.hs | 62 ++++++++++++++++++++++++++++++++++++-----
 2 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index ca9cab2a8..a13812838 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -218,6 +218,10 @@ MaterialDescription: Beschreibung
 MaterialVisibleFrom: Sichtbar für Teilnehmer ab
 MaterialVisibleFromTip: Ohne Datum nie sichtbar für Teilnehmer; leer lassen ist nur sinnvoll für unfertige Materialien oder zur ausschließlichen Verteilung an Korrektoren
 MaterialFiles: Dateien
+MaterialNewHeading: Neues Material veröffentlichen
+MaterialNewTitle: Neues Material
+MaterialEditHeading name@Text: Material "#{name}" editieren
+MaterialEditTitle name@Text: Material "#{name}" editieren
 
 
 Unauthorized: Sie haben hierfür keine explizite Berechtigung.
diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index b644fe3f4..754672053 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -5,6 +5,7 @@ import Import
 import Data.Set (Set)
 import qualified Data.Set as Set
 import qualified Data.Conduit.List as C
+import qualified Data.CaseInsensitive as CI
 
 import qualified Database.Esqueleto as E
 
@@ -13,8 +14,8 @@ import Utils.Form
 import Handler.Utils
 
 
-data MaterialForm = MaterialForm  {
-        mfName         :: MaterialName
+data MaterialForm = MaterialForm
+      { mfName         :: MaterialName
       , mfType         :: Maybe Text
       , mfDescription  :: Maybe Html
       , mfVisibleFrom  :: Maybe UTCTime
@@ -57,16 +58,63 @@ makeMaterialForm cid template = identifyForm FIDmaterial $ \html -> do
 getMaterialListR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getMaterialListR = error "unimplemented" -- TODO
 
-getMaterialNewR, postMaterialNewR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
-getMaterialNewR = postMaterialNewR
-postMaterialNewR = error "unimplemented" -- TODO
 
 getMShowR :: TermId -> SchoolId -> CourseShorthand -> MaterialName -> Handler Html
 getMShowR = error "unimplemented" -- TODO
 
-getMEditR, postMEditR :: TermId -> SchoolId -> CourseShorthand ->  MaterialName -> Handler Html
+getMEditR, postMEditR :: TermId -> SchoolId -> CourseShorthand -> MaterialName -> Handler Html
 getMEditR = postMEditR
-postMEditR = error "unimplemented" -- TODO
+postMEditR tid ssh csh mnm = do
+  (cid, Entity mid Material{..}, files) <- runDB $ do
+    [(E.Value cid, matEnt)] <- E.select . E.from  $ -- uniqueness guaranteed
+      \(course `E.InnerJoin` material) -> do
+        E.on     $ course   E.^. CourseId   E.==.   material E.^. MaterialCourse
+        E.where_ $ course   E.^. CourseTerm      E.==. E.val tid
+            E.&&.  course   E.^. CourseSchool    E.==. E.val ssh
+            E.&&.  course   E.^. CourseShorthand E.==. E.val csh
+            E.&&.  material E.^. MaterialName    E.==. E.val mnm
+        return (course E.^. CourseId, material)
+    fileIds <- E.select . E.from $ \(matFile `E.InnerJoin` file) -> do
+      E.on     $ matFile  E.^. MaterialFileFile     E.==. file E.^. FileId
+      E.where_ $ matFile  E.^. MaterialFileMaterial E.==. E.val (entityKey matEnt)
+      return $ file E.^. FileId
+    return (cid, matEnt, (Left . E.unValue) <$> fileIds)
+  let template = Just $ MaterialForm
+        { mfName         = materialName
+        , mfType         = materialType
+        , mfDescription  = materialDescription
+        , mfVisibleFrom  = materialVisibleFrom
+        , mfFiles        = Just $ yieldMany files
+        }
+  editWidget <- handleMaterialEdit tid ssh csh template
+  let headingLong  = prependCourseTitle tid ssh csh $ MsgMaterialEditHeading $ CI.original mnm
+      headingShort = prependCourseTitle tid ssh csh $ MsgMaterialEditTitle   $ CI.original mnm
+  siteLayoutMsg headingLong $ do
+    setTitleI headingShort
+    editWidget
+
+
+getMaterialNewR, postMaterialNewR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
+getMaterialNewR = postMaterialNewR
+postMaterialNewR tid ssh csh = do
+  editWidget <- handleMaterialEdit tid ssh csh Nothing
+  let headingLong  = prependCourseTitle tid ssh csh MsgMaterialNewHeading
+      headingShort = prependCourseTitle tid ssh csh MsgMaterialNewTitle
+  siteLayoutMsg headingLong $ do
+    setTitleI headingShort
+    editWidget
+
+handleMaterialEdit :: TermId -> SchoolId -> CourseShorthand -> Maybe MaterialForm -> Handler Widget
+handleMaterialEdit tid ssh csh template = do
+  aid  <- requireAuthId
+  Entity cid _ <- runDB . getBy404 $ TermSchoolCourseShort tid ssh csh
+  ((res,formWidget), formEnctype) <- runFormPost $ makeMaterialForm cid template
+  actionUrl <- fromMaybe (CourseR tid ssh csh MaterialNewR) <$> getCurrentRoute
+  return $ wrapForm formWidget def
+      { formAction = Just $ SomeRoute actionUrl
+      , formEncoding = formEnctype
+      }
+
 
 getMDelR, postMDelR :: TermId -> SchoolId -> CourseShorthand ->  MaterialName -> Handler Html
 getMDelR = postMDelR

From 64c45c515ece92cc8822b31aaba0d9ccddede4e1 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 29 Apr 2019 00:20:34 +0200
Subject: [PATCH 166/238] Tutorials

---
 db.sh                                         |   2 +
 messages/uniworx/de.msg                       |  81 +++-
 models/rooms                                  |  32 --
 models/tutorials                              |  27 +-
 package.yaml                                  |   1 +
 routes                                        |  26 +-
 src/Application.hs                            |   1 +
 src/Database/Esqueleto/Utils.hs               |  12 +-
 src/Foundation.hs                             | 174 +++++++-
 src/Handler/Admin.hs                          |   2 +-
 src/Handler/Corrections.hs                    |   2 +-
 src/Handler/Course.hs                         | 157 +++++++-
 src/Handler/Tutorial.hs                       | 376 ++++++++++++++++++
 src/Handler/Utils/Communication.hs            |   3 +-
 src/Handler/Utils/DateTime.hs                 |   5 +
 src/Handler/Utils/Delete.hs                   |   2 +-
 src/Handler/Utils/Form.hs                     |  33 +-
 src/Handler/Utils/Form/MassInput.hs           |  88 +++-
 src/Handler/Utils/Form/Occurences.hs          | 122 ++++++
 src/Handler/Utils/Sheet.hs                    |   2 +-
 src/Handler/Utils/Submission.hs               |  29 +-
 src/Handler/Utils/Table/Cells.hs              |  20 +
 src/Handler/Utils/Table/Pagination.hs         |  57 ++-
 src/Handler/Utils/Tutorial.hs                 |  47 +++
 src/Handler/Utils/Zip.hs                      |   2 +-
 src/Import/NoFoundation.hs                    |  11 +-
 src/Jobs.hs                                   |   1 -
 src/Jobs/Crontab.hs                           |   1 -
 src/Jobs/Queue.hs                             |   4 +-
 src/Model.hs                                  |   1 +
 src/Model/Migration.hs                        |  17 +
 src/Model/Types.hs                            |  56 ++-
 src/Time/Types/Instances.hs                   |  19 +
 src/Utils/Form.hs                             |  21 +-
 src/Utils/Lens.hs                             |  11 +
 src/Utils/Occurences.hs                       |  84 ++++
 static/css/utils/tooltip.scss                 |   8 +
 static/js/utils/form.js                       |   4 +
 templates/course.hamlet                       |  59 ++-
 templates/tutorial-edit.hamlet                |   2 +
 templates/tutorial-list.hamlet                |   2 +
 templates/tutorial-new.hamlet                 |   2 +
 templates/tutorial-participants.hamlet        |   2 +
 templates/tutorial/tutorMassInput/add.hamlet  |   6 +
 .../tutorial/tutorMassInput/cellKnown.hamlet  |   3 +
 .../tutorial/tutorMassInput/layout.hamlet     |  11 +
 templates/widgets/occurence/cell.hamlet       |  12 +
 .../occurence/cell/except-no-occur.hamlet     |   2 +
 .../occurence/cell/except-occur.hamlet        |   2 +
 .../widgets/occurence/cell/weekly.hamlet      |   2 +
 .../widgets/occurence/form/except-add.hamlet  |   5 +
 .../occurence/form/except-layout.hamlet       |  11 +
 .../occurence/form/except-no-occur.hamlet     |   5 +
 .../occurence/form/except-occur.hamlet        |   5 +
 .../occurence/form/scheduled-add.hamlet       |   5 +
 .../occurence/form/scheduled-layout.hamlet    |  11 +
 .../widgets/occurence/form/weekly.hamlet      |   5 +
 test/Database.hs                              |  37 +-
 58 files changed, 1566 insertions(+), 164 deletions(-)
 delete mode 100644 models/rooms
 create mode 100644 src/Handler/Tutorial.hs
 create mode 100644 src/Handler/Utils/Form/Occurences.hs
 create mode 100644 src/Handler/Utils/Tutorial.hs
 create mode 100644 src/Time/Types/Instances.hs
 create mode 100644 src/Utils/Occurences.hs
 create mode 100644 templates/tutorial-edit.hamlet
 create mode 100644 templates/tutorial-list.hamlet
 create mode 100644 templates/tutorial-new.hamlet
 create mode 100644 templates/tutorial-participants.hamlet
 create mode 100644 templates/tutorial/tutorMassInput/add.hamlet
 create mode 100644 templates/tutorial/tutorMassInput/cellKnown.hamlet
 create mode 100644 templates/tutorial/tutorMassInput/layout.hamlet
 create mode 100644 templates/widgets/occurence/cell.hamlet
 create mode 100644 templates/widgets/occurence/cell/except-no-occur.hamlet
 create mode 100644 templates/widgets/occurence/cell/except-occur.hamlet
 create mode 100644 templates/widgets/occurence/cell/weekly.hamlet
 create mode 100644 templates/widgets/occurence/form/except-add.hamlet
 create mode 100644 templates/widgets/occurence/form/except-layout.hamlet
 create mode 100644 templates/widgets/occurence/form/except-no-occur.hamlet
 create mode 100644 templates/widgets/occurence/form/except-occur.hamlet
 create mode 100644 templates/widgets/occurence/form/scheduled-add.hamlet
 create mode 100644 templates/widgets/occurence/form/scheduled-layout.hamlet
 create mode 100644 templates/widgets/occurence/form/weekly.hamlet

diff --git a/db.sh b/db.sh
index b05463c3a..3d80bf68f 100755
--- a/db.sh
+++ b/db.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
 # Options: see /test/Database.hs (Main)
+set -e
+
 stack build --fast --flag uniworx:-library-only --flag uniworx:dev
 stack exec uniworxdb -- $@
diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 2198f54b8..801076f6a 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -69,10 +69,12 @@ CourseShort: Kürzel
 CourseCapacity: Kapazität
 CourseCapacityTip: Anzahl erlaubter Kursanmeldungen, leer lassen für unbeschränkte Kurskapazität
 CourseNoCapacity: In diesem Kurs sind keine Plätze mehr frei.
+TutorialNoCapacity: In dieser Übung sind keine Plätze mehr frei.
 CourseNotEmpty: In diesem Kurs sind momentan Teilnehmer angemeldet.
 CourseRegisterOk: Anmeldung erfolgreich
 CourseDeregisterOk: Erfolgreich abgemeldet
 CourseStudyFeature: Assoziiertes Hauptfach
+CourseTutorial: Tutorium
 CourseStudyFeatureTooltip: Korrekte Angabe kann Notenweiterleitungen beschleunigen
 CourseSecretWrong: Falsches Kennwort
 CourseSecret: Zugangspasswort
@@ -120,6 +122,9 @@ CourseUserNoteDeleted: Teilnehmernotiz gelöscht
 CourseUserDeregister: Abmelden
 CourseUsersDeregistered count@Int64: #{show count} Teilnehmer abgemeldet
 CourseUserSendMail: Mitteilung verschicken
+TutorialUserDeregister: Vom Tutorium Abmelden
+TutorialUserSendMail: Mitteilung verschicken
+TutorialUsersDeregistered count@Int64: #{show count} Tutorium-Teilnehmer abgemeldet
 
 CourseLecturers: Kursverwalter
 CourseLecturer: Dozent
@@ -231,6 +236,7 @@ UnauthorizedRegistered: Sie sind nicht als Teilnehmer für diese Veranstaltung r
 UnauthorizedParticipant: Angegebener Benutzer ist nicht als Teilnehmer dieser Veranstaltung registriert.
 UnauthorizedCourseTime: Dieses Kurs erlaubt momentan keine Anmeldungen.
 UnauthorizedSheetTime: Dieses Übungsblatt ist momentan nicht freigegeben.
+UnauthorizedTutorialTime: Dieses Tutorium erlaubt momentan keine Anmeldungen.
 UnauthorizedSubmissionOwner: Sie sind an dieser Abgabe nicht beteiligt.
 UnauthorizedSubmissionRated: Diese Abgabe ist noch nicht korrigiert.
 UnauthorizedSubmissionCorrector: Sie sind nicht der Korrektor für diese Abgabe.
@@ -248,6 +254,10 @@ UnauthorizedDisabledTag authTag@AuthTag: Authorisierungsprädikat "#{toPathPiece
 UnknownAuthPredicate tag@String: Authorisierungsprädikat "#{tag}" ist dem System nicht bekannt
 UnauthorizedRedirect: Die angeforderte Seite existiert nicht oder Sie haben keine Berechtigung, die angeforderte Seite zu sehen.
 UnauthorizedSelf: Aktueller Nutzer ist nicht angegebener Benutzer.
+UnauthorizedTutorialTutor: Sie sind nicht Tutor für dieses Tutorium.
+UnauthorizedCourseTutor: Sie sind nicht Tutor für diesen Kurs.
+UnauthorizedTutor: Sie sind nicht Tutor.
+UnauthorizedTutorialRegisterGroup: Sie sind bereits in einem Tutorium mit derselben Registrierungs-Gruppe.
 
 EMail: E-Mail
 EMailUnknown email@UserEmail: E-Mail #{email} gehört zu keinem bekannten Benutzer.
@@ -408,6 +418,8 @@ LecturerFor: Dozent
 LecturersFor: Dozenten
 AssistantFor: Assistent
 AssistantsFor: Assistenten
+TutorsFor n@Int: #{pluralDE n "Tutor" "Tutoren"}
+CorrectorsFor n@Int: #{pluralDE n "Korrektor" "Korrektoren"}
 ForSchools n@Int: für #{pluralDE n "Institut" "Institute"}
 UserListTitle: Komprehensive Benutzerliste
 AccessRightsSaved: Berechtigungsänderungen wurden gespeichert.
@@ -711,6 +723,8 @@ MenuCorrections: Korrekturen
 MenuCorrectionsOwn: Meine Korrekturen
 MenuSubmissions: Abgaben
 MenuSheetList: Übungsblätter
+MenuTutorialList: Tutorien
+MenuTutorialNew: Neues Tutorium anlegen
 MenuSheetNew: Neues Übungsblatt anlegen
 MenuSheetCurrent: Aktuelles Übungsblatt
 MenuSheetOldUnassigned: Abgaben ohne Korrektor
@@ -727,6 +741,8 @@ MenuCorrectionsUpload: Korrekturen hochladen
 MenuCorrectionsCreate: Abgaben registrieren
 MenuCorrectionsGrade: Abgaben bewerten
 MenuAuthPreds: Authorisierungseinstellungen
+MenuTutorialDelete: Tutorium löschen
+MenuTutorialEdit: Tutorium editieren
 
 AuthPredsInfo: Um eigene Veranstaltungen aus Sicht der Teilnehmer anzusehen, können Veranstalter und Korrektoren hier die Prüfung ihrer erweiterten Berechtigungen temporär deaktivieren. Abgewählte Prädikate schlagen immer fehl. Abgewählte Prädikate werden also nicht geprüft um Zugriffe zu gewähren, welche andernfalls nicht erlaubt wären. Diese Einstellungen gelten nur temporär bis Ihre Sitzung abgelaufen ist, d.h. bis ihr Browser-Cookie abgelaufen ist. Durch Abwahl von Prädikaten kann man sich höchstens temporär aussperren.
 AuthPredsActive: Aktive Authorisierungsprädikate
@@ -739,9 +755,12 @@ AuthTagDeprecated: Seite ist nicht überholt
 AuthTagDevelopment: Seite ist nicht in Entwicklung
 AuthTagLecturer: Nutzer ist Dozent
 AuthTagCorrector: Nutzer ist Korrektor
+AuthTagTutor: Nutzer ist Tutor
 AuthTagTime: Zeitliche Einschränkungen sind erfüllt
-AuthTagRegistered: Nutzer ist Kursteilnehmer
+AuthTagCourseRegistered: Nutzer ist Kursteilnehmer
+AuthTagTutorialRegistered: Nutzer ist Tutoriumsteilnehmer
 AuthTagParticipant: Nutzer ist mit Kurs assoziiert
+AuthTagRegisterGroup: Nutzer ist nicht Mitglied eines anderen Tutoriums mit der selben Registrierungs-Gruppe
 AuthTagCapacity: Kapazität ist ausreichend
 AuthTagEmpty: Kurs hat keine Teilnehmer
 AuthTagMaterials: Kursmaterialien sind freigegeben
@@ -773,6 +792,7 @@ CommDuplicateRecipients n@Int: #{tshow n} #{pluralDE n "doppelter" "doppelte"} E
 CommSuccess n@Int: Nachricht wurde an #{tshow n} Empfänger versandt
 
 CommCourseHeading: Kursmitteilung
+CommTutorialHeading: Tutorium-Mitteilung
 
 RecipientCustom: Weitere Empfänger
 RecipientToggleAll: Alle/Keine
@@ -780,6 +800,8 @@ RecipientToggleAll: Alle/Keine
 RGCourseParticipants: Kursteilnehmer
 RGCourseLecturers: Kursverwalter
 RGCourseCorrectors: Korrektoren
+RGCourseTutors: Tutoren
+RGTutorialParticipants: Tutorium-Teilnehmer
 
 MultiSelectFieldTip: Mehrfach-Auswahl ist möglich (Umschalt bzw. Strg)
 MultiEmailFieldTip: Es sind mehrere, Komma-separierte, E-Mail-Addressen möglich
@@ -794,3 +816,60 @@ CorrectorInvitationAccepted shn@SheetName: Sie wurden als Korrektor für #{shn}
 CorrectorInvitationDeclined shn@SheetName: Sie haben die Einladung, Korrektor für #{shn} zu werden, abgelehnt
 SheetCorrInviteHeading shn@SheetName: Einladung zum Korrektor für #{shn}
 SheetCorrInviteExplanation: Sie wurden eingeladen, Korrektor für ein Übungsblatt zu sein.
+
+ScheduleKindWeekly: Wöchentlich
+
+ScheduleRegular: Planmäßiger Termin
+ScheduleRegularKind: Plan
+WeekDay: Wochentag
+Day: Tag
+OccurenceStart: Beginn
+OccurenceEnd: Ende
+ScheduleExists: Dieser Plan existiert bereits
+
+ScheduleExceptions: Termin-Ausnahmen
+ScheduleExceptionsTip: Ausfälle überschreiben planmäßiges Stattfinden. Außerplanmäßiges Stattfinden überschreibt Ausfall
+ExceptionKind: Termin ...
+ExceptionKindOccur: Findet statt
+ExceptionKindNoOccur: Findet nicht statt
+ExceptionExists: Diese Ausnahme existiert bereits
+ExceptionNoOccurAt: Termin
+
+TutorialType: Typ
+TutorialName: Bezeichnung
+TutorialParticipants: Teilnehmer
+TutorialCapacity: Kapazität
+TutorialRoom: Regulärer Raum
+TutorialTime: Zeit
+TutorialRegistered: Angemeldet
+TutorialRegGroup: Registrierungs-Gruppe
+TutorialRegisterFrom: Anmeldungen ab
+TutorialRegisterTo: Anmeldungen bis
+TutorialDeregisterUntil: Abmeldungen bis
+TutorialsHeading: Tutorien
+TutorialEdit: Bearbeiten
+TutorialDelete: Löschen
+
+CourseTutorials: Übungen
+
+ParticipantsN n@Int: Teilnehmer
+TutorialDeleteQuestion: Wollen Sie das unten aufgeführte Tutorium wirklich löschen?
+TutorialDeleted: Tutorium gelöscht
+
+TutorialRegisteredSuccess tutn@TutorialName: Erfolgreich zum Tutorium #{tutn} angemeldet
+TutorialDeregisteredSuccess tutn@TutorialName: Erfolgreich vom Tutorium #{tutn} abgemeldet
+
+TutorialNameTip: Muss eindeutig sein
+TutorialCapacityNonPositive: Kapazität muss größer oder gleich null sein
+TutorialCapacityTip: Beschränkt wieviele Studenten sich zu diesem Tutorium anmelden können
+TutorialRegGroupTip: Studenten können sich in jeweils maximal einem Tutorium pro Registrierungs-Gruppe anmelden. Ist bei zwei oder mehr Tutorien keine Registrierungs-Gruppe gesetzt zählen diese als in verschiedenen Registrierungs-Gruppen
+TutorialRoomPlaceholder: Raum
+TutorialTutors: Tutoren
+TutorialTutorAlreadyAdded: Ein Tutor mit dieser E-Mail ist bereits für dieses Tutorium eingetragen
+
+TutorialNew: Neues Tutorium
+
+TutorialNameTaken tutn@TutorialName: Es existiert bereits anderes Tutorium mit Namen #{tutn}
+TutorialCreated tutn@TutorialName: Tutorium #{tutn} erfolgreich angelegt
+
+TutorialEditHeading tutn@TutorialName: #{tutn} bearbeiten
\ No newline at end of file
diff --git a/models/rooms b/models/rooms
deleted file mode 100644
index 2ef670fd3..000000000
--- a/models/rooms
+++ /dev/null
@@ -1,32 +0,0 @@
--- ROOMS ARE TODO; THIS IS JUST AN UNUSED STUB
--- Idea is to create a selection of rooms that may be
--- associated with exercise classes and exams
--- offering links to the LMU Roomfinder
--- and allow the creation of neat timetables for users
-Booking
-    term        TermId
-    begin       UTCTime
-    end         UTCTime
-    weekly      Bool
-    exceptions  [Day]    -- only if weekly, begin in exception
-    bookedFor   RoomForId
-    room        RoomId
-BookingEdit
-    user        UserId
-    time        UTCTime
-    boooking    BookingId
-Room
-    name        Text
-    capacity    Int Maybe
-    building    Text Maybe -- name of building
-    roomfinder  Text Maybe -- external url for LMU Roomfinder
--- BookingRoom
---    subject     RoomForId
---    room        RoomId
---    booking     BookingId
---    UniqueRoomCourse subject room   booking
-+RoomFor
-    course      CourseId
-    tutorial    TutorialId
-    exam        ExamId
--- data RoomFor = RoomForCourseSum CourseId | RoomForTutorialSum TutorialId ...
diff --git a/models/tutorials b/models/tutorials
index 3afed739e..1f47400bf 100644
--- a/models/tutorials
+++ b/models/tutorials
@@ -1,11 +1,20 @@
--- TUTORIALS ARE TODO; THIS IS JUST AN UNUSED STUB
--- Idea: management of exercise classes, offering sub-enrolement to distribute all students among all exercise classs
 Tutorial json
-    name        Text
-    tutor       UserId
-    course      CourseId
-    capacity    Int Maybe -- limit for enrolement in this tutorial
-TutorialUser
-    user        UserId
+    name            TutorialName
+    course          CourseId
+    type            (CI Text) -- "Tutorium", "Zentralübung", ...
+    capacity        Int Maybe -- limit for enrolment in this tutorial
+    room            Text
+    time            Occurences
+    regGroup        (CI Text) Maybe -- each participant may register for one tutorial per regGroup
+    registerFrom    UTCTime Maybe
+    registerTo      UTCTime Maybe
+    deregisterUntil UTCTime Maybe
+    UniqueTutorial course name
+Tutor
     tutorial    TutorialId
-    UniqueTutorialUser user   tutorial
+    user        UserId
+    UniqueTutor tutorial user
+TutorialParticipant
+    tutorial    TutorialId
+    user        UserId
+    UniqueTutorialParticipant tutorial user
\ No newline at end of file
diff --git a/package.yaml b/package.yaml
index 470e510db..d1c262645 100644
--- a/package.yaml
+++ b/package.yaml
@@ -124,6 +124,7 @@ dependencies:
   - systemd
   - lifted-async
   - streaming-commons
+  - hourglass
 
 other-extensions:
   - GeneralizedNewtypeDeriving
diff --git a/routes b/routes
index 0e801e22b..dd82ed43b 100644
--- a/routes
+++ b/routes
@@ -13,8 +13,12 @@
 --    !free           -- free for all
 --    !lecturer       -- lecturer    for this course (or for any school, if route is not connected to a course)
 --    !corrector      -- corrector   for this sheet  (or the submission, if route is connected to a submission, or the course, if route is not connected to a sheet, or any course, if route is not connected to a course)
---    !registered     -- participant for this course (no effect outside of courses)
+--    !course-registered     -- participant for this course (no effect outside of courses)
+--    !tutorial-registered   -- participant for this tutorial (no effect outside of courses)
 --    !participant    -- connected with a given course (not necessarily registered), i.e. has a submission, is a corrector, etc. (no effect outside of courses)
+--
+--    !register-group -- user is member in no other tutorial with same register group
+--
 --    !owner          -- part of the group of owners of this submission
 --    !self           -- route refers to the currently logged in user themselves
 --    !capacity       -- course this route is associated with has at least one unit of participant capacity
@@ -84,16 +88,16 @@
   /communication              CCommR          GET POST
   /notes                      CNotesR         GET POST        !corrector
   /subs                       CCorrectionsR   GET POST
-  /ex                         SheetListR      GET             !registered !materials !corrector
+  /ex                         SheetListR      GET             !course-registered !materials !corrector
   /ex/new                     SheetNewR       GET POST
-  /ex/current                 SheetCurrentR   GET             !registered !materials !corrector
+  /ex/current                 SheetCurrentR   GET             !course-registered !materials !corrector
   /ex/unassigned              SheetOldUnassigned GET
   /ex/#SheetName SheetR:
-    /show                       SShowR        GET             !timeANDregistered !timeANDmaterials !corrector
+    /show                       SShowR        GET             !timeANDcourse-registered !timeANDmaterials !corrector
     /edit                       SEditR        GET POST
     /delete                     SDelR         GET POST
     /subs                       SSubsR        GET POST        -- for lecturer only
-    !/subs/new                  SubmissionNewR GET POST       !timeANDregisteredANDuser-submissions
+    !/subs/new                  SubmissionNewR GET POST       !timeANDcourse-registeredANDuser-submissions
     !/subs/own                  SubmissionOwnR GET            !free -- just redirect
     /subs/#CryptoFileNameSubmission SubmissionR:
       /                         SubShowR      GET POST        !ownerANDtime !ownerANDread !correctorANDread
@@ -103,9 +107,17 @@
       /correction               CorrectionR   GET POST        !corrector !ownerANDreadANDrated
       !/#SubmissionFileType/*FilePath SubDownloadR           GET      !owner !corrector
     /correctors                 SCorrR        GET POST
-    /pseudonym                  SPseudonymR   GET POST        !registeredANDcorrector-submissions
+    /pseudonym                  SPseudonymR   GET POST        !course-registeredANDcorrector-submissions
     /corrector-invite/#UserEmail SCorrInviteR     GET POST
-    !/#SheetFileType/*FilePath  SFileR        GET             !timeANDregistered !timeANDmaterials !corrector
+    !/#SheetFileType/*FilePath  SFileR        GET             !timeANDcourse-registered !timeANDmaterials !corrector
+  /tuts                         CTutorialListR GET            !tutor
+  /tuts/new                     CTutorialNewR  GET POST
+  /tuts/#TutorialName TutorialR:
+    /edit                     TEditR          GET POST
+    /delete                   TDeleteR        GET POST
+    /participants             TUsersR         GET POST        !tutor
+    /register                 TRegisterR          POST        !timeANDcapacityANDcourse-registeredANDregister-group !timeANDtutorial-registered
+    /communication            TCommR          GET POST        !tutor
 
 
 /subs  CorrectionsR GET POST !corrector !lecturer
diff --git a/src/Application.hs b/src/Application.hs
index 3e5ace925..77a19df68 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -91,6 +91,7 @@ import Handler.School
 import Handler.Course
 import Handler.Sheet
 import Handler.Submission
+import Handler.Tutorial
 import Handler.Corrections
 import Handler.CryptoIDDispatch
 import Handler.SystemMessage
diff --git a/src/Database/Esqueleto/Utils.hs b/src/Database/Esqueleto/Utils.hs
index 6c89e6c96..990c782ff 100644
--- a/src/Database/Esqueleto/Utils.hs
+++ b/src/Database/Esqueleto/Utils.hs
@@ -7,6 +7,7 @@ module Database.Esqueleto.Utils
   , SqlIn(..)
   , mkExactFilter, mkExactFilterWith
   , mkContainsFilter
+  , mkExistsFilter
   , anyFilter, allFilter
   ) where
 
@@ -104,6 +105,15 @@ mkContainsFilter lenslike row criterias
   | Set.null criterias = true
   | otherwise = any (hasInfix $ lenslike row) criterias
 
+mkExistsFilter :: PathPiece a
+               => (t -> a -> E.SqlQuery ())
+               -> t
+               -> Set.Set a
+               -> E.SqlExpr (E.Value Bool)
+mkExistsFilter query row criterias
+  | Set.null criterias = true
+  | otherwise = any (E.exists . query row) criterias
+
 -- | Combine several filters, using logical or
 anyFilter :: (Foldable f)
   => f (t -> Set.Set Text-> E.SqlExpr (E.Value Bool))
@@ -122,4 +132,4 @@ allFilter :: (Foldable f)
   -> E.SqlExpr (E.Value Bool)
 allFilter fltrs needle criterias = F.foldr aux true fltrs
   where
-    aux fltr acc = fltr needle criterias E.&&. acc
\ No newline at end of file
+    aux fltr acc = fltr needle criterias E.&&. acc
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 46e176a19..8b2769cea 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -45,7 +45,7 @@ import Data.Map (Map, (!?))
 import qualified Data.Map as Map
 import qualified Data.HashSet as HashSet
 
-import Data.List (nubBy)
+import Data.List (nubBy, (!!))
 
 import Data.Monoid (Any(..))
 
@@ -161,6 +161,10 @@ pattern CSheetR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> SheetR
 pattern CSheetR tid ssh csh shn ptn
   = CourseR tid ssh csh (SheetR shn ptn)
 
+pattern CTutorialR :: TermId -> SchoolId -> CourseShorthand -> TutorialName -> TutorialR -> Route UniWorX
+pattern CTutorialR tid ssh csh shn ptn
+  = CourseR tid ssh csh (TutorialR shn ptn)
+
 pattern CSubmissionR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> CryptoFileNameSubmission -> SubmissionR -> Route UniWorX
 pattern CSubmissionR tid ssh csh shn cid ptn
   = CSheetR tid ssh csh shn (SubmissionR cid ptn)
@@ -402,6 +406,14 @@ appLanguagesOpts = do
   return $ mkOptionList langOptions
 
 
+instance RenderMessage UniWorX WeekDay where
+  renderMessage _ ls wDay = pack $ map fst (wDays $ getTimeLocale' ls) !! fromEnum wDay
+
+newtype ShortWeekDay = ShortWeekDay { longWeekDay :: WeekDay }
+
+instance RenderMessage UniWorX ShortWeekDay where
+  renderMessage _ ls (ShortWeekDay wDay) = pack $ map snd (wDays $ getTimeLocale' ls) !! fromEnum wDay
+
 -- Access Control
 newtype InvalidAuthTag = InvalidAuthTag Text
   deriving (Eq, Ord, Show, Read, Generic, Typeable)
@@ -582,7 +594,49 @@ tagAccessPredicate AuthCorrector = APDB $ \mAuthId route _ -> exceptT return ret
     _ -> do
       guardMExceptT (not $ Map.null resMap) (unauthorizedI MsgUnauthorizedCorrectorAny)
       return Authorized
+tagAccessPredicate AuthTutor = APDB $ \mAuthId route _ -> exceptT return return $ do
+  authId <- maybeExceptT AuthenticationRequired $ return mAuthId
+  resList <- lift . E.select . E.from $ \(course `E.InnerJoin` tutorial `E.InnerJoin` tutor) -> do
+    E.on $ tutor E.^. TutorTutorial E.==. tutorial E.^. TutorialId
+    E.on $ tutorial E.^. TutorialCourse E.==. course E.^. CourseId
+    E.where_ $ tutor E.^. TutorUser E.==. E.val authId
+    return (course E.^. CourseId, tutorial E.^. TutorialId)
+  let
+    resMap :: Map CourseId (Set TutorialId)
+    resMap = Map.fromListWith Set.union [ (cid, Set.singleton tutid) | (E.Value cid, E.Value tutid) <- resList ]
+  case route of
+    CTutorialR tid ssh csh tutn _ -> maybeT (unauthorizedI MsgUnauthorizedTutorialTutor) $ do
+      Entity cid _ <- MaybeT . lift . getBy $ TermSchoolCourseShort tid ssh csh
+      Entity tutid _ <- MaybeT . lift . getBy $ UniqueTutorial cid tutn
+      guard $ tutid `Set.member` fromMaybe Set.empty (resMap !? cid)
+      return Authorized
+    CourseR tid ssh csh _ -> maybeT (unauthorizedI MsgUnauthorizedCourseTutor) $ do
+      Entity cid _ <- MaybeT . lift . getBy $ TermSchoolCourseShort tid ssh csh
+      guard $ cid `Set.member` Map.keysSet resMap
+      return Authorized
+    _ -> do
+      guardMExceptT (not $ Map.null resMap) (unauthorizedI MsgUnauthorizedTutor)
+      return Authorized
 tagAccessPredicate AuthTime = APDB $ \mAuthId route _ -> case route of
+  CTutorialR tid ssh csh tutn TRegisterR -> maybeT (unauthorizedI MsgUnauthorizedTutorialTime) $ do
+    now <- liftIO getCurrentTime
+    course <- MaybeT . getKeyBy $ TermSchoolCourseShort tid ssh csh
+    Entity tutId Tutorial{..} <- MaybeT . getBy $ UniqueTutorial course tutn
+    registered <- case mAuthId of
+      Just uid -> lift . existsBy $ UniqueTutorialParticipant tutId uid
+      Nothing  -> return False
+
+    if
+      | not registered
+      , maybe False (now >=) tutorialRegisterFrom
+      , maybe True  (now <=) tutorialRegisterTo
+        -> return Authorized
+      | registered
+      , maybe True  (now <=) tutorialDeregisterUntil
+        -> return Authorized
+      | otherwise
+        -> mzero
+     
   CSheetR tid ssh csh shn subRoute -> maybeT (unauthorizedI MsgUnauthorizedSheetTime) $ do
     Entity cid _ <- MaybeT . getBy $ TermSchoolCourseShort tid ssh csh
     Entity _sid Sheet{..} <- MaybeT . getBy $ CourseSheet cid shn
@@ -630,7 +684,7 @@ tagAccessPredicate AuthTime = APDB $ \mAuthId route _ -> case route of
     return Authorized
 
   r -> $unsupportedAuthPredicate AuthTime r
-tagAccessPredicate AuthRegistered = APDB $ \mAuthId route _ -> case route of
+tagAccessPredicate AuthCourseRegistered = APDB $ \mAuthId route _ -> case route of
   CourseR tid ssh csh _ -> exceptT return return $ do
     authId <- maybeExceptT AuthenticationRequired $ return mAuthId
     [E.Value c] <- lift . E.select . E.from $ \(course `E.InnerJoin` courseParticipant) -> do
@@ -642,7 +696,34 @@ tagAccessPredicate AuthRegistered = APDB $ \mAuthId route _ -> case route of
       return (E.countRows :: E.SqlExpr (E.Value Int64))
     guardMExceptT (c > 0) (unauthorizedI MsgUnauthorizedRegistered)
     return Authorized
-  r -> $unsupportedAuthPredicate AuthRegistered r
+  r -> $unsupportedAuthPredicate AuthCourseRegistered r
+tagAccessPredicate AuthTutorialRegistered = APDB $ \mAuthId route _ -> case route of
+  CourseR tid ssh csh _ -> exceptT return return $ do
+    authId <- maybeExceptT AuthenticationRequired $ return mAuthId
+    [E.Value c] <- lift . E.select . E.from $ \(course `E.InnerJoin` tutorial `E.InnerJoin` tutorialParticipant) -> do
+      E.on $ tutorial E.^. TutorialId E.==. tutorialParticipant E.^. TutorialParticipantTutorial
+      E.on $ course E.^. CourseId E.==. tutorial E.^. TutorialCourse
+      E.where_ $ tutorialParticipant E.^. TutorialParticipantUser E.==. E.val authId
+           E.&&. course E.^. CourseTerm      E.==. E.val tid
+           E.&&. course E.^. CourseSchool    E.==. E.val ssh
+           E.&&. course E.^. CourseShorthand E.==. E.val csh
+      return (E.countRows :: E.SqlExpr (E.Value Int64))
+    guardMExceptT (c > 0) (unauthorizedI MsgUnauthorizedRegistered)
+    return Authorized
+  CTutorialR tid ssh csh tutn _ -> exceptT return return $ do
+    authId <- maybeExceptT AuthenticationRequired $ return mAuthId
+    [E.Value c] <- lift . E.select . E.from $ \(course `E.InnerJoin` tutorial `E.InnerJoin` tutorialParticipant) -> do
+      E.on $ tutorial E.^. TutorialId E.==. tutorialParticipant E.^. TutorialParticipantTutorial
+      E.on $ course E.^. CourseId E.==. tutorial E.^. TutorialCourse
+      E.where_ $ tutorialParticipant E.^. TutorialParticipantUser E.==. E.val authId
+           E.&&. course E.^. CourseTerm      E.==. E.val tid
+           E.&&. course E.^. CourseSchool    E.==. E.val ssh
+           E.&&. course E.^. CourseShorthand E.==. E.val csh
+           E.&&. tutorial E.^. TutorialName  E.==. E.val tutn
+      return (E.countRows :: E.SqlExpr (E.Value Int64))
+    guardMExceptT (c > 0) (unauthorizedI MsgUnauthorizedRegistered)
+    return Authorized
+  r -> $unsupportedAuthPredicate AuthTutorialRegistered r
 tagAccessPredicate AuthParticipant = APDB $ \_ route _ -> case route of
   CourseR tid ssh csh (CUserR cID) -> exceptT return return $ do
     let authorizedIfExists f = do
@@ -683,16 +764,17 @@ tagAccessPredicate AuthParticipant = APDB $ \_ route _ -> case route of
            E.&&. course E.^. CourseShorthand E.==. E.val csh
     -- participant is a tutorial user
     authorizedIfExists $ \(course `E.InnerJoin` tutorial `E.InnerJoin` tutorialUser) -> do
-      E.on $ tutorial  E.^. TutorialId   E.==. tutorialUser E.^. TutorialUserTutorial
+      E.on $ tutorial  E.^. TutorialId   E.==. tutorialUser E.^. TutorialParticipantTutorial
       E.on $ course E.^. CourseId  E.==. tutorial E.^. TutorialCourse
-      E.where_ $ tutorialUser E.^. TutorialUserUser E.==. E.val participant
+      E.where_ $ tutorialUser E.^. TutorialParticipantUser E.==. E.val participant
            E.&&. course E.^. CourseTerm      E.==. E.val tid
            E.&&. course E.^. CourseSchool    E.==. E.val ssh
            E.&&. course E.^. CourseShorthand E.==. E.val csh
     -- participant is tutor for this course
-    authorizedIfExists $ \(course `E.InnerJoin` tutorial) -> do
+    authorizedIfExists $ \(course `E.InnerJoin` tutorial `E.InnerJoin` tutor) -> do
+      E.on $ tutorial  E.^. TutorialId   E.==. tutor E.^. TutorTutorial
       E.on $ course E.^. CourseId E.==. tutorial E.^. TutorialCourse
-      E.where_ $ tutorial E.^. TutorialTutor E.==. E.val participant
+      E.where_ $ tutor E.^. TutorUser E.==. E.val participant
            E.&&. course E.^. CourseTerm      E.==. E.val tid
            E.&&. course E.^. CourseSchool    E.==. E.val ssh
            E.&&. course E.^. CourseShorthand E.==. E.val csh
@@ -706,12 +788,33 @@ tagAccessPredicate AuthParticipant = APDB $ \_ route _ -> case route of
     unauthorizedI MsgUnauthorizedParticipant
   r -> $unsupportedAuthPredicate AuthParticipant r
 tagAccessPredicate AuthCapacity = APDB $ \_ route _ -> case route of
+  CTutorialR tid ssh csh tutn _ -> maybeT (unauthorizedI MsgTutorialNoCapacity) $ do
+    cid <- MaybeT . getKeyBy $ TermSchoolCourseShort tid ssh csh
+    Entity tutId Tutorial{..} <- MaybeT . getBy $ UniqueTutorial cid tutn
+    registered <- lift $ fromIntegral <$> count [ TutorialParticipantTutorial ==. tutId ]
+    guard $ NTop tutorialCapacity > NTop (Just registered)
+    return Authorized
   CourseR tid ssh csh _ -> maybeT (unauthorizedI MsgCourseNoCapacity) $ do
     Entity cid Course{..} <- MaybeT . getBy $ TermSchoolCourseShort tid ssh csh
     registered <- lift $ fromIntegral <$> count [ CourseParticipantCourse ==. cid ]
     guard $ NTop courseCapacity > NTop (Just registered)
     return Authorized
   r -> $unsupportedAuthPredicate AuthCapacity r
+tagAccessPredicate AuthRegisterGroup = APDB $ \mAuthId route _ -> case route of
+  CTutorialR tid ssh csh tutn _ -> maybeT (unauthorizedI MsgUnauthorizedTutorialRegisterGroup) $ do
+    cid <- MaybeT . getKeyBy $ TermSchoolCourseShort tid ssh csh
+    Entity _ Tutorial{..} <- MaybeT . getBy $ UniqueTutorial cid tutn
+    case (tutorialRegGroup, mAuthId) of
+      (Nothing, _) -> return Authorized
+      (_, Nothing) -> return AuthenticationRequired
+      (Just rGroup, Just uid) -> do
+        [E.Value hasOther] <- lift . E.select . return . E.exists . E.from $ \(tutorial `E.InnerJoin` participant) -> do
+          E.on $ tutorial E.^. TutorialId E.==. participant E.^. TutorialParticipantTutorial
+          E.where_ $ participant E.^. TutorialParticipantUser E.==. E.val uid
+               E.&&. tutorial E.^. TutorialRegGroup E.==. E.just (E.val rGroup)
+        guard $ not hasOther
+        return Authorized
+  r -> $unsupportedAuthPredicate AuthRegisterGroup r
 tagAccessPredicate AuthEmpty = APDB $ \_ route _ -> case route of
   CourseR tid ssh csh _ -> maybeT (unauthorizedI MsgCourseNotEmpty) $ do
     -- Entity cid Course{..} <- MaybeT . getBy $ TermSchoolCourseShort tid ssh csh
@@ -1265,10 +1368,17 @@ instance YesodBreadcrumbs UniWorX where
   breadcrumb (CourseR tid ssh csh SheetListR) = return ("Übungen"    , Just $ CourseR tid ssh csh CShowR)
   breadcrumb (CourseR tid ssh csh SheetNewR ) = return ("Neu",         Just $ CourseR tid ssh csh SheetListR)
   breadcrumb (CourseR tid ssh csh CCommR    ) = return ("Kursmitteilung", Just $ CourseR tid ssh csh CShowR)
+  breadcrumb (CourseR tid ssh csh CTutorialListR) = return ("Tutorien", Just $ CourseR tid ssh csh CShowR)
+  breadcrumb (CourseR tid ssh csh CTutorialNewR) = return ("Anlegen", Just $ CourseR tid ssh csh CTutorialListR)
+
+  breadcrumb (CTutorialR tid ssh csh tutn TUsersR)   = return (CI.original tutn, Just $ CourseR tid ssh csh CTutorialListR)
+  breadcrumb (CTutorialR tid ssh csh tutn TEditR)    = return ("Bearbeiten", Just $ CTutorialR tid ssh csh tutn TUsersR)
+  breadcrumb (CTutorialR tid ssh csh tutn TDeleteR)  = return ("Löschen", Just $ CTutorialR tid ssh csh tutn TUsersR)
+  breadcrumb (CTutorialR tid ssh csh tutn TCommR)    = return ("Mitteilung", Just $ CTutorialR tid ssh csh tutn TUsersR)
 
   breadcrumb (CSheetR tid ssh csh shn SShowR) = return (CI.original shn, Just $ CourseR tid ssh csh SheetListR)
-  breadcrumb (CSheetR tid ssh csh shn SEditR) = return ("Edit",    Just $ CSheetR tid ssh csh shn SShowR)
-  breadcrumb (CSheetR tid ssh csh shn SDelR ) = return ("DELETE",  Just $ CSheetR tid ssh csh shn SShowR)
+  breadcrumb (CSheetR tid ssh csh shn SEditR) = return ("Bearbeiten",    Just $ CSheetR tid ssh csh shn SShowR)
+  breadcrumb (CSheetR tid ssh csh shn SDelR ) = return ("Löschen",  Just $ CSheetR tid ssh csh shn SShowR)
   breadcrumb (CSheetR tid ssh csh shn SSubsR) = return ("Abgaben", Just $ CSheetR tid ssh csh shn SShowR)
   breadcrumb (CSheetR tid ssh csh shn SubmissionNewR)  = return ("Abgabe", Just $ CSheetR tid ssh csh shn SShowR)
   breadcrumb (CSheetR tid ssh csh shn SubmissionOwnR)  = return ("Abgabe", Just $ CSheetR tid ssh csh shn SShowR)
@@ -1635,6 +1745,14 @@ pageActions (CourseR tid ssh csh CShowR) =
       }
   ] ++ pageActions (CourseR tid ssh csh SheetListR) ++
   [ MenuItem
+      { menuItemType  = PageActionPrime
+      , menuItemLabel = MsgMenuTutorialList
+      , menuItemIcon  = Nothing
+      , menuItemRoute = SomeRoute $ CourseR tid ssh csh CTutorialListR
+      , menuItemModal = False
+      , menuItemAccessCallback' = return True
+      }
+  , MenuItem
       { menuItemType = PageActionSecondary
       , menuItemLabel = MsgMenuCourseMembers
       , menuItemIcon  = Just "user-graduate"
@@ -1736,6 +1854,44 @@ pageActions (CourseR tid ssh csh SheetListR) =
       , menuItemAccessCallback' = return True
       }
   ]
+pageActions (CourseR tid ssh csh CTutorialListR) =
+  [ MenuItem
+      { menuItemType  = PageActionPrime
+      , menuItemLabel = MsgMenuTutorialNew
+      , menuItemIcon  = Nothing
+      , menuItemRoute = SomeRoute $ CourseR tid ssh csh CTutorialNewR
+      , menuItemModal = False
+      , menuItemAccessCallback' = return True
+      }
+  ]
+pageActions (CTutorialR tid ssh csh tutn TEditR) =
+  [ MenuItem
+      { menuItemType  = PageActionSecondary
+      , menuItemLabel = MsgMenuTutorialDelete
+      , menuItemIcon  = Nothing
+      , menuItemRoute = SomeRoute $ CTutorialR tid ssh csh tutn TDeleteR
+      , menuItemModal = False
+      , menuItemAccessCallback' = return True
+      }
+  ]
+pageActions (CTutorialR tid ssh csh tutn TUsersR) =
+  [ MenuItem
+      { menuItemType  = PageActionPrime
+      , menuItemLabel = MsgMenuTutorialEdit
+      , menuItemIcon  = Nothing
+      , menuItemRoute = SomeRoute $ CTutorialR tid ssh csh tutn TEditR
+      , menuItemModal = False
+      , menuItemAccessCallback' = return True
+      }
+  , MenuItem
+      { menuItemType  = PageActionSecondary
+      , menuItemLabel = MsgMenuTutorialDelete
+      , menuItemIcon  = Nothing
+      , menuItemRoute = SomeRoute $ CTutorialR tid ssh csh tutn TDeleteR
+      , menuItemModal = False
+      , menuItemAccessCallback' = return True
+      }
+  ]
 pageActions (CSheetR tid ssh csh shn SShowR) =
   [ MenuItem
       { menuItemType = PageActionPrime
diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs
index aba016f41..2180e28e8 100644
--- a/src/Handler/Admin.hs
+++ b/src/Handler/Admin.hs
@@ -165,7 +165,7 @@ postAdminTestR = do
 
     -- | Make a form for adding a point/line/plane/hyperplane/... (in this case: cell)
     --
-    -- This /needs/ to replace all occurances of @mreq@ with @mpreq@ (no fields should be /actually/ required)
+    -- This /needs/ to replace all occurences of @mreq@ with @mpreq@ (no fields should be /actually/ required)
     mkAddForm :: ListPosition -- ^ Approximate position of the add-widget
               -> Natural -- ^ Dimension Index, outermost dimension ist 0 i.e. if dimension is 3 hyperplane-adders get passed 0, planes get passed 1, lines get 2, and points get 3
               -> (Text -> Text) -- ^ Nudge deterministic field ids so they're unique
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 7de5e6b0d..4ef07e77d 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -128,7 +128,7 @@ colSubmissionLink = sortable Nothing (i18nCell MsgSubmission)
                 return $ CSubmissionR tid ssh csh shn cid SubShowR
           in anchorCellM mkRoute (mkCid >>= \cid -> [whamlet|#{display cid}|])
 
-colSelect :: forall act h. (Monoid act, Headedness h) => Colonnade h CorrectionTableData (DBCell _ (FormResult (act, DBFormResult CryptoFileNameSubmission Bool CorrectionTableData), SheetTypeSummary))
+colSelect :: forall act h. (Semigroup act, Monoid act, Headedness h) => Colonnade h CorrectionTableData (DBCell _ (FormResult (act, DBFormResult CryptoFileNameSubmission Bool CorrectionTableData), SheetTypeSummary))
 colSelect = dbSelect (_1 . applying _2) id $ \DBRow{ dbrOutput=(Entity subId _, _, _, _, _) } -> encrypt subId
 
 colSubmittors :: IsDBTable m a => Colonnade Sortable CorrectionTableData (DBCell m a)
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 4c1d7a153..1163a9e8f 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -9,6 +9,7 @@ import Utils.Form
 -- import Utils.DB
 import Handler.Utils
 import Handler.Utils.Course
+import Handler.Utils.Tutorial
 import Handler.Utils.Communication
 import Handler.Utils.Form.MassInput
 import Handler.Utils.Delete
@@ -24,8 +25,6 @@ import qualified Data.CaseInsensitive as CI
 import Data.Function ((&))
 -- import Yesod.Form.Bootstrap3
 
-import Data.Monoid (Last(..))
-
 import Data.Maybe (fromJust)
 import qualified Data.Set as Set
 import Data.Map ((!))
@@ -275,7 +274,7 @@ getTermCourseListR tid = do
 getCShowR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getCShowR tid ssh csh = do
   mbAid <- maybeAuthId
-  (course,schoolName,participants,registration,defSFid,lecturers,assistants) <- runDB . maybeT notFound $ do
+  (cid,course,schoolName,participants,registration,defSFid,lecturers,assistants,tutors,correctors) <- runDB . maybeT notFound $ do
     [(E.Entity cid course, E.Value schoolName, E.Value participants, fmap entityVal -> registration)]
        <- lift . E.select . E.from $
          \((school `E.InnerJoin` course) `E.LeftOuterJoin` participant) -> do
@@ -301,7 +300,18 @@ getCShowR tid ssh csh = do
         partStaff (CourseLecturer  ,name,surn,mail) = Right (name,surn,mail)
         partStaff (_courseAssistant,name,surn,mail) = Left (name,surn,mail)
         (assistants,lecturers) = partitionWith  partStaff $ map $(unValueN 4) staff
-    return (course,schoolName,participants,registration,entityKey <$> defSFid,lecturers,assistants)
+    tutors <- fmap (map $(unValueN 3)) . lift . E.select $ E.from $ \(tutorial `E.InnerJoin` tutor `E.InnerJoin` user) -> E.distinctOnOrderBy [E.asc $ user E.^. UserSurname, E.asc $ user E.^. UserDisplayName, E.asc $ user E.^. UserEmail ] $ do
+      E.on $ tutor E.^. TutorUser E.==. user E.^. UserId
+      E.on $ tutor E.^. TutorTutorial E.==. tutorial E.^. TutorialId
+      E.where_ $ tutorial E.^. TutorialCourse E.==. E.val cid
+      return ( user E.^. UserEmail, user E.^. UserDisplayName, user E.^. UserSurname )
+    correctors <- fmap (map $(unValueN 3)) . lift . E.select $ E.from $ \(sheet `E.InnerJoin` sheetCorrector `E.InnerJoin` user) -> E.distinctOnOrderBy [E.asc $ user E.^. UserSurname, E.asc $ user E.^. UserDisplayName, E.asc $ user E.^. UserEmail ] $ do
+      E.on $ sheetCorrector E.^. SheetCorrectorUser E.==. user E.^. UserId
+      E.on $ sheetCorrector E.^. SheetCorrectorSheet E.==. sheet E.^. SheetId
+      E.where_ $ sheet E.^. SheetCourse E.==. E.val cid
+      E.orderBy [ E.asc $ user E.^. UserSurname, E.asc $ user E.^. UserDisplayName ]
+      return ( user E.^. UserEmail, user E.^. UserDisplayName, user E.^. UserSurname )
+    return (cid,course,schoolName,participants,registration,entityKey <$> defSFid,lecturers,assistants,tutors,correctors)
 
   mRegFrom <- traverse (formatTime SelFormatDateTime) $ courseRegisterFrom    course
   mRegTo   <- traverse (formatTime SelFormatDateTime) $ courseRegisterTo      course
@@ -314,6 +324,58 @@ getCShowR tid ssh csh = do
         , formSubmit = FormNoSubmit
         }
   registrationOpen <- (==Authorized) <$> isAuthorized (CourseR tid ssh csh CRegisterR) True
+
+  let
+    tutorialDBTable = DBTable{..}
+      where
+        dbtSQLQuery tutorial = do
+          E.where_ $ tutorial E.^. TutorialCourse E.==. E.val cid
+          return tutorial
+        dbtRowKey = (E.^. TutorialId)
+        dbtProj = return
+        dbtColonnade = dbColonnade $ mconcat
+          [ sortable (Just "type") (i18nCell MsgTutorialType) $ \DBRow{ dbrOutput = Entity _ Tutorial{..} } -> textCell $ CI.original tutorialType
+          , sortable (Just "name") (i18nCell MsgTutorialName) $ \DBRow{ dbrOutput = Entity _ Tutorial{..} } -> indicatorCell <> textCell (CI.original tutorialName)
+          , sortable (Just "room") (i18nCell MsgTutorialRoom) $ \DBRow{ dbrOutput = Entity _ Tutorial{..} } -> textCell tutorialRoom
+          , sortable Nothing (i18nCell MsgTutorialTime) $ \DBRow{ dbrOutput = Entity _ Tutorial{..} } -> occurencesCell tutorialTime
+          , sortable (Just "register-from") (i18nCell MsgTutorialRegisterFrom) $ \DBRow{ dbrOutput = Entity _ Tutorial{..} } -> maybeDateTimeCell tutorialRegisterFrom
+          , sortable (Just "register-to") (i18nCell MsgTutorialRegisterTo) $ \DBRow{ dbrOutput = Entity _ Tutorial{..} } -> maybeDateTimeCell tutorialRegisterTo
+          , sortable (Just "deregister-until") (i18nCell MsgTutorialDeregisterUntil) $ \DBRow{ dbrOutput = Entity _ Tutorial{..} } -> maybeDateTimeCell tutorialDeregisterUntil
+          , sortable Nothing mempty $ \DBRow{ dbrOutput = Entity tutId Tutorial{..} } -> sqlCell $ do
+              mayRegister <- (== Authorized) <$> evalAccessDB (CTutorialR tid ssh csh tutorialName TRegisterR) True
+              isRegistered <- case mbAid of
+                Nothing  -> return False
+                Just uid -> existsBy $ UniqueTutorialParticipant tutId uid
+              if
+                | mayRegister -> do
+                    (tutRegisterForm, tutRegisterEnctype) <- liftHandlerT . generateFormPost . buttonForm' $ bool [BtnRegister] [BtnDeregister] isRegistered
+                    return $ wrapForm tutRegisterForm def
+                      { formAction = Just . SomeRoute $ CTutorialR tid ssh csh tutorialName TRegisterR
+                      , formEncoding = tutRegisterEnctype
+                      , formSubmit = FormNoSubmit
+                      }
+                | isRegistered -> return [whamlet|_{MsgTutorialRegistered}|]
+                | otherwise -> return mempty
+          ]
+        dbtSorting = Map.fromList
+          [ ("type", SortColumn $ \tutorial -> tutorial E.^. TutorialType )
+          , ("name", SortColumn $ \tutorial -> tutorial E.^. TutorialName )
+          , ("room", SortColumn $ \tutorial -> tutorial E.^. TutorialRoom )
+          , ("register-from", SortColumn $ \tutorial -> tutorial E.^. TutorialRegisterFrom )
+          , ("register-to", SortColumn $ \tutorial -> tutorial E.^. TutorialRegisterTo )
+          , ("deregister-until", SortColumn $ \tutorial -> tutorial E.^. TutorialDeregisterUntil )
+          ]
+        dbtFilter = Map.empty
+        dbtFilterUI = const mempty
+        dbtStyle = def
+        dbtParams = def
+        dbtIdent :: Text
+        dbtIdent = "tutorials"
+
+    tutorialDBTableValidator = def
+      & defaultSorting [SortAscBy "type", SortAscBy "name"]
+  (Any hasTutorials, tutorialTable) <- runDB $ dbTable tutorialDBTableValidator tutorialDBTable
+  
   siteLayout (toWgt $ courseName course) $ do
     setTitleI $ prependCourseTitle tid ssh csh (""::Text)
     $(widgetFile "course")
@@ -870,13 +932,28 @@ instance Finite CourseUserAction
 nullaryPathPiece ''CourseUserAction $ camelToPathPiece' 2
 embedRenderMessage ''UniWorX ''CourseUserAction id
 
-makeCourseUserTable :: CourseId -> _ -> _ -> DB (FormResult (CourseUserAction, Set UserId), Widget)
-makeCourseUserTable cid colChoices psValidator = do
+data TutorialUserAction = TutorialUserSendMail | TutorialUserDeregister
+  deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
+
+instance Universe TutorialUserAction
+instance Finite TutorialUserAction
+nullaryPathPiece ''TutorialUserAction $ camelToPathPiece' 2
+embedRenderMessage ''UniWorX ''TutorialUserAction id
+
+makeCourseUserTable :: forall h act.
+                       ( Functor h, ToSortable h
+                       , RenderMessage UniWorX act, Eq act, PathPiece act, Finite act)
+                    => CourseId
+                    -> (UserTableExpr -> E.SqlExpr (E.Value Bool))
+                    -> Colonnade h UserTableData (DBCell (MForm Handler) (FormResult (First act, DBFormResult UserId Bool UserTableData)))
+                    -> PSValidator (MForm Handler) (FormResult (First act, DBFormResult UserId Bool UserTableData))
+                    -> DB (FormResult (act, Set UserId), Widget)
+makeCourseUserTable cid restrict colChoices psValidator = do
     Just currentRoute <- liftHandlerT getCurrentRoute
     -- -- psValidator has default sorting and filtering
     let dbtIdent     = "courseUsers" :: Text
         dbtStyle     = def { dbsFilterLayout = defaultDBSFilterLayout }
-        dbtSQLQuery  = userTableQuery cid
+        dbtSQLQuery q = userTableQuery cid q <* E.where_ (restrict q)
         dbtRowKey    = queryUser >>> (E.^. UserId)
         dbtProj      = traverse $ \(user, E.Value registrationTime , E.Value userNoteId, (feature,degree,terms)) -> return (user, registrationTime, userNoteId, (entityVal <$> feature, entityVal <$> degree, entityVal <$> terms))
         dbtColonnade = colChoices
@@ -917,14 +994,22 @@ makeCourseUserTable cid colChoices psValidator = do
                                  , E.mkExactFilterWith readMay $ queryFeaturesDegree >>> (E.?. StudyDegreeKey)
                                  ] )
           , ("semesternr"  , FilterColumn $ E.mkExactFilter    $ queryFeaturesStudy >>> (E.?. StudyFeaturesSemester))
+          , ("tutorial"    , FilterColumn $ E.mkExistsFilter   $ \row criterion ->
+                E.from $ \(tutorial `E.InnerJoin` tutorialParticipant) -> do
+                  E.on $ tutorial E.^. TutorialId E.==. tutorialParticipant E.^. TutorialParticipantTutorial
+                  E.where_ $ tutorial E.^. TutorialCourse E.==. E.val cid
+                       E.&&. E.hasInfix (tutorial E.^. TutorialName) criterion
+                       E.&&. tutorialParticipant E.^. TutorialParticipantUser E.==. (queryUser row) E.^. UserId
+            )
           -- , ("course-registration", error "TODO") -- TODO
           -- , ("course-user-note", error "TODO") -- TODO
           ]
         dbtFilterUI mPrev = mconcat
           [ fltrUserNameEmailUI  mPrev
           , fltrUserMatriclenrUI mPrev
-          , prismAForm (singletonFilter "degree") mPrev $ aopt (searchField False) (fslI MsgStudyFeatureDegree)
-          , prismAForm (singletonFilter "field")  mPrev $ aopt (searchField False) (fslI MsgCourseStudyFeature)
+          , prismAForm (singletonFilter "degree")   mPrev $ aopt (searchField False) (fslI MsgStudyFeatureDegree)
+          , prismAForm (singletonFilter "field")    mPrev $ aopt (searchField False) (fslI MsgCourseStudyFeature)
+          , prismAForm (singletonFilter "tutorial") mPrev $ aopt (searchField False) (fslI MsgCourseTutorial)
           ]
         dbtParams    = DBParamsForm
           { dbParamsFormMethod = POST
@@ -942,7 +1027,7 @@ makeCourseUserTable cid colChoices psValidator = do
           }
     over _1 postprocess <$> dbTable psValidator DBTable{..}
   where
-    postprocess :: FormResult (First CourseUserAction, DBFormResult UserId Bool  UserTableData) -> FormResult (CourseUserAction, Set UserId)
+    postprocess :: FormResult (First act, DBFormResult UserId Bool UserTableData) -> FormResult (act, Set UserId)
     postprocess inp = do
       (First (Just act), usrMap) <- inp
       let usrSet = Map.keysSet . Map.filter id $ getDBFormResult (const False) usrMap
@@ -966,7 +1051,7 @@ postCUsersR tid ssh csh = do
         psValidator = def & defaultSortingByName
     ent@(Entity cid _) <- getBy404 $ TermSchoolCourseShort tid ssh csh
     numParticipants <- count [CourseParticipantCourse ==. cid]
-    table <- makeCourseUserTable cid colChoices psValidator
+    table <- makeCourseUserTable cid (const $ E.true) colChoices psValidator
     return (ent, numParticipants, table)
   formResult participantRes $ \case
     (CourseUserSendMail, selectedUsers) -> do
@@ -986,6 +1071,49 @@ postCUsersR tid ssh csh = do
     $(widgetFile "course-participants")
 
 
+
+getTUsersR, postTUsersR :: TermId -> SchoolId -> CourseShorthand -> TutorialName -> Handler Html
+getTUsersR = postTUsersR
+postTUsersR tid ssh csh tutn = do
+  (Entity tutid Tutorial{..}, (participantRes, participantTable)) <- runDB $ do
+    tut@(Entity tutid _) <- fetchTutorial tid ssh csh tutn
+    let colChoices  = mconcat
+          [ dbSelect (applying _2) id (return . view (hasEntity . _entityKey))
+          , colUserName
+          , colUserEmail
+          , colUserMatriclenr
+          , colUserDegreeShort
+          , colUserField
+          , colUserSemester
+          ]
+        psValidator = def
+          & defaultSortingByName
+          & restrictSorting (\name _ -> none (== name) ["note"]) -- We need to be careful to restrict allowed sorting/filter to not expose sensitive information
+        isInTut q = E.exists . E.from $ \tutorialParticipant -> do
+          E.where_ $ tutorialParticipant E.^. TutorialParticipantUser E.==. (queryUser q) E.^. UserId
+               E.&&. tutorialParticipant E.^. TutorialParticipantTutorial E.==. E.val tutid
+    cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
+    table <- makeCourseUserTable cid isInTut colChoices psValidator
+    return (tut, table)
+
+  formResult participantRes $ \case
+    (TutorialUserSendMail, selectedUsers) -> do
+        cids <- traverse encrypt $ Set.toList selectedUsers :: Handler [CryptoUUIDUser]
+        redirect (CTutorialR tid ssh csh tutn TCommR, [(toPathPiece GetRecipient, toPathPiece cID) | cID <- cids])
+    (TutorialUserDeregister,selectedUsers) -> do
+        nrDel <- runDB $ deleteWhereCount
+          [ TutorialParticipantTutorial ==. tutid
+          , TutorialParticipantUser <-. Set.toList selectedUsers
+          ]
+        addMessageI Success $ MsgTutorialUsersDeregistered nrDel
+        redirect $ CTutorialR tid ssh csh tutn TUsersR
+  
+  let heading = prependCourseTitle tid ssh csh $ CI.original tutorialName
+  siteLayoutMsg heading $ do
+    setTitleI heading
+    $(widgetFile "tutorial-participants")
+
+
 getCUserR, postCUserR :: TermId -> SchoolId -> CourseShorthand -> CryptoUUIDUser -> Handler Html
 getCUserR = postCUserR
 postCUserR tid ssh csh uCId = do
@@ -1125,6 +1253,13 @@ postCCommR tid ssh csh = do
               E.where_ $ sheet E.^. SheetCourse E.==. E.val cid
             return user
         )
+      , ( RGCourseTutors
+        , E.from $ \user -> do
+            E.where_ $ E.exists $ E.from $ \(tutorial `E.InnerJoin` tutor) -> do
+              E.on $ tutorial E.^. TutorialId E.==. tutor E.^. TutorTutorial
+              E.where_ $ tutorial E.^. TutorialCourse E.==. E.val cid
+            return user
+        )
       ]
     , crRecipientAuth = Just $ \uid -> do
         cID <- encrypt uid
diff --git a/src/Handler/Tutorial.hs b/src/Handler/Tutorial.hs
new file mode 100644
index 000000000..55f2d0811
--- /dev/null
+++ b/src/Handler/Tutorial.hs
@@ -0,0 +1,376 @@
+module Handler.Tutorial where
+
+import Import
+import Handler.Utils
+import Handler.Utils.Tutorial
+import Handler.Utils.Table.Cells
+import Handler.Utils.Delete
+import Handler.Utils.Communication
+import Handler.Utils.Form.MassInput
+import Handler.Utils.Form.Occurences
+
+import qualified Database.Esqueleto as E
+import Database.Esqueleto.Utils.TH
+
+import Data.Map ((!))
+import qualified Data.Map as Map
+import qualified Data.Set as Set
+
+import qualified Data.CaseInsensitive as CI
+
+import Utils.Lens
+
+
+getCTutorialListR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
+getCTutorialListR tid ssh csh = do
+  Entity cid Course{..} <- runDB . getBy404 $ TermSchoolCourseShort tid ssh csh
+
+  let
+    tutorialDBTable = DBTable{..}
+      where
+        dbtSQLQuery tutorial = do
+          E.where_ $ tutorial E.^. TutorialCourse E.==. E.val cid
+          let participants = E.sub_select . E.from $ \tutorialParticipant -> do
+                E.where_ $ tutorialParticipant E.^. TutorialParticipantTutorial E.==. tutorial E.^. TutorialId
+                return E.countRows :: E.SqlQuery (E.SqlExpr (E.Value Int))
+          return (tutorial, participants)
+        dbtRowKey = (E.^. TutorialId)
+        dbtProj = return . over (_dbrOutput . _2) E.unValue
+        dbtColonnade = dbColonnade $ mconcat
+          [ sortable (Just "type") (i18nCell MsgTutorialType) $ \DBRow{ dbrOutput = (Entity _ Tutorial{..}, _) } -> textCell $ CI.original tutorialType
+          , sortable (Just "name") (i18nCell MsgTutorialName) $ \DBRow{ dbrOutput = (Entity _ Tutorial{..}, _) } -> textCell $ CI.original tutorialName
+          , sortable Nothing (i18nCell MsgTutorialTutors) $ \DBRow{ dbrOutput = (Entity tutid _, _) } -> sqlCell $ do
+              tutors <- fmap (map $(unValueN 3)) . E.select . E.from $ \(tutor `E.InnerJoin` user) -> do
+                E.on $ tutor E.^. TutorUser E.==. user E.^. UserId
+                E.where_ $ tutor E.^. TutorTutorial E.==. E.val tutid
+                return (user E.^. UserEmail, user E.^. UserDisplayName, user E.^. UserSurname)
+              return [whamlet|
+                       <ul .list--iconless .list--inline .list--comma-separated>
+                         $forall tutor <- tutors
+                           <li>
+                             ^{nameEmailWidget' tutor}
+                     |]
+          , sortable (Just "participants") (i18nCell MsgTutorialParticipants) $ \DBRow{ dbrOutput = (Entity _ Tutorial{..}, n) } -> anchorCell (CTutorialR tid ssh csh tutorialName TUsersR) . toWidget $ tshow n
+          , sortable (Just "capacity") (i18nCell MsgTutorialCapacity) $ \DBRow{ dbrOutput = (Entity _ Tutorial{..}, _) } -> maybe mempty (textCell . tshow) tutorialCapacity
+          , sortable (Just "room") (i18nCell MsgTutorialRoom) $ \DBRow{ dbrOutput = (Entity _ Tutorial{..}, _) } -> textCell tutorialRoom
+          , sortable Nothing (i18nCell MsgTutorialTime) $ \DBRow{ dbrOutput = (Entity _ Tutorial{..}, _) } -> occurencesCell tutorialTime
+          , sortable (Just "reg-group") (i18nCell MsgTutorialRegGroup) $ \DBRow{ dbrOutput = (Entity _ Tutorial{..}, _) } -> maybe mempty (textCell . CI.original) tutorialRegGroup
+          , sortable (Just "register-from") (i18nCell MsgTutorialRegisterFrom) $ \DBRow{ dbrOutput = (Entity _ Tutorial{..}, _) } -> maybeDateTimeCell tutorialRegisterFrom
+          , sortable (Just "register-to") (i18nCell MsgTutorialRegisterTo) $ \DBRow{ dbrOutput = (Entity _ Tutorial{..}, _) } -> maybeDateTimeCell tutorialRegisterTo
+          , sortable (Just "deregister-until") (i18nCell MsgTutorialDeregisterUntil) $ \DBRow{ dbrOutput = (Entity _ Tutorial{..}, _) } -> maybeDateTimeCell tutorialDeregisterUntil
+          , sortable Nothing mempty $ \DBRow{ dbrOutput = (Entity _ Tutorial{..}, _) } -> cell $ do
+              linkButton [whamlet|_{MsgTutorialEdit}|] [BCIsButton] . SomeRoute $ CTutorialR tid ssh csh tutorialName TEditR
+              linkButton [whamlet|_{MsgTutorialDelete}|] [BCIsButton, BCDanger] . SomeRoute $ CTutorialR tid ssh csh tutorialName TDeleteR
+          ]
+        dbtSorting = Map.fromList
+          [ ("type", SortColumn $ \tutorial -> tutorial E.^. TutorialType )
+          , ("name", SortColumn $ \tutorial -> tutorial E.^. TutorialName )
+          , ("participants", SortColumn $ \tutorial -> E.sub_select . E.from $ \tutorialParticipant -> do
+                E.where_ $ tutorialParticipant E.^. TutorialParticipantTutorial E.==. tutorial E.^. TutorialId
+                return E.countRows :: E.SqlQuery (E.SqlExpr (E.Value Int))
+            )
+          , ("capacity", SortColumn $ \tutorial -> tutorial E.^. TutorialCapacity )
+          , ("room", SortColumn $ \tutorial -> tutorial E.^. TutorialRoom )
+          , ("reg-grep", SortColumn $ \tutorial -> tutorial E.^. TutorialRegGroup )
+          , ("register-from", SortColumn $ \tutorial -> tutorial E.^. TutorialRegisterFrom )
+          , ("register-to", SortColumn $ \tutorial -> tutorial E.^. TutorialRegisterTo )
+          , ("deregister-until", SortColumn $ \tutorial -> tutorial E.^. TutorialDeregisterUntil )
+          ]
+        dbtFilter = Map.empty
+        dbtFilterUI = const mempty
+        dbtStyle = def
+        dbtParams = def
+        dbtIdent :: Text
+        dbtIdent = "tutorials"
+
+    tutorialDBTableValidator = def
+      & defaultSorting [SortAscBy "type", SortAscBy "name"]
+  ((), tutorialTable) <- runDB $ dbTable tutorialDBTableValidator tutorialDBTable
+
+  siteLayoutMsg (prependCourseTitle tid ssh csh MsgTutorialsHeading) $ do
+    setTitleI $ prependCourseTitle tid ssh csh MsgTutorialsHeading
+    $(widgetFile "tutorial-list")
+
+postTRegisterR :: TermId -> SchoolId -> CourseShorthand -> TutorialName -> Handler ()
+postTRegisterR tid ssh csh tutn = do
+  uid <- requireAuthId
+
+  Entity tutid Tutorial{..} <- runDB $ fetchTutorial tid ssh csh tutn
+
+  ((btnResult, _), _) <- runFormPost buttonForm
+
+  formResult btnResult $ \case
+    BtnRegister -> do
+      runDB . void . insert $ TutorialParticipant tutid uid
+      addMessageI Success $ MsgTutorialRegisteredSuccess tutorialName
+      redirect $ CourseR tid ssh csh CShowR
+    BtnDeregister -> do
+      runDB . deleteBy $ UniqueTutorialParticipant tutid uid
+      addMessageI Success $ MsgTutorialDeregisteredSuccess tutorialName
+      redirect $ CourseR tid ssh csh CShowR
+
+  invalidArgs ["Register/Deregister button required"]
+
+getTDeleteR, postTDeleteR :: TermId -> SchoolId -> CourseShorthand -> TutorialName -> Handler Html
+getTDeleteR = postTDeleteR
+postTDeleteR tid ssh csh tutn = do
+  tutid <- runDB $ fetchTutorialId tid ssh csh tutn
+  deleteR DeleteRoute
+    { drRecords = Set.singleton tutid
+    , drUnjoin = \(_ `E.InnerJoin` tutorial) -> tutorial
+    , drGetInfo = \(course `E.InnerJoin` tutorial) -> do
+        E.on $ course E.^. CourseId E.==. tutorial E.^. TutorialCourse
+        let participants = E.sub_select . E.from $ \participant -> do
+              E.where_ $ participant E.^. TutorialParticipantTutorial E.==. tutorial E.^. TutorialId
+              return E.countRows
+        return (course, tutorial, participants :: E.SqlExpr (E.Value Int))
+    , drRenderRecord = \(Entity _ Course{..}, Entity _ Tutorial{..}, E.Value ps) ->
+        return [whamlet|_{prependCourseTitle courseTerm courseSchool courseShorthand (CI.original tutorialName)} (#{tshow ps} _{MsgParticipantsN ps})|]
+    , drRecordConfirmString = \(Entity _ Course{..}, Entity _ Tutorial{..}, E.Value ps) ->
+        return [st|#{termToText (unTermKey courseTerm)}/#{unSchoolKey courseSchool}/#{courseShorthand}/#{tutorialName}+#{tshow ps}|]
+    , drCaption = SomeMessage MsgTutorialDeleteQuestion
+    , drSuccessMessage = SomeMessage MsgTutorialDeleted
+    , drAbort = SomeRoute $ CTutorialR tid ssh csh tutn TUsersR
+    , drSuccess = SomeRoute $ CourseR tid ssh csh CTutorialListR
+    }
+
+getTCommR, postTCommR :: TermId -> SchoolId -> CourseShorthand -> TutorialName -> Handler Html
+getTCommR = postTCommR
+postTCommR tid ssh csh tutn = do
+  jSender <- requireAuthId
+  (cid, tutid) <- runDB $ fetchCourseIdTutorialId tid ssh csh tutn
+
+  commR CommunicationRoute
+    { crHeading    = SomeMessage . prependCourseTitle tid ssh csh $ SomeMessage MsgCommTutorialHeading
+    , crUltDest    = SomeRoute $ CTutorialR tid ssh csh tutn TCommR
+    , crJobs       = \Communication{..} -> do
+        let jSubject = cSubject
+            jMailContent = cBody
+            jCourse = cid
+            allRecipients = Set.toList $ Set.insert (Right jSender) cRecipients
+        jMailObjectUUID <- liftIO getRandom
+        jAllRecipientAddresses <- lift . fmap Set.fromList . forM allRecipients $ \case
+          Left email -> return . Address Nothing $ CI.original email
+          Right rid  -> userAddress <$> getJust rid
+        forM_ allRecipients $ \jRecipientEmail ->
+          yield JobSendCourseCommunication{..}
+    , crRecipients = Map.fromList
+      [ ( RGTutorialParticipants
+        , E.from $ \(user `E.InnerJoin` participant) -> do
+            E.on $ user E.^. UserId E.==. participant E.^. TutorialParticipantUser
+            E.where_ $ participant E.^. TutorialParticipantTutorial E.==. E.val tutid
+            return user
+        )
+      , ( RGCourseLecturers
+        , E.from $ \(user `E.InnerJoin` lecturer) -> do
+            E.on $ user E.^. UserId E.==. lecturer E.^. LecturerUser
+            E.where_ $ lecturer E.^. LecturerCourse E.==. E.val cid
+            return user
+        )
+      , ( RGCourseCorrectors
+        , E.from $ \user -> do
+            E.where_ $ E.exists $ E.from $ \(sheet `E.InnerJoin` corrector) -> do
+              E.on $ sheet E.^. SheetId E.==. corrector E.^. SheetCorrectorSheet
+              E.where_ $ sheet E.^. SheetCourse E.==. E.val cid
+            return user
+        )
+      , ( RGCourseTutors
+        , E.from $ \user -> do
+            E.where_ $ E.exists $ E.from $ \(tutorial `E.InnerJoin` tutor) -> do
+              E.on $ tutorial E.^. TutorialId E.==. tutor E.^. TutorTutorial
+              E.where_ $ tutorial E.^. TutorialCourse E.==. E.val cid
+            return user
+        )
+      ]
+    , crRecipientAuth = Just $ \uid -> do
+        cID <- encrypt uid
+        evalAccessDB (CourseR tid ssh csh $ CUserR cID) False
+    }
+
+
+data TutorialForm = TutorialForm
+  { tfName            :: TutorialName
+  , tfType            :: CI Text
+  , tfCapacity        :: Maybe Int
+  , tfRoom            :: Text
+  , tfTime            :: Occurences
+  , tfRegGroup        :: Maybe (CI Text)
+  , tfRegisterFrom    :: Maybe UTCTime
+  , tfRegisterTo      :: Maybe UTCTime
+  , tfDeregisterUntil :: Maybe UTCTime
+  , tfTutors          :: Set UserId -- awaiting feat/generic-invitations
+  }
+
+tutorialForm :: CourseId -> Maybe TutorialForm -> Form TutorialForm
+tutorialForm cid template html = do
+  MsgRenderer mr <- getMsgRenderer
+  Just cRoute <- getCurrentRoute
+  uid <- liftHandlerT requireAuthId
+
+  let 
+    tutorForm = Set.fromList <$> massInputAccumA miAdd' miCell' (\p -> Just . SomeRoute $ cRoute :#: p) miLayout' (fslI MsgTutorialTutors) True (Set.toList . tfTutors <$> template)
+      where
+        miAdd' :: (Text -> Text) -> FieldView UniWorX -> Form ([UserId] -> FormResult [UserId])
+        miAdd' nudge submitView csrf = do
+          (addRes, addView) <- mpreq (multiUserField False . Just $ tutUserSuggestions uid) ("" & addName (nudge "email")) Nothing
+          let
+            addRes'
+              | unresolved <- toListOf (_FormSuccess . folded . _Left) addRes
+              , (fUnresolved : _) <- unresolved
+              = FormFailure [mr $ MsgEMailUnknown fUnresolved]
+              | otherwise
+              = addRes <&> \newDat oldDat -> if
+                  | (_ : _) <- Set.toList $ setOf (folded . _Right) newDat `Set.intersection` Set.fromList oldDat
+                    -> FormFailure [mr MsgTutorialTutorAlreadyAdded]
+                  | otherwise
+                    -> FormSuccess $ toListOf (folded . _Right) newDat
+          return (addRes', $(widgetFile "tutorial/tutorMassInput/add"))
+
+
+        miCell' :: UserId -> Widget
+        miCell' userId = do
+          User{..} <- liftHandlerT . runDB $ get404 userId
+          $(widgetFile "tutorial/tutorMassInput/cellKnown")
+
+        miLayout' :: MassInputLayout ListLength UserId ()
+        miLayout' lLength _ cellWdgts delButtons addWdgts = $(widgetFile "tutorial/tutorMassInput/layout")
+  
+  flip (renderAForm FormStandard) html $ TutorialForm
+    <$> areq ciField (fslpI MsgTutorialName (mr MsgTutorialName) & setTooltip MsgTutorialNameTip) (tfName <$> template)
+    <*> areq (ciField & addDatalist tutTypeDatalist) (fslpI MsgTutorialType $ mr MsgTutorialType) (tfType <$> template)
+    <*> aopt (natFieldI MsgTutorialCapacityNonPositive) (fslpI MsgTutorialCapacity (mr MsgTutorialCapacity) & setTooltip MsgTutorialCapacityTip) (tfCapacity <$> template)
+    <*> areq textField (fslpI MsgTutorialRoom $ mr MsgTutorialRoomPlaceholder) (tfRoom <$> template)
+    <*> occurencesAForm (tfTime <$> template)
+    <*> aopt ciField (fslI MsgTutorialRegGroup & setTooltip MsgTutorialRegGroupTip) ((tfRegGroup <$> template) <|> Just (Just "tutorial"))
+    <*> aopt utcTimeField   (fslpI MsgRegisterFrom (mr MsgDate)
+                               & setTooltip MsgCourseRegisterFromTip
+                            ) (tfRegisterFrom <$> template)
+    <*> aopt utcTimeField   (fslpI MsgRegisterTo   (mr MsgDate)
+                               & setTooltip MsgCourseRegisterToTip
+                            ) (tfRegisterTo <$> template)
+    <*> aopt utcTimeField   (fslpI MsgDeRegUntil   (mr MsgDate)
+                               & setTooltip MsgCourseDeregisterUntilTip
+                            ) (tfDeregisterUntil <$> template)
+    <*> tutorForm
+  where
+    tutTypeDatalist :: WidgetT UniWorX IO (Set (CI Text))
+    tutTypeDatalist = liftHandlerT . runDB $
+      fmap (setOf $ folded . _Value) . E.select . E.from $ \tutorial -> do
+        E.where_ $ tutorial E.^. TutorialCourse E.==. E.val cid
+        return $ tutorial E.^. TutorialType
+
+    tutUserSuggestions :: UserId -> E.SqlQuery (E.SqlExpr (Entity User))
+    tutUserSuggestions uid = E.from $ \(lecturer `E.InnerJoin` course `E.InnerJoin` tutorial `E.InnerJoin` tutor `E.InnerJoin` tutorUser) -> do
+      E.on $ tutorUser E.^. UserId E.==. tutor E.^. TutorUser
+      E.on $ tutor E.^. TutorTutorial E.==. tutorial E.^. TutorialId
+      E.on $ tutorial E.^. TutorialCourse E.==. course E.^. CourseId
+      E.on $ course E.^. CourseId E.==. lecturer E.^. LecturerCourse
+      E.where_ $ lecturer E.^. LecturerUser E.==. E.val uid
+      return tutorUser
+
+
+getCTutorialNewR, postCTutorialNewR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
+getCTutorialNewR = postCTutorialNewR
+postCTutorialNewR tid ssh csh = do
+  Entity cid Course{..} <- runDB . getBy404 $ TermSchoolCourseShort tid ssh csh
+  
+  ((newTutResult, newTutWidget), newTutEnctype) <- runFormPost $ tutorialForm cid Nothing
+
+  formResult newTutResult $ \TutorialForm{..} -> do
+    insertRes <- runDB $ do
+      insertRes <- insertUnique Tutorial
+        { tutorialName            = tfName
+        , tutorialCourse          = cid
+        , tutorialType            = tfType
+        , tutorialCapacity        = tfCapacity
+        , tutorialRoom            = tfRoom
+        , tutorialTime            = tfTime
+        , tutorialRegGroup        = tfRegGroup
+        , tutorialRegisterFrom    = tfRegisterFrom
+        , tutorialRegisterTo      = tfRegisterTo
+        , tutorialDeregisterUntil = tfDeregisterUntil
+        }
+      forM_ tfTutors $ \tutor -> case insertRes of
+        Just tutid -> void . insert $ Tutor tutid tutor
+        _other     -> return ()
+      return insertRes
+    case insertRes of
+      Nothing -> addMessageI Error $ MsgTutorialNameTaken tfName
+      Just _  -> do
+        addMessageI Success $ MsgTutorialCreated tfName
+        redirect $ CourseR tid ssh csh CTutorialListR
+
+  let heading = prependCourseTitle tid ssh csh MsgTutorialNew
+
+  siteLayoutMsg heading $ do
+    setTitleI heading
+    let
+      newTutForm = wrapForm newTutWidget def
+        { formMethod = POST
+        , formAction = Just . SomeRoute $ CourseR tid ssh csh CTutorialNewR
+        , formEncoding = newTutEnctype
+        }
+    $(widgetFile "tutorial-new")
+
+getTEditR, postTEditR :: TermId -> SchoolId -> CourseShorthand -> TutorialName -> Handler Html
+getTEditR = postTEditR
+postTEditR tid ssh csh tutn = do
+  (cid, tutid, template) <- runDB $ do
+    (cid, Entity tutid Tutorial{..}) <- fetchCourseIdTutorial tid ssh csh tutn
+
+    tutorIds <- fmap (map E.unValue) . E.select . E.from $ \tutor -> do
+      E.where_ $ tutor E.^. TutorTutorial E.==. E.val tutid
+      return $ tutor E.^. TutorUser
+
+    let
+      template = TutorialForm
+        { tfName            = tutorialName
+        , tfType            = tutorialType
+        , tfCapacity        = tutorialCapacity
+        , tfRoom            = tutorialRoom
+        , tfTime            = tutorialTime
+        , tfRegGroup        = tutorialRegGroup
+        , tfRegisterFrom    = tutorialRegisterFrom
+        , tfRegisterTo      = tutorialRegisterTo
+        , tfDeregisterUntil = tutorialDeregisterUntil
+        , tfTutors          = Set.fromList tutorIds
+        }
+
+    return (cid, tutid, template)
+
+  ((newTutResult, newTutWidget), newTutEnctype) <- runFormPost . tutorialForm cid $ Just template
+
+  formResult newTutResult $ \TutorialForm{..} -> do
+    insertRes <- runDB $ do
+      insertRes <- myReplaceUnique tutid Tutorial
+        { tutorialName            = tfName
+        , tutorialCourse          = cid
+        , tutorialType            = tfType
+        , tutorialCapacity        = tfCapacity
+        , tutorialRoom            = tfRoom
+        , tutorialTime            = tfTime
+        , tutorialRegGroup        = tfRegGroup
+        , tutorialRegisterFrom    = tfRegisterFrom
+        , tutorialRegisterTo      = tfRegisterTo
+        , tutorialDeregisterUntil = tfDeregisterUntil
+        }
+      deleteWhere [ TutorTutorial ==. tutid ]
+      forM_ tfTutors $ void . insert . Tutor tutid
+      return insertRes
+    case insertRes of
+      Just _  -> addMessageI Error $ MsgTutorialNameTaken tfName
+      Nothing -> do
+        addMessageI Success $ MsgTutorialCreated tfName
+        redirect $ CourseR tid ssh csh CTutorialListR
+
+  let heading = prependCourseTitle tid ssh csh . MsgTutorialEditHeading $ tfName template
+
+  siteLayoutMsg heading $ do
+    setTitleI heading
+    let
+      newTutForm = wrapForm newTutWidget def
+        { formMethod = POST
+        , formAction = Just . SomeRoute $ CTutorialR tid ssh csh tutn TEditR
+        , formEncoding = newTutEnctype
+        }
+    $(widgetFile "tutorial-edit")
diff --git a/src/Handler/Utils/Communication.hs b/src/Handler/Utils/Communication.hs
index d0ebfb186..9ca46ae15 100644
--- a/src/Handler/Utils/Communication.hs
+++ b/src/Handler/Utils/Communication.hs
@@ -25,7 +25,8 @@ import Data.Aeson.TH
 import Data.Aeson.Types (ToJSONKey(..), FromJSONKey(..), toJSONKeyText, FromJSONKeyFunction(..))
 
 
-data RecipientGroup = RGCourseParticipants | RGCourseLecturers | RGCourseCorrectors
+data RecipientGroup = RGCourseParticipants | RGCourseLecturers | RGCourseCorrectors | RGCourseTutors
+                    | RGTutorialParticipants
   deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
 
 instance Universe RecipientGroup
diff --git a/src/Handler/Utils/DateTime.hs b/src/Handler/Utils/DateTime.hs
index 15ecfc780..dc5a59c06 100644
--- a/src/Handler/Utils/DateTime.hs
+++ b/src/Handler/Utils/DateTime.hs
@@ -25,6 +25,8 @@ import qualified Data.Time.Format as Time
 import Data.Set (Set)
 import qualified Data.Set as Set
 
+import Data.Time.Clock.System (systemEpochDay)
+
 
 utcToLocalTime :: UTCTime -> LocalTime
 utcToLocalTime = TZ.utcToLocalTimeTZ appTZ
@@ -62,6 +64,9 @@ instance HasLocalTime Day where
 instance HasLocalTime UTCTime where
   toLocalTime = utcToLocalTime
 
+instance HasLocalTime TimeOfDay where
+  toLocalTime = LocalTime systemEpochDay
+
 formatTime' :: (HasLocalTime t, MonadHandler m, HandlerSite m ~ UniWorX) => String -> t -> m Text
 formatTime' fmtStr t = fmap fromString $ Time.formatTime <$> getTimeLocale <*> pure fmtStr <*> pure (toLocalTime t)
 
diff --git a/src/Handler/Utils/Delete.hs b/src/Handler/Utils/Delete.hs
index c6de2dec9..e4e1cbff1 100644
--- a/src/Handler/Utils/Delete.hs
+++ b/src/Handler/Utils/Delete.hs
@@ -33,8 +33,8 @@ import qualified Database.Esqueleto.Internal.Language as E (From)
 
 data DeleteRoute record = forall tables infoExpr info. (E.SqlSelect infoExpr info, E.From E.SqlQuery E.SqlExpr SqlBackend tables) => DeleteRoute
   { drRecords :: Set (Key record)
-  , drUnjoin :: tables -> E.SqlExpr (Entity record)
   , drGetInfo :: tables -> E.SqlQuery infoExpr
+  , drUnjoin :: tables -> E.SqlExpr (Entity record)
   , drRenderRecord :: info -> ReaderT SqlBackend (HandlerT UniWorX IO) Widget
   , drRecordConfirmString :: info -> ReaderT SqlBackend (HandlerT UniWorX IO) Text
   , drCaption
diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index e552930d9..5f334f22f 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -173,6 +173,13 @@ multiActionA :: (RenderMessage UniWorX action, PathPiece action, Ord action, Eq
              -> AForm Handler a
 multiActionA acts fSettings defAction = formToAForm $ multiAction acts fSettings defAction mempty
 
+multiActionW :: (RenderMessage UniWorX action, PathPiece action, Ord action, Eq action)
+             => Map action (AForm Handler a)
+             -> FieldSettings UniWorX
+             -> Maybe action
+             -> WForm Handler (FormResult a)
+multiActionW acts fSettings defAction = aFormToWForm $ multiActionA acts fSettings defAction
+
 multiActionM :: (RenderMessage UniWorX action, PathPiece action, Ord action, Eq action)
              => Map action (AForm (HandlerT UniWorX IO) a)
              -> FieldSettings UniWorX
@@ -509,11 +516,8 @@ dayTimeField fs mutc = do
       | otherwise = (Nothing,Nothing)
 -}
 
-
-utcTimeField :: (MonadHandler m, HandlerSite m ~ UniWorX) => Field m UTCTime
--- StackOverflow: dayToUTC <$> (areq (jqueryDayField def {...}) settings Nothing)
--- Browser returns LocalTime
-utcTimeField = Field
+localTimeField :: (MonadHandler m, HandlerSite m ~ UniWorX) => Field m LocalTime
+localTimeField = Field
     { fieldParse = parseHelperGen readTime
     , fieldView = \theId name attrs val isReq -> do
         val' <- either id id <$> traverse (formatTime' fieldTimeFormat) val
@@ -529,13 +533,20 @@ utcTimeField = Field
     fieldTimeFormat = "%Y-%m-%dT%H:%M"
 
     -- `defaultTimeLocale` is okay here, since `fieldTimeFormat` does not contain any
-    readTime :: Text -> Either UniWorXMessage UTCTime
+    readTime :: Text -> Either UniWorXMessage LocalTime
     readTime t =
-      case localTimeToUTC <$> parseTimeM True defaultTimeLocale fieldTimeFormat (T.unpack t) of
-        Just LTUUnique{_ltuResult} -> Right _ltuResult
-        Just LTUNone{}             -> Left MsgIllDefinedUTCTime
-        Just LTUAmbiguous{}        -> Left MsgAmbiguousUTCTime
-        Nothing                    -> Left MsgInvalidDateTimeFormat
+      case parseTimeM True defaultTimeLocale fieldTimeFormat (T.unpack t) of
+        Just lTime -> Right lTime
+        Nothing    -> Left MsgInvalidDateTimeFormat
+
+utcTimeField :: (MonadHandler m, HandlerSite m ~ UniWorX) => Field m UTCTime
+utcTimeField = checkMMap (return . localTimeToUTC') utcToLocalTime localTimeField
+  where
+    localTimeToUTC' l = case localTimeToUTC l of
+      LTUUnique{_ltuResult} -> Right _ltuResult
+      LTUNone{}             -> Left MsgIllDefinedUTCTime
+      LTUAmbiguous{}        -> Left MsgAmbiguousUTCTime
+      
 
 langField :: Bool -- ^ Only allow values from `appLanguages`
           -> Field (HandlerT UniWorX IO) Lang
diff --git a/src/Handler/Utils/Form/MassInput.hs b/src/Handler/Utils/Form/MassInput.hs
index b89799f9a..c91b60d20 100644
--- a/src/Handler/Utils/Form/MassInput.hs
+++ b/src/Handler/Utils/Form/MassInput.hs
@@ -2,12 +2,13 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 
 module Handler.Utils.Form.MassInput
-  ( MassInput(..)
-  , defaultMiLayout
+  ( MassInput(..), MassInputLayout
+  , defaultMiLayout, listMiLayout
   , massInput
   , module Handler.Utils.Form.MassInput.Liveliness
   , massInputA, massInputW
   , massInputList
+  , massInputAccum, massInputAccumA
   , ListLength(..), ListPosition(..), miDeleteList
   , EnumLiveliness(..), EnumPosition(..)
   , MapLiveliness(..)
@@ -254,14 +255,17 @@ data MassInput handler liveliness cellData cellResult = MassInput
                -> liveliness
                -> Set (BoxCoord liveliness) -- ^ Usually addition widgets are only provided for dimension 0 and all _lines_ that have at least one live coordinate. `miAddEmpty` allows specifying when to provide additional widgets
   , miButtonAction :: forall p. PathPiece p => p -> Maybe (SomeRoute UniWorX) -- ^ Override form-tag route for `massInput`-Buttons to keep the user closer to the Widget, the `PathPiece` Argument is to be used for constructiong a `Fragment`
-  , miLayout :: liveliness
-             -> Map (BoxCoord liveliness) (cellData, FormResult cellResult)
-             -> Map (BoxCoord liveliness) Widget -- Cell Widgets
-             -> Map (BoxCoord liveliness) (FieldView UniWorX) -- Delete buttons
-             -> Map (Natural, BoxCoord liveliness) Widget -- Addition forms
-             -> Widget
+  , miLayout :: MassInputLayout liveliness cellData cellResult
   }
 
+type MassInputLayout liveliness cellData cellResult
+  =    liveliness
+    -> Map (BoxCoord liveliness) (cellData, FormResult cellResult)
+    -> Map (BoxCoord liveliness) Widget -- Cell Widgets
+    -> Map (BoxCoord liveliness) (FieldView UniWorX) -- Delete buttons
+    -> Map (Natural, BoxCoord liveliness) Widget -- Addition forms
+    -> Widget
+
 massInput :: forall handler cellData cellResult liveliness.
            ( MonadHandler handler, HandlerSite handler ~ UniWorX
            , ToJSON cellData, FromJSON cellData
@@ -418,12 +422,7 @@ massInput MassInput{..} FieldSettings{..} fvRequired initialResult csrf = do
 
 defaultMiLayout :: forall liveliness cellData cellResult.
                    Liveliness liveliness
-                => liveliness
-                -> Map (BoxCoord liveliness) (cellData, FormResult cellResult)
-                -> Map (BoxCoord liveliness) Widget
-                -> Map (BoxCoord liveliness) (FieldView UniWorX)
-                -> Map (Natural, BoxCoord liveliness) Widget
-                -> Widget
+                => MassInputLayout liveliness cellData cellResult
 -- | Generic `miLayout` using recursively nested lists
 defaultMiLayout liveliness _ cellResults delResults addResults = miWidget' boxOrigin [] $ zip [0..] boxDimensions
   where
@@ -442,6 +441,9 @@ defaultMiLayout liveliness _ cellResults delResults addResults = miWidget' boxOr
           addWidget = Map.lookup (dimIx, miCoord) addResults
        in $(widgetFile "widgets/massinput/row")
 
+listMiLayout :: MassInputLayout ListLength cellData cellResult
+listMiLayout lLength _ cellWdgts delButtons addWdgts = $(widgetFile "widgets/massinput/list/layout")
+
 
 -- | Wrapper around `massInput` for the common case, that we just want an arbitrary list of single fields without any constraints
 massInputList :: forall handler cellResult.
@@ -464,13 +466,67 @@ massInputList field fieldSettings miButtonAction miSettings miRequired miPrevRes
             , miAllowAdd = \_ _ _ -> True
             , miAddEmpty = \_ _ _ -> Set.empty
             , miButtonAction
-            , miLayout = \lLength _ cellWdgts delButtons addWdgts
-              -> $(widgetFile "widgets/massinput/list/layout")
+            , miLayout = listMiLayout
             }
   miSettings
   miRequired
   (Map.fromList . zip [0..] . map ((), ) <$> miPrevResult)
 
+-- | Wrapper around `massInput` for the common case, that we just want a list of data with no option to modify it except deletion and addition
+massInputAccum :: forall handler cellData.
+                  ( MonadHandler handler, HandlerSite handler ~ UniWorX
+                  , MonadLogger handler
+                  , ToJSON cellData, FromJSON cellData
+                  )
+               => ((Text -> Text) -> FieldView UniWorX -> (Markup -> MForm handler (FormResult ([cellData] -> FormResult [cellData]), Widget)))
+               -> (cellData -> Widget)
+               -> (forall p. PathPiece p => p -> Maybe (SomeRoute UniWorX))
+               -> MassInputLayout ListLength cellData ()
+               -> FieldSettings UniWorX
+               -> Bool
+               -> Maybe [cellData]
+               -> (Markup -> MForm handler (FormResult [cellData], FieldView UniWorX))
+massInputAccum miAdd' miCell' miButtonAction miLayout fSettings fRequired mPrev csrf
+  = over (_1 . mapped) (map fst . Map.elems) <$> massInput MassInput{..} fSettings fRequired (Map.fromList . zip [0..] . map (, ()) <$> mPrev) csrf
+  where
+    miAdd :: ListPosition -> Natural
+          -> (Text -> Text) -> FieldView UniWorX
+          -> Maybe (Markup -> MForm handler (FormResult (Map ListPosition cellData -> FormResult (Map ListPosition cellData)), Widget))
+    miAdd _pos _dim nudge submitView = Just $ \csrf' -> over (_1 . mapped) doAdd <$> miAdd' nudge submitView csrf'
+
+    doAdd :: ([cellData] -> FormResult [cellData]) -> (Map ListPosition cellData -> FormResult (Map ListPosition cellData))
+    doAdd f prevData = Map.fromList . zip [startKey..] <$> f prevElems
+      where
+        prevElems = Map.elems prevData
+        startKey = maybe 0 succ $ fst <$> Map.lookupMax prevData
+
+    miCell :: ListPosition -> cellData -> Maybe () -> (Text -> Text)
+           -> (Markup -> MForm handler (FormResult (), Widget))
+    miCell _pos dat _mPrev _nudge csrf' = return (FormSuccess (), toWidget csrf' <> miCell' dat)
+
+    miDelete = miDeleteList
+
+    miAllowAdd _ _ _ = True
+
+    miAddEmpty _ _ _ = Set.empty
+
+massInputAccumA :: forall handler cellData.
+                  ( MonadHandler handler, HandlerSite handler ~ UniWorX
+                  , MonadLogger handler
+                  , ToJSON cellData, FromJSON cellData
+                  )
+               => ((Text -> Text) -> FieldView UniWorX -> (Markup -> MForm handler (FormResult ([cellData] -> FormResult [cellData]), Widget)))
+               -> (cellData -> Widget)
+               -> (forall p. PathPiece p => p -> Maybe (SomeRoute UniWorX))
+               -> MassInputLayout ListLength cellData ()
+               -> FieldSettings UniWorX
+               -> Bool
+               -> Maybe [cellData]
+               -> AForm handler [cellData]
+massInputAccumA miAdd' miCell' miButtonAction' miLayout' fSettings fRequired mPrev
+  = formToAForm $ over _2 pure <$> massInputAccum miAdd' miCell' miButtonAction' miLayout' fSettings fRequired mPrev mempty
+
+
 massInputA :: forall handler cellData cellResult liveliness.
            ( MonadHandler handler, HandlerSite handler ~ UniWorX
            , ToJSON cellData, FromJSON cellData
diff --git a/src/Handler/Utils/Form/Occurences.hs b/src/Handler/Utils/Form/Occurences.hs
new file mode 100644
index 000000000..4445413c9
--- /dev/null
+++ b/src/Handler/Utils/Form/Occurences.hs
@@ -0,0 +1,122 @@
+module Handler.Utils.Form.Occurences
+  ( occurencesAForm
+  ) where
+
+import Import
+import Handler.Utils.Form
+import Handler.Utils.Form.MassInput
+import Handler.Utils.DateTime
+
+import qualified Data.Set as Set
+import Data.Map ((!))
+import qualified Data.Map as Map
+
+import Utils.Lens
+
+  
+data OccurenceScheduleKind = ScheduleKindWeekly
+  deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
+
+instance Universe OccurenceScheduleKind
+instance Finite OccurenceScheduleKind
+
+nullaryPathPiece ''OccurenceScheduleKind $ camelToPathPiece' 2
+embedRenderMessage ''UniWorX ''OccurenceScheduleKind id
+
+data OccurenceExceptionKind = ExceptionKindOccur
+                            | ExceptionKindNoOccur
+  deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
+
+instance Universe OccurenceExceptionKind
+instance Finite OccurenceExceptionKind
+
+nullaryPathPiece ''OccurenceExceptionKind $ camelToPathPiece' 2
+embedRenderMessage ''UniWorX ''OccurenceExceptionKind id
+
+
+occurencesAForm :: Maybe Occurences -> AForm Handler Occurences
+occurencesAForm mPrev = wFormToAForm $ do
+  Just cRoute <- getCurrentRoute
+  
+  let
+    scheduled :: AForm Handler (Set OccurenceSchedule)
+    scheduled = Set.fromList <$> massInputAccumA
+      miAdd'
+      miCell'
+      (\p -> Just . SomeRoute $ cRoute :#: p)
+      miLayout'
+      (fslI MsgScheduleRegular)
+      False
+      (Set.toList . occurencesScheduled <$> mPrev)
+      where
+        miAdd' :: (Text -> Text) -> FieldView UniWorX -> Form ([OccurenceSchedule] -> FormResult [OccurenceSchedule])
+        miAdd' nudge submitView = over (mapped . mapped . _2) (\addWidget -> $(widgetFile "widgets/occurence/form/scheduled-add")) . renderAForm FormStandard . wFormToAForm $ do
+          newSched <- multiActionW
+            (Map.fromList [ ( ScheduleKindWeekly
+                            , ScheduleWeekly
+                                <$> apreq (selectField optionsFinite) (fslI MsgWeekDay & addName (nudge "occur-week-day")) Nothing
+                                <*> apreq timeFieldTypeTime (fslI MsgOccurenceStart & addName (nudge "occur-start")) Nothing
+                                <*> apreq timeFieldTypeTime (fslI MsgOccurenceEnd & addName (nudge "occur-end")) Nothing
+                            )
+                          ]
+            ) (fslI MsgScheduleRegularKind & addName (nudge "kind")) Nothing
+          MsgRenderer mr <- getMsgRenderer
+          return $ newSched <&> \newSched' oldScheds -> if
+            | newSched' `elem` oldScheds -> FormFailure [mr MsgScheduleExists]
+            | otherwise -> FormSuccess $ pure newSched'
+
+        miCell' :: OccurenceSchedule -> Widget
+        miCell' ScheduleWeekly{..} = do
+          scheduleStart' <- formatTime SelFormatTime scheduleStart
+          scheduleEnd' <- formatTime SelFormatTime scheduleEnd
+          $(widgetFile "widgets/occurence/form/weekly")
+
+        miLayout' :: MassInputLayout ListLength OccurenceSchedule ()
+        miLayout' lLength _ cellWdgts delButtons addWdgts = $(widgetFile "widgets/occurence/form/scheduled-layout")
+
+    exceptions :: AForm Handler (Set OccurenceException)
+    exceptions = Set.fromList <$> massInputAccumA
+      miAdd'
+      miCell'
+      (\p -> Just . SomeRoute $ cRoute :#: p)
+      miLayout'
+      (fslI MsgScheduleExceptions & setTooltip MsgScheduleExceptionsTip)
+      False
+      (Set.toList . occurencesExceptions <$> mPrev)
+      where
+        miAdd' :: (Text -> Text) -> FieldView UniWorX -> Form ([OccurenceException] -> FormResult [OccurenceException])
+        miAdd' nudge submitView = over (mapped . mapped . _2) (\addWidget -> $(widgetFile "widgets/occurence/form/except-add")) . renderAForm FormStandard . wFormToAForm $ do
+          newExc <- multiActionW
+            (Map.fromList [ ( ExceptionKindOccur
+                            , ExceptOccur
+                                <$> apreq dayField (fslI MsgDay & addName (nudge "occur-day")) Nothing
+                                <*> apreq timeFieldTypeTime (fslI MsgOccurenceStart & addName (nudge "occur-start")) Nothing
+                                <*> apreq timeFieldTypeTime (fslI MsgOccurenceEnd & addName (nudge "occur-end")) Nothing
+                            )
+                          , ( ExceptionKindNoOccur
+                            , ExceptNoOccur
+                                <$> apreq localTimeField (fslI MsgExceptionNoOccurAt & addName (nudge "no-occur-time")) Nothing
+                            )
+                          ]
+            ) (fslI MsgExceptionKind & addName (nudge "kind")) Nothing
+          MsgRenderer mr <- getMsgRenderer
+          return $ newExc <&> \newExc' oldExcs -> if
+            | newExc' `elem` oldExcs -> FormFailure [mr MsgExceptionExists]
+            | otherwise -> FormSuccess $ pure newExc'
+          
+
+        miCell' :: OccurenceException -> Widget
+        miCell' ExceptOccur{..} = do
+          exceptStart' <- formatTime SelFormatDateTime (LocalTime exceptDay exceptStart)
+          exceptEnd'   <- formatTime SelFormatTime     exceptStart
+          $(widgetFile "widgets/occurence/form/except-occur")
+        miCell' ExceptNoOccur{..} = do
+          exceptTime' <- formatTime SelFormatDateTime exceptTime
+          $(widgetFile "widgets/occurence/form/except-no-occur")
+
+        miLayout' :: MassInputLayout ListLength OccurenceException ()
+        miLayout' lLength _ cellWdgts delButtons addWdgts = $(widgetFile "widgets/occurence/form/except-layout")
+
+  aFormToWForm $ Occurences
+    <$> scheduled
+    <*> exceptions
diff --git a/src/Handler/Utils/Sheet.hs b/src/Handler/Utils/Sheet.hs
index ff23e9d6a..0dbef5706 100644
--- a/src/Handler/Utils/Sheet.hs
+++ b/src/Handler/Utils/Sheet.hs
@@ -15,7 +15,7 @@ fetchSheetAux ::  ( BaseBackend backend ~ SqlBackend
   =>  (E.SqlExpr (Entity Sheet) -> E.SqlExpr (Entity Course) -> b)
       -> TermId -> SchoolId -> CourseShorthand -> SheetName -> ReaderT backend m a
 fetchSheetAux prj tid ssh csh shn =
-    let cachId = encodeUtf8 $ tshow (tid,ssh,csh,shn)
+    let cachId = encodeUtf8 $ tshow (tid, ssh, csh, shn)
     in  cachedBy cachId $ do
     -- Mit Yesod:
     -- cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
diff --git a/src/Handler/Utils/Submission.hs b/src/Handler/Utils/Submission.hs
index 67c8fab75..c65ae308b 100644
--- a/src/Handler/Utils/Submission.hs
+++ b/src/Handler/Utils/Submission.hs
@@ -79,32 +79,33 @@ assignSubmissions sid restriction = do
       loadMap :: Map UserId Bool
       loadMap = Map.fromList [(sheetCorrectorUser,b) | Entity _ SheetCorrector{ sheetCorrectorLoad = (Load {byTutorial = Just b}), .. } <- corrsTutorial]
 
-    currentSubs <- E.select . E.from $ \(submission `E.LeftOuterJoin` tutor) -> do
-        let tutors = E.subList_select . E.from $ \(submissionUser `E.InnerJoin` tutorialUser `E.InnerJoin` tutorial) -> do
+    currentSubs <- E.select . E.from $ \(submission `E.LeftOuterJoin` tutor') -> do
+        let tutors = E.subList_select . E.from $ \(submissionUser `E.InnerJoin` tutorialUser `E.InnerJoin` tutorial `E.InnerJoin` tutor) -> do
               -- Uncomment next line for equal chance between tutors, irrespective of the number of students per tutor per submission group
               -- E.distinctOn [E.don $ tutorial E.^. TutorialTutor] $ do
-                E.on (tutorial       E.^. TutorialId         E.==. tutorialUser E.^. TutorialUserTutorial)
-                E.on (submissionUser E.^. SubmissionUserUser E.==. tutorialUser E.^. TutorialUserUser)
-                E.where_ (tutorial   E.^. TutorialTutor `E.in_` E.valList (map (sheetCorrectorUser . entityVal) corrsTutorial))
-                return $ tutorial E.^. TutorialTutor
-        E.on $ tutor E.?. UserId `E.in_` E.justList tutors
+                E.on (tutorial       E.^. TutorialId         E.==. tutor        E.^. TutorTutorial)
+                E.on (tutorial       E.^. TutorialId         E.==. tutorialUser E.^. TutorialParticipantTutorial)
+                E.on (submissionUser E.^. SubmissionUserUser E.==. tutorialUser E.^. TutorialParticipantUser)
+                E.where_ (tutor   E.^. TutorUser `E.in_` E.valList (map (sheetCorrectorUser . entityVal) corrsTutorial))
+                return $ tutor E.^. TutorUser
+        E.on $ tutor' E.?. UserId `E.in_` E.justList tutors
         E.where_ $ submission E.^. SubmissionSheet E.==. E.val sid
              E.&&. maybe (E.val True) (submission E.^. SubmissionId `E.in_`) (E.valList . Set.toList <$> restriction)
-        return (submission E.^. SubmissionId, tutor)
+        return (submission E.^. SubmissionId, tutor' E.?. UserId)
 
     let subTutor' :: Map SubmissionId (Set UserId)
         subTutor' = Map.fromListWith Set.union $ currentSubs
-          & mapped._2 %~ maybe Set.empty Set.singleton
-          & mapped._2 %~ Set.mapMonotonic entityKey
+          & mapped._2 %~ (maybe Set.empty Set.singleton . E.unValue)
           & mapped._1 %~ E.unValue
 
     prevSubs <- E.select . E.from $ \((sheet `E.InnerJoin` sheetCorrector) `E.LeftOuterJoin` submission) -> do
         E.on $ E.joinV (submission E.?. SubmissionRatingBy) E.==. E.just (sheetCorrector E.^. SheetCorrectorUser)
         E.on $ sheetCorrector E.^. SheetCorrectorSheet E.==. sheet E.^. SheetId
-        let isByTutorial = E.exists . E.from $ \(submissionUser `E.InnerJoin` tutorialUser `E.InnerJoin` tutorial) -> do
-              E.on $ tutorial E.^. TutorialId E.==. tutorialUser E.^. TutorialUserTutorial
-              E.on $ submissionUser E.^. SubmissionUserUser E.==. tutorialUser E.^. TutorialUserUser
-              E.where_ $ tutorial E.^. TutorialTutor E.==. sheetCorrector E.^. SheetCorrectorUser
+        let isByTutorial = E.exists . E.from $ \(submissionUser `E.InnerJoin` tutorialUser `E.InnerJoin` tutorial `E.InnerJoin` tutor) -> do
+              E.on (tutorial E.^. TutorialId E.==. tutor E.^. TutorTutorial)
+              E.on $ tutorial E.^. TutorialId E.==. tutorialUser E.^. TutorialParticipantTutorial
+              E.on $ submissionUser E.^. SubmissionUserUser E.==. tutorialUser E.^. TutorialParticipantUser
+              E.where_ $ tutor E.^. TutorUser E.==. sheetCorrector E.^. SheetCorrectorUser
                    E.&&. submission E.?. SubmissionId E.==. E.just (submissionUser E.^. SubmissionUserSubmission)
         E.where_ $ sheet E.^. SheetCourse E.==. E.val sheetCourse
              E.&&. sheetCorrector E.^. SheetCorrectorUser `E.in_` E.valList (map (sheetCorrectorUser . entityVal) correctors)
diff --git a/src/Handler/Utils/Table/Cells.hs b/src/Handler/Utils/Table/Cells.hs
index 28b3df6b2..5b0cd1eee 100644
--- a/src/Handler/Utils/Table/Cells.hs
+++ b/src/Handler/Utils/Table/Cells.hs
@@ -14,6 +14,10 @@ import Text.Blaze (ToMarkup(..))
 import Utils.Lens
 import Handler.Utils
 
+import Utils.Occurences
+
+import qualified Data.Set as Set
+
 
 type CourseLink = (TermId, SchoolId, CourseShorthand) -- TODO: Refactor with WithHoles !
 
@@ -189,3 +193,19 @@ correctorLoadCell :: IsDBTable m a => SheetCorrector -> DBCell m a
 correctorLoadCell sc =
   i18nCell $ sheetCorrectorLoad sc
 
+occurencesCell :: IsDBTable m a => Occurences -> DBCell m a
+occurencesCell (normalizeOccurences -> Occurences{..}) = cell $ do
+  let occurencesScheduled' = flip map (Set.toList occurencesScheduled) $ \case
+        ScheduleWeekly{..} -> do
+          scheduleStart' <- formatTime SelFormatTime scheduleStart
+          scheduleEnd' <- formatTime SelFormatTime scheduleEnd
+          $(widgetFile "widgets/occurence/cell/weekly")
+      occurencesExceptions' = flip map (Set.toList occurencesExceptions) $ \case
+        ExceptOccur{..} -> do
+          exceptStart' <- formatTime SelFormatDateTime (LocalTime exceptDay exceptStart)
+          exceptEnd'   <- formatTime SelFormatTime     exceptStart
+          $(widgetFile "widgets/occurence/cell/except-occur")
+        ExceptNoOccur{..} -> do
+          exceptTime' <- formatTime SelFormatDateTime exceptTime
+          $(widgetFile "widgets/occurence/cell/except-no-occur")
+  $(widgetFile "widgets/occurence/cell")
diff --git a/src/Handler/Utils/Table/Pagination.hs b/src/Handler/Utils/Table/Pagination.hs
index ce39f6300..3e32e7028 100644
--- a/src/Handler/Utils/Table/Pagination.hs
+++ b/src/Handler/Utils/Table/Pagination.hs
@@ -87,6 +87,15 @@ import Crypto.Hash.Algorithms (SHAKE256)
 import qualified Data.ByteString.Base64.URL as Base64 (encode)
 import qualified Data.ByteString.Lazy as LBS
 
+import Data.Semigroup as Sem (Semigroup(..))
+
+
+#if MIN_VERSION_base(4,11,0)
+type Monoid' = Monoid
+#else
+type Monoid' x = (Sem.Semigroup x, Monoid x)
+#endif
+
 
 data SortColumn t = forall a. PersistField a => SortColumn { getSortColumn :: t -> E.SqlExpr (E.Value a) }
 
@@ -404,7 +413,7 @@ data DBTable m x = forall a r r' h i t k k'.
   , dbtIdent :: i
   }
 
-class (MonadHandler m, HandlerSite m ~ UniWorX, Monoid x, Monoid (DBCell m x), Default (DBParams m x)) => IsDBTable (m :: * -> *) (x :: *) where
+class (MonadHandler m, HandlerSite m ~ UniWorX, Monoid' x, Monoid' (DBCell m x), Default (DBParams m x)) => IsDBTable (m :: * -> *) (x :: *) where
   data DBParams m x :: *
   type DBResult m x :: *
   -- type DBResult' m x :: *
@@ -428,7 +437,7 @@ cellAttrs = dbCell . _1
 cellContents :: IsDBTable m x => Lens' (DBCell m x) (WriterT x m Widget)
 cellContents = dbCell . _2
 
-instance Monoid x => IsDBTable (HandlerT UniWorX IO) x where
+instance Monoid' x => IsDBTable (HandlerT UniWorX IO) x where
   data DBParams (HandlerT UniWorX IO) x = DBParamsWidget
   type DBResult (HandlerT UniWorX IO) x = (x, Widget)
   -- type DBResult' (WidgetT UniWorX IO) () = ()
@@ -447,14 +456,17 @@ instance Monoid x => IsDBTable (HandlerT UniWorX IO) x where
   dbHandler _ _ f = return . over _2 f
   runDBTable _ _ _ = liftHandlerT
 
-instance Monoid x => Monoid (DBCell (HandlerT UniWorX IO) x) where
+instance Monoid' x => Sem.Semigroup (DBCell (HandlerT UniWorX IO) x) where
+  (WidgetCell a c) <> (WidgetCell a' c') = WidgetCell (a <> a') ((<>) <$> c <*> c')
+
+instance Monoid' x => Monoid (DBCell (HandlerT UniWorX IO) x) where
   mempty = WidgetCell mempty $ return mempty
-  (WidgetCell a c) `mappend` (WidgetCell a' c') = WidgetCell (mappend a a') (mappend <$> c <*> c')
+  mappend = (<>)
 
 instance Default (DBParams (HandlerT UniWorX IO) x) where
   def = DBParamsWidget
 
-instance Monoid x => IsDBTable (ReaderT SqlBackend (HandlerT UniWorX IO)) x where
+instance Monoid' x => IsDBTable (ReaderT SqlBackend (HandlerT UniWorX IO)) x where
   data DBParams (ReaderT SqlBackend (HandlerT UniWorX IO)) x = DBParamsDB
   type DBResult (ReaderT SqlBackend (HandlerT UniWorX IO)) x = (x, Widget)
 
@@ -472,9 +484,12 @@ instance Monoid x => IsDBTable (ReaderT SqlBackend (HandlerT UniWorX IO)) x wher
   -- runDBTable :: forall m. (MonadHandler m, HandlerSite m ~ UniWorX) => ReaderT SqlBackend (HandlerT UniWorX IO) ((), Widget) -> m (Widget)
   runDBTable _ _ _ = mapReaderT liftHandlerT
 
-instance Monoid x => Monoid (DBCell (ReaderT SqlBackend (HandlerT UniWorX IO)) x) where
+instance Monoid' x => Sem.Semigroup (DBCell (ReaderT SqlBackend (HandlerT UniWorX IO)) x) where
+  (DBCell a c) <> (DBCell a' c') = DBCell (a <> a') ((<>) <$> c <*> c')
+
+instance Monoid' x => Monoid (DBCell (ReaderT SqlBackend (HandlerT UniWorX IO)) x) where
   mempty = DBCell mempty $ return mempty
-  (DBCell a c) `mappend` (DBCell a' c') = DBCell (mappend a a') (mappend <$> c <*> c')
+  mappend = (<>)
 
 instance Default (DBParams (ReaderT SqlBackend (HandlerT UniWorX IO)) x) where
   def = DBParamsDB
@@ -492,7 +507,7 @@ unDBParamsFormIdent DBTable{dbtIdent}  DBParamsFormTableIdent       = Just $ toP
 unDBParamsFormIdent _                 (DBParamsFormOverrideIdent x) = Just $ toPathPiece x
 unDBParamsFormIdent _                  DBParamsFormNoIdent          = Nothing
 
-instance Monoid x => IsDBTable (RWST (Maybe (Env, FileEnv), UniWorX, [Lang]) Enctype Ints (HandlerT UniWorX IO)) x where
+instance Monoid' x => IsDBTable (RWST (Maybe (Env, FileEnv), UniWorX, [Lang]) Enctype Ints (HandlerT UniWorX IO)) x where
   data DBParams (RWST (Maybe (Env, FileEnv), UniWorX, [Lang]) Enctype Ints (HandlerT UniWorX IO)) x = forall a. DBParamsForm
     { dbParamsFormMethod     :: StdMethod
     , dbParamsFormAction     :: Maybe (SomeRoute UniWorX)
@@ -541,7 +556,7 @@ instance Monoid x => IsDBTable (RWST (Maybe (Env, FileEnv), UniWorX, [Lang]) Enc
       adjResult _                  = FormFailure $ pure reasonTxt
     return $ over (_1 . dbParamsFormResult) adjResult result
 
-instance Monoid x => Default (DBParams (RWST (Maybe (Env, FileEnv), UniWorX, [Lang]) Enctype Ints (HandlerT UniWorX IO)) x) where
+instance Monoid' x => Default (DBParams (RWST (Maybe (Env, FileEnv), UniWorX, [Lang]) Enctype Ints (HandlerT UniWorX IO)) x) where
   def = DBParamsForm
     { dbParamsFormMethod     = POST
     , dbParamsFormAction     = Nothing
@@ -553,7 +568,7 @@ instance Monoid x => Default (DBParams (RWST (Maybe (Env, FileEnv), UniWorX, [La
     , dbParamsFormIdent      = def
     }
 
-dbParamsFormWrap :: Monoid x => DBTable (MForm (HandlerT UniWorX IO)) x -> DBParams (MForm (HandlerT UniWorX IO)) x -> (Html -> MForm (HandlerT UniWorX IO) (x, Widget)) -> (Html -> MForm (HandlerT UniWorX IO) (x, Widget))
+dbParamsFormWrap :: Monoid' x => DBTable (MForm (HandlerT UniWorX IO)) x -> DBParams (MForm (HandlerT UniWorX IO)) x -> (Html -> MForm (HandlerT UniWorX IO) (x, Widget)) -> (Html -> MForm (HandlerT UniWorX IO) (x, Widget))
 dbParamsFormWrap DBTable{ dbtIdent } DBParamsForm{..} tableForm frag = do
   let form = mappend <$> tableForm frag <*> (fmap (over _1 $ (flip $ set dbParamsFormResult) mempty) $ dbParamsFormAdditional mempty)
   ((res, fWidget), enctype) <- listen form
@@ -588,9 +603,12 @@ addPreviousHiddenField DBTable{ dbtIdent } pKeys form fragment = do
     wIdent :: Text -> Text
     wIdent = toPathPiece . WithIdent dbtIdent
 
-instance Monoid x => Monoid (DBCell (RWST (Maybe (Env, FileEnv), UniWorX, [Lang]) Enctype Ints (HandlerT UniWorX IO)) x) where
+instance Monoid' x => Sem.Semigroup (DBCell (RWST (Maybe (Env, FileEnv), UniWorX, [Lang]) Enctype Ints (HandlerT UniWorX IO)) x) where
+  (FormCell attrs c l) <> (FormCell attrs' c' l') = FormCell (attrs <> attrs') ((\(a, w) (a', w') -> ((,) <$> a <*> a', w <> w')) <$> c <*> c') (lens (liftA2 (,) <$> view l <*> view l') (\s as -> s & l .~ (fst <$> as) & l' .~ (snd <$> as)))
+
+instance Monoid' x => Monoid (DBCell (RWST (Maybe (Env, FileEnv), UniWorX, [Lang]) Enctype Ints (HandlerT UniWorX IO)) x) where
   mempty = FormCell mempty (return mempty) $ lens (\_ -> pure ()) (\s _ -> s)
-  (FormCell attrs c l) `mappend` (FormCell attrs' c' l') = FormCell (mappend attrs attrs') ((\(a, w) (a', w') -> ((,) <$> a <*> a', mappend w w')) <$> c <*> c') (lens (liftA2 (,) <$> view l <*> view l') (\s as -> s & l .~ (fst <$> as) & l' .~ (snd <$> as)))
+  mappend = (<>)
 
 instance IsDBTable m a => IsString (DBCell m a) where
   fromString = cell . fromString
@@ -779,24 +797,24 @@ dbTable PSValidator{..} dbtable@DBTable{ dbtIdent = dbtIdent'@(toPathPiece -> db
     setParam :: Text -> Maybe Text -> QueryText -> QueryText
     setParam key = setParams key . maybeToList
 
-dbTableWidget :: Monoid x => PSValidator (HandlerT UniWorX IO) x -> DBTable (HandlerT UniWorX IO) x
+dbTableWidget :: Monoid' x => PSValidator (HandlerT UniWorX IO) x -> DBTable (HandlerT UniWorX IO) x
     -> DB (DBResult (HandlerT UniWorX IO) x)
 dbTableWidget = dbTable
 
 dbTableWidget' :: PSValidator (HandlerT UniWorX IO) () -> DBTable (HandlerT UniWorX IO) () -> DB Widget
 dbTableWidget' = fmap (fmap snd) . dbTable
 
-widgetColonnade :: (Headedness h, Monoid x)
+widgetColonnade :: (Headedness h, Monoid' x)
                 => Colonnade h r (DBCell (HandlerT UniWorX IO) x)
                 -> Colonnade h r (DBCell (HandlerT UniWorX IO) x)
 widgetColonnade = id
 
-formColonnade :: (Headedness h, Monoid a)
+formColonnade :: (Headedness h, Monoid' a)
               => Colonnade h r (DBCell (RWST (Maybe (Env, FileEnv), UniWorX, [Lang]) Enctype Ints (HandlerT UniWorX IO)) (FormResult a))
               -> Colonnade h r (DBCell (RWST (Maybe (Env, FileEnv), UniWorX, [Lang]) Enctype Ints (HandlerT UniWorX IO)) (FormResult a))
 formColonnade = id
 
-dbColonnade :: (Headedness h, Monoid x)
+dbColonnade :: (Headedness h, Monoid' x)
             => Colonnade h r (DBCell (ReaderT SqlBackend (HandlerT UniWorX IO)) x)
             -> Colonnade h r (DBCell (ReaderT SqlBackend (HandlerT UniWorX IO)) x)
 dbColonnade = id
@@ -880,9 +898,12 @@ newtype DBFormResult i a r = DBFormResult (Map i (r, a -> a))
 instance Functor (DBFormResult i a) where
   f `fmap` (DBFormResult resMap) = DBFormResult $ fmap (over _1 f) resMap
 
+instance Ord i => Sem.Semigroup (DBFormResult i a r) where
+  (DBFormResult m1) <> (DBFormResult m2) = DBFormResult $ Map.unionWith (\(r, f1) (_, f2) -> (r, f2 . f1)) m1 m2
+
 instance Ord i => Monoid (DBFormResult i a r) where
   mempty = DBFormResult Map.empty
-  (DBFormResult m1) `mappend` (DBFormResult m2) = DBFormResult $ Map.unionWith (\(r, f1) (_, f2) -> (r, f2 . f1)) m1 m2
+  mappend = (<>)
 
 getDBFormResult :: forall r i a. Ord i => (r -> a) -> DBFormResult i a r -> Map i a
 getDBFormResult initial (DBFormResult m) = Map.map (\(r, f) -> f $ initial r) m
@@ -914,7 +935,7 @@ formCell formCellLens genIndex genForm input@(DBRow{dbrKey}) = FormCell
 dbRow :: forall h r m a. (Headedness h, IsDBTable m a) => Colonnade h (DBRow r) (DBCell m a)
 dbRow = Colonnade.singleton (headednessPure $ i18nCell MsgNrColumn) $ \DBRow{ dbrIndex } -> textCell $ tshow dbrIndex
 
-dbSelect :: forall x h r i a. (Headedness h, Ord i, PathPiece i, Monoid x)
+dbSelect :: forall x h r i a. (Headedness h, Ord i, PathPiece i, Monoid' x)
          => Lens' x (FormResult (DBFormResult i a (DBRow r)))
          -> Setter' a Bool
          -> (DBRow r -> MForm (HandlerT UniWorX IO) i)
diff --git a/src/Handler/Utils/Tutorial.hs b/src/Handler/Utils/Tutorial.hs
new file mode 100644
index 000000000..fc3d992e0
--- /dev/null
+++ b/src/Handler/Utils/Tutorial.hs
@@ -0,0 +1,47 @@
+module Handler.Utils.Tutorial
+  ( fetchTutorialAux
+  , fetchTutorial, fetchTutorialId, fetchCourseIdTutorialId, fetchCourseIdTutorial
+  ) where
+
+import Import
+
+import Database.Persist.Sql (SqlBackendCanRead)
+import qualified Database.Esqueleto as E
+import qualified Database.Esqueleto.Internal.Sql as E
+import Database.Esqueleto.Utils.TH
+
+import Utils.Lens
+
+
+fetchTutorialAux :: ( SqlBackendCanRead backend
+                    , E.SqlSelect b a
+                    , MonadHandler m
+                    , Typeable a
+                    )
+                 => (E.SqlExpr (Entity Tutorial) -> E.SqlExpr (Entity Course) -> b)
+                 -> TermId -> SchoolId -> CourseShorthand -> TutorialName -> ReaderT backend m a
+fetchTutorialAux prj tid ssh csh tutn =
+    let cachId = encodeUtf8 $ tshow (tid, ssh, csh, tutn)
+    in  cachedBy cachId $ do
+        tutList <- E.select . E.from $ \(course `E.InnerJoin` tut) -> do
+            E.on     $ course E.^. CourseId E.==. tut E.^. TutorialCourse
+            E.where_ $ course E.^. CourseTerm      E.==. E.val tid
+                E.&&.  course E.^. CourseSchool    E.==. E.val ssh
+                E.&&.  course E.^. CourseShorthand E.==. E.val csh
+                E.&&.  tut    E.^. TutorialName    E.==. E.val tutn
+            return $ prj tut course
+        case tutList of
+          [tut] -> return tut
+          _other  -> notFound
+
+fetchTutorial :: TermId -> SchoolId -> CourseShorthand -> TutorialName -> DB (Entity Tutorial)
+fetchTutorial = fetchTutorialAux const
+
+fetchTutorialId :: TermId -> SchoolId -> CourseShorthand -> TutorialName -> YesodDB UniWorX (Key Tutorial)
+fetchTutorialId tid ssh cid tutn = E.unValue <$> fetchTutorialAux (\tutorial _ -> tutorial E.^. TutorialId) tid ssh cid tutn
+
+fetchCourseIdTutorialId  :: TermId -> SchoolId -> CourseShorthand -> TutorialName -> YesodDB UniWorX (Key Course, Key Tutorial)
+fetchCourseIdTutorialId tid ssh cid tutn = $(unValueN 2) <$> fetchTutorialAux (\tutorial course -> (course E.^. CourseId, tutorial E.^. TutorialId)) tid ssh cid tutn
+
+fetchCourseIdTutorial  :: TermId -> SchoolId -> CourseShorthand -> TutorialName -> YesodDB UniWorX (Key Course, Entity Tutorial)
+fetchCourseIdTutorial tid ssh cid tutn = over _1 E.unValue <$> fetchTutorialAux (\tutorial course -> (course E.^. CourseId, tutorial)) tid ssh cid tutn
diff --git a/src/Handler/Utils/Zip.hs b/src/Handler/Utils/Zip.hs
index fd98ab67b..5df1d3ba7 100644
--- a/src/Handler/Utils/Zip.hs
+++ b/src/Handler/Utils/Zip.hs
@@ -23,7 +23,7 @@ import Data.ByteString (ByteString)
 import qualified Data.ByteString as ByteString
 
 import System.FilePath
-import Data.Time
+import Data.Time.LocalTime (localTimeToUTC, utcToLocalTime)
 
 import Data.List (dropWhileEnd)
 
diff --git a/src/Import/NoFoundation.hs b/src/Import/NoFoundation.hs
index 51de48a1e..d0a4e7fa4 100644
--- a/src/Import/NoFoundation.hs
+++ b/src/Import/NoFoundation.hs
@@ -53,7 +53,7 @@ import Data.List.NonEmpty.Instances as Import ()
 import Data.NonNull.Instances as Import ()
 import Data.Text.Encoding.Error as Import(UnicodeException(..))
 import Data.Semigroup         as Import (Semigroup)
-import Data.Monoid            as Import (Last(..), First(..))
+import Data.Monoid            as Import (Last(..), First(..), Any(..), All(..))
 import Data.Monoid.Instances  as Import ()
 import Data.Set.Instances     as Import ()
 import Data.HashMap.Strict.Instances as Import ()
@@ -86,6 +86,15 @@ import Text.Blaze.Instances as Import ()
 import Jose.Jwt.Instances as Import ()
 import Web.PathPieces.Instances as Import ()
 
+import Data.Time.Calendar as Import
+import Data.Time.Clock as Import
+import Data.Time.LocalTime as Import hiding (utcToLocalTime, localTimeToUTC)
+import Time.Types as Import (WeekDay(..))
+
+import Time.Types.Instances as Import ()
+
+import Data.CaseInsensitive as Import (CI, FoldCase(..), foldedCase)
+
 
 import Control.Monad.Trans.RWS (RWST)
 
diff --git a/src/Jobs.hs b/src/Jobs.hs
index c935c79af..8af6f7235 100644
--- a/src/Jobs.hs
+++ b/src/Jobs.hs
@@ -47,7 +47,6 @@ import Control.Monad.Trans.Resource (MonadResourceBase, runResourceT, allocate,
 import Control.Monad.Trans.Maybe (MaybeT(..))
 import Control.Monad.Logger
 
-import Data.Time.Clock
 import Data.Time.Zones
 
 import Control.Concurrent.STM (retry)
diff --git a/src/Jobs/Crontab.hs b/src/Jobs/Crontab.hs
index af83ef1c5..434185d2b 100644
--- a/src/Jobs/Crontab.hs
+++ b/src/Jobs/Crontab.hs
@@ -11,7 +11,6 @@ import Data.Maybe (fromJust)
 import qualified Data.Map as Map
 import Data.Semigroup (Max(..))
 
-import Data.Time
 import Data.Time.Zones
 
 import Control.Monad.Trans.Writer (execWriterT)
diff --git a/src/Jobs/Queue.hs b/src/Jobs/Queue.hs
index b91a51d1d..8152ffbfb 100644
--- a/src/Jobs/Queue.hs
+++ b/src/Jobs/Queue.hs
@@ -6,7 +6,7 @@ module Jobs.Queue
   , module Jobs.Types
   ) where
 
-import Import
+import Import hiding ((<>))
 
 import Utils.Sql
 import Jobs.Types
@@ -23,6 +23,8 @@ import Control.Monad.Random (evalRand, mkStdGen, uniform)
 
 import qualified Data.Conduit.List as C
 
+import Data.Semigroup ((<>))
+
 
 data JobQueueException = JobQueuePoolEmpty
   deriving (Eq, Ord, Enum, Bounded, Show, Read, Generic)
diff --git a/src/Model.hs b/src/Model.hs
index 7de0d7c1e..6ae0a2f0c 100644
--- a/src/Model.hs
+++ b/src/Model.hs
@@ -35,6 +35,7 @@ share [mkPersist sqlSettings, mkDeleteCascade sqlSettings, mkMigrate "migrateAll
 -- (Eq Course) is impossible so we derive it for the Uniqueness Constraint only
 deriving instance Eq (Unique Course)
 deriving instance Eq (Unique Sheet)
+deriving instance Eq (Unique Tutorial)
 
 -- Primary keys mentioned in dbtable row-keys must be Binary
 -- Automatically generated (i.e. numeric) ids are already taken care of
diff --git a/src/Model/Migration.hs b/src/Model/Migration.hs
index c111e2412..6f6970ac3 100644
--- a/src/Model/Migration.hs
+++ b/src/Model/Migration.hs
@@ -247,6 +247,11 @@ customMigrations = Map.fromListWith (>>)
                 ( Legacy.UserSubmissions     , Legacy.Upload False ) -> SubmissionMode False (Just $ Upload False)
           [executeQQ| UPDATE "sheet" SET "submission_mode" = #{submissionMode'} WHERE "id" = #{shid}; |]
     )
+  , ( AppliedMigrationKey [migrationVersion|11.0.0|] [version|12.0.0|]
+    , whenM ((&&) <$> tableExists "tutorial" <*> tableExists "tutorial_user") $ do -- Tutorials were an unused stub before
+        tableDropEmpty "tutorial"
+        tableDropEmpty "tutorial_user"
+    )
   ]
 
 
@@ -258,6 +263,18 @@ tableExists table = do
     [Just _] -> return True
     _other   -> return False
 
+tableIsEmpty :: MonadIO m => Text -> ReaderT SqlBackend m Bool
+tableIsEmpty table = do
+  [rows] <- rawSql [st|SELECT COUNT(*) FROM "#{table}"|] []
+  return $ unSingle rows == (0 :: Int64)
+
+tableDropEmpty :: MonadIO m => Text -> ReaderT SqlBackend m ()
+tableDropEmpty table = do
+  isEmpty <- tableIsEmpty table
+  if
+    | isEmpty   -> rawExecute [st|DROP TABLE "#{table}" CASCADE|] []
+    | otherwise -> fail $ "Table " <> unpack table <> " is not empty"
+
 columnExists :: MonadIO m
              => Text -- ^ Table
              -> Text -- ^ Column
diff --git a/src/Model/Types.hs b/src/Model/Types.hs
index ab73b6ba7..28ecff845 100644
--- a/src/Model/Types.hs
+++ b/src/Model/Types.hs
@@ -83,6 +83,9 @@ import Data.Text.Metrics (damerauLevenshtein)
 
 import Data.Binary (Binary)
 import qualified Data.Binary as Binary
+
+import Time.Types (WeekDay(..))
+import Data.Time.LocalTime (LocalTime, TimeOfDay)
   
 
 instance PathPiece UUID where
@@ -752,10 +755,11 @@ pseudonymFragments = folding
 
 data AuthTag -- sortiert nach gewünschter Reihenfolge auf /authpreds, d.h. Prädikate sind sortier nach Relevanz für Benutzer
   = AuthAdmin
-  | AuthToken
   | AuthLecturer
   | AuthCorrector
-  | AuthRegistered
+  | AuthTutor
+  | AuthCourseRegistered
+  | AuthTutorialRegistered
   | AuthParticipant
   | AuthTime
   | AuthMaterials
@@ -764,12 +768,14 @@ data AuthTag -- sortiert nach gewünschter Reihenfolge auf /authpreds, d.h. Prä
   | AuthUserSubmissions
   | AuthCorrectorSubmissions
   | AuthCapacity
+  | AuthRegisterGroup
   | AuthEmpty
   | AuthSelf
   | AuthAuthentication
   | AuthNoEscalation
   | AuthRead
   | AuthWrite
+  | AuthToken
   | AuthDeprecated
   | AuthDevelopment
   | AuthFree
@@ -870,6 +876,51 @@ derivePersistFieldJSON ''LecturerType
 
 instance Hashable LecturerType
 
+  
+deriveJSON defaultOptions
+  { constructorTagModifier = camelToPathPiece
+  } ''WeekDay
+  
+data OccurenceSchedule = ScheduleWeekly
+                         { scheduleDayOfWeek :: WeekDay
+                         , scheduleStart     :: TimeOfDay
+                         , scheduleEnd       :: TimeOfDay
+                         }
+  deriving (Eq, Ord, Read, Show, Generic, Typeable)
+
+deriveJSON defaultOptions
+  { fieldLabelModifier = camelToPathPiece' 1
+  , constructorTagModifier = camelToPathPiece' 1
+  , tagSingleConstructors = True
+  , sumEncoding = TaggedObject "repeat" "schedule"
+  } ''OccurenceSchedule
+
+data OccurenceException = ExceptOccur
+                          { exceptDay   :: Day
+                          , exceptStart :: TimeOfDay
+                          , exceptEnd   :: TimeOfDay
+                          }
+                        | ExceptNoOccur
+                          { exceptTime  :: LocalTime
+                          }
+  deriving (Eq, Ord, Read, Show, Generic, Typeable)
+
+deriveJSON defaultOptions
+  { fieldLabelModifier = camelToPathPiece' 1
+  , constructorTagModifier = camelToPathPiece' 1
+  , sumEncoding = TaggedObject "exception" "for"
+  } ''OccurenceException
+
+data Occurences = Occurences
+  { occurencesScheduled  :: Set OccurenceSchedule
+  , occurencesExceptions :: Set OccurenceException
+  } deriving (Eq, Ord, Read, Show, Generic, Typeable)
+
+deriveJSON defaultOptions
+  { fieldLabelModifier = camelToPathPiece' 1
+  } ''Occurences
+derivePersistFieldJSON ''Occurences
+
 
 -- Type synonyms
 
@@ -881,6 +932,7 @@ type CourseName      = CI Text
 type CourseShorthand = CI Text
 type SheetName       = CI Text
 type UserEmail       = CI Email
+type TutorialName    = CI Text
 
 type PWHashAlgorithm = ByteString -> PWStore.Salt -> Int -> ByteString
 type InstanceId      = UUID
diff --git a/src/Time/Types/Instances.hs b/src/Time/Types/Instances.hs
new file mode 100644
index 000000000..af91312e3
--- /dev/null
+++ b/src/Time/Types/Instances.hs
@@ -0,0 +1,19 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Time.Types.Instances
+  (
+  ) where
+
+-- import ClassyPrelude
+
+import Time.Types
+
+import Data.Universe
+
+import Utils.PathPiece
+
+
+instance Universe WeekDay
+instance Finite WeekDay
+
+nullaryPathPiece ''WeekDay camelToPathPiece
diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index 25180df04..1fa6de74f 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -23,6 +23,7 @@ import qualified Data.Set as Set
 import Control.Monad.Trans.Maybe (MaybeT(..))
 import Control.Monad.Reader.Class (MonadReader(..))
 import Control.Monad.Writer.Class (MonadWriter(..))
+import Control.Monad.Trans.RWS (mapRWST)
 
 import Data.List ((!!))
 
@@ -357,8 +358,11 @@ submitButtonView = do
 
 
 buttonForm :: (Button site a, Finite a) => Html -> MForm (HandlerT site IO) (FormResult a, WidgetT site IO ())
-buttonForm csrf = do
-  (res, ($ []) -> fViews) <- aFormToForm . disambiguateButtons $ combinedButtonFieldF ""
+buttonForm = buttonForm' universeF
+
+buttonForm' :: Button site a => [a] -> Html -> MForm (HandlerT site IO) (FormResult a, WidgetT site IO ())
+buttonForm' btns csrf = do
+  (res, ($ []) -> fViews) <- aFormToForm . disambiguateButtons $ combinedButtonField btns ""
   return (res, [whamlet|
       $newline never
       #{csrf}
@@ -366,7 +370,6 @@ buttonForm csrf = do
         ^{fvInput bView}
     |])
 
-
 -------------------
 -- Custom Fields --
 -------------------
@@ -614,6 +617,18 @@ prismAForm p outer form = review p <$> form inner
   where
     inner = outer >>= preview p
 
+-----------------------
+-- Form Manipulation --
+-----------------------
+
+aFormToWForm :: MonadHandler m => AForm m a -> WForm m (FormResult a)
+aFormToWForm = mapRWST mFormToWForm' . over (mapped . _2) ($ []) . aFormToForm
+  where
+    mFormToWForm' f = do
+      ((a, vs), ints, enctype) <- lift f
+      writer ((a, ints, enctype), vs)
+
+
 ---------------------------------------------
 -- Special variants of @mopt@, @mreq@, ... --
 ---------------------------------------------
diff --git a/src/Utils/Lens.hs b/src/Utils/Lens.hs
index 46087e831..52780e335 100644
--- a/src/Utils/Lens.hs
+++ b/src/Utils/Lens.hs
@@ -5,6 +5,7 @@ import Model
 import Control.Lens as Utils.Lens hiding ((<.>), universe, snoc)
 import Control.Lens.Extras as Utils.Lens (is)
 import Utils.Lens.TH as Utils.Lens (makeLenses_, makeClassyFor_)
+import Data.Set.Lens as Utils.Lens
 
 import Yesod.Core.Types (HandlerContents(..), ErrorResponse(..))
 
@@ -103,6 +104,16 @@ makeLenses_ ''SubmissionMode
 
 makePrisms ''E.Value
 
+makeLenses_ ''OccurenceSchedule
+
+makePrisms ''OccurenceSchedule
+
+makeLenses_ ''OccurenceException
+
+makePrisms ''OccurenceException
+
+makeLenses_ ''Occurences
+
 
 -- makeClassy_ ''Load
 
diff --git a/src/Utils/Occurences.hs b/src/Utils/Occurences.hs
new file mode 100644
index 000000000..077d79250
--- /dev/null
+++ b/src/Utils/Occurences.hs
@@ -0,0 +1,84 @@
+{-# OPTIONS_GHC -fno-warn-overlapping-patterns #-}
+
+module Utils.Occurences
+  ( normalizeOccurences
+  ) where
+
+import ClassyPrelude
+
+import Model.Types
+import Utils
+import Utils.Lens
+
+import Control.Monad.Trans.Reader (runReader, Reader)
+
+import Control.Monad.Trans.Except (ExceptT, throwE, runExceptT)
+
+import qualified Data.Set as Set
+
+import Data.Time
+import Data.Time.Calendar.WeekDate
+
+
+normalizeOccurences :: Occurences -> Occurences
+-- ^ 
+--
+--   - Removes unnecessary exceptions
+--   - Merges overlapping schedules
+normalizeOccurences initial
+  | Left new <- runReader (runExceptT go) initial
+  = normalizeOccurences new
+  | otherwise
+  = initial
+  where
+    go :: ExceptT Occurences (Reader Occurences) ()
+    -- Find some inconsistency and `throwE` a version without it
+    go = do
+      scheduled <- view _occurencesScheduled
+      forM_ scheduled $ \case
+        a@ScheduleWeekly{} -> do
+          let
+            merge b@ScheduleWeekly{}
+              | scheduleDayOfWeek a == scheduleDayOfWeek b -- b starts during a
+              , scheduleStart a <= scheduleStart b
+              , scheduleEnd a >= scheduleStart b
+              = Just $ ScheduleWeekly (scheduleDayOfWeek a) (scheduleStart a) ((max `on` scheduleEnd) a b)
+              | scheduleDayOfWeek a == scheduleDayOfWeek b -- b ends during a
+              , scheduleStart a <= scheduleEnd b
+              , scheduleEnd a >= scheduleEnd b
+              = Just $ ScheduleWeekly (scheduleDayOfWeek a) ((min `on` scheduleStart) a b) (scheduleEnd a)
+              | otherwise
+              = Nothing
+            merge _ = Nothing
+          merges <- views _occurencesScheduled $ mapMaybe (\b -> (,) <$> pure b <*> merge b) . Set.toList . Set.delete a
+          case merges of
+            [] -> return ()
+            ((b, merged) : _) -> throwE =<< asks (over _occurencesScheduled $ Set.insert merged . Set.delete b . Set.delete a)
+
+      exceptions <- view _occurencesExceptions
+      forM_ exceptions $ \case
+        needle@ExceptNoOccur{..} -> do
+          let LocalTime{..} = exceptTime
+              (_, _, toEnum . (`mod` 7) -> localWeekDay) = toWeekDate localDay
+          needed <- views _occurencesScheduled . any $ \case
+            ScheduleWeekly{..} -> and
+              [ scheduleDayOfWeek == localWeekDay
+              , scheduleStart <= localTimeOfDay
+              , localTimeOfDay <= scheduleEnd
+              ]
+          unless needed $
+            throwE =<< asks (over _occurencesExceptions $ Set.delete needle)
+        needle@ExceptOccur{..} -> do
+          let (_, _, toEnum . (`mod` 7) -> localWeekDay) = toWeekDate exceptDay
+              -- | Does this ExceptNoOccur target within needle?
+              withinNeedle ExceptNoOccur{..} = LocalTime exceptDay exceptStart <= exceptTime
+                                            && exceptTime <= LocalTime exceptDay exceptEnd
+              withinNeedle _ = False
+          needed <- views _occurencesScheduled . none $ \case
+            ScheduleWeekly{..} -> and
+              [ scheduleDayOfWeek == localWeekDay
+              , scheduleStart == exceptStart
+              , scheduleEnd == exceptEnd
+              ]
+          unless needed $
+            throwE =<< asks (over _occurencesExceptions $ Set.filter (not . withinNeedle) . Set.delete needle)
diff --git a/static/css/utils/tooltip.scss b/static/css/utils/tooltip.scss
index 7e538e46a..ed6b5fd5d 100644
--- a/static/css/utils/tooltip.scss
+++ b/static/css/utils/tooltip.scss
@@ -35,6 +35,14 @@
     font-size: 15px;
   }
 
+  &.tooltip__handle--danger::before {
+    content: '\f12a';
+  }
+
+  &.tooltip__handle--danger {
+      background-color: var(--color-warning);
+  }
+
   &:hover {
     background-color: var(--color-light);
   }
diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index a68f56b9f..54c3a430f 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -216,6 +216,10 @@
 
       childInputs.forEach(function(el) {
         el.disabled = !active;
+        if (el._flatpickr) {
+          console.log("Flatpickr in childInputs", el, el._flatpickr.altInput);
+          el._flatpickr.altInput.disabled = !active;
+        }
       });
     }
 
diff --git a/templates/course.hamlet b/templates/course.hamlet
index 917a8271d..2d4f134be 100644
--- a/templates/course.hamlet
+++ b/templates/course.hamlet
@@ -12,25 +12,43 @@
           #{descr}
 
     $with numlecs <- length lecturers
-      $if numlecs > 1
-        <dt .deflist__dt>_{MsgLecturersFor}
-      $else
-        <dt .deflist__dt>_{MsgLecturerFor}
-      <dd .deflist__dd>
-        <div>
-          <ul .list--inline .list--comma-separated>
-            $forall lect <- lecturers
-              <li>^{nameEmailWidget' lect}
+      $if numlecs /= 0
+        $if numlecs > 1
+          <dt .deflist__dt>_{MsgLecturersFor}
+        $else
+          <dt .deflist__dt>_{MsgLecturerFor}
+        <dd .deflist__dd>
+          <div>
+            <ul .list--inline .list--comma-separated>
+              $forall lect <- lecturers
+                <li>^{nameEmailWidget' lect}
     $with numassi <- length assistants
-      $if numassi > 1
-        <dt .deflist__dt>_{MsgAssistantsFor}
-      $else
-        <dt .deflist__dt>_{MsgAssistantFor}
-      <dd .deflist__dd>
-        <div>
-          <ul .list--inline .list--comma-separated>
-            $forall assi <- assistants
-              <li>^{nameEmailWidget' assi}
+      $if numassi /= 0
+        $if numassi > 1
+          <dt .deflist__dt>_{MsgAssistantsFor}
+        $else
+          <dt .deflist__dt>_{MsgAssistantFor}
+        <dd .deflist__dd>
+          <div>
+            <ul .list--inline .list--comma-separated>
+              $forall assi <- assistants
+                <li>^{nameEmailWidget' assi}
+    $with numtutor <- length tutors
+      $if numtutor /= 0
+        <dt .deflist__dt>_{MsgTutorsFor numtutor}
+        <dd .deflist__dd>
+          <div>
+            <ul .list--inline .list--comma-separated>
+              $forall tutor <- tutors
+                <li>^{nameEmailWidget' tutor}
+    $with numcorrector <- length correctors
+      $if numcorrector /= 0
+        <dt .deflist__dt>_{MsgCorrectorsFor numcorrector}
+        <dd .deflist__dd>
+          <div>
+            <ul .list--inline .list--comma-separated>
+              $forall corrector <- correctors
+                <li>^{nameEmailWidget' corrector}
 
     $maybe link <- courseLinkExternal course
       <dt .deflist__dt>Website
@@ -73,6 +91,11 @@ $#    $if NTop (Just 0) < NTop (courseCapacity course)
         $else
           Eine Anmeldung zum Kurs ist Voraussetzung zum Zugang zu Kursmaterial
           (z.B. Übungsblätter).
+    $if hasTutorials
+      <dt .deflist__dt>_{MsgCourseTutorials}
+      <dd .deflist__dd>
+        ^{tutorialTable}
+      
 
 $# <div .container>
 $#   <div .tab-group>
diff --git a/templates/tutorial-edit.hamlet b/templates/tutorial-edit.hamlet
new file mode 100644
index 000000000..f5598089e
--- /dev/null
+++ b/templates/tutorial-edit.hamlet
@@ -0,0 +1,2 @@
+$newline never
+^{newTutForm}
diff --git a/templates/tutorial-list.hamlet b/templates/tutorial-list.hamlet
new file mode 100644
index 000000000..cffdc59dd
--- /dev/null
+++ b/templates/tutorial-list.hamlet
@@ -0,0 +1,2 @@
+$newline never
+^{tutorialTable}
diff --git a/templates/tutorial-new.hamlet b/templates/tutorial-new.hamlet
new file mode 100644
index 000000000..f5598089e
--- /dev/null
+++ b/templates/tutorial-new.hamlet
@@ -0,0 +1,2 @@
+$newline never
+^{newTutForm}
diff --git a/templates/tutorial-participants.hamlet b/templates/tutorial-participants.hamlet
new file mode 100644
index 000000000..1c6999f09
--- /dev/null
+++ b/templates/tutorial-participants.hamlet
@@ -0,0 +1,2 @@
+$newline never
+^{participantTable}
diff --git a/templates/tutorial/tutorMassInput/add.hamlet b/templates/tutorial/tutorMassInput/add.hamlet
new file mode 100644
index 000000000..cf4cc6e72
--- /dev/null
+++ b/templates/tutorial/tutorMassInput/add.hamlet
@@ -0,0 +1,6 @@
+$newline never
+<td>
+  #{csrf}
+  ^{fvInput addView}
+<td>
+  ^{fvInput submitView}
diff --git a/templates/tutorial/tutorMassInput/cellKnown.hamlet b/templates/tutorial/tutorMassInput/cellKnown.hamlet
new file mode 100644
index 000000000..c6c6cc2ad
--- /dev/null
+++ b/templates/tutorial/tutorMassInput/cellKnown.hamlet
@@ -0,0 +1,3 @@
+$newline never
+<td>
+  ^{nameEmailWidget userEmail userDisplayName userSurname}
diff --git a/templates/tutorial/tutorMassInput/layout.hamlet b/templates/tutorial/tutorMassInput/layout.hamlet
new file mode 100644
index 000000000..8dc00bc90
--- /dev/null
+++ b/templates/tutorial/tutorMassInput/layout.hamlet
@@ -0,0 +1,11 @@
+$newline never
+<table>
+  <tbody>
+    $forall coord <- review liveCoords lLength
+      <tr .massinput--cell>
+        ^{cellWdgts ! coord}
+        <td>
+          ^{fvInput (delButtons ! coord)}
+  <tfoot>
+    <tr .massinput--add>
+      ^{addWdgts ! (0, 0)}
diff --git a/templates/widgets/occurence/cell.hamlet b/templates/widgets/occurence/cell.hamlet
new file mode 100644
index 000000000..bb1f1f3d7
--- /dev/null
+++ b/templates/widgets/occurence/cell.hamlet
@@ -0,0 +1,12 @@
+$newline never
+<ul .list--inline .list--iconless .list--comma-separated>
+  $forall sched <- occurencesScheduled'
+    <li>^{sched}
+
+$if not (null occurencesExceptions)
+  $# <div .tooltip>
+  $#   <div .tooltip__handle .tooltip__handle--danger>
+  $#   <div .tooltip__content>
+      <ul>
+        $forall exc <- occurencesExceptions'
+          <li>^{exc}
diff --git a/templates/widgets/occurence/cell/except-no-occur.hamlet b/templates/widgets/occurence/cell/except-no-occur.hamlet
new file mode 100644
index 000000000..0019439a5
--- /dev/null
+++ b/templates/widgets/occurence/cell/except-no-occur.hamlet
@@ -0,0 +1,2 @@
+$newline never
+_{MsgExceptionKindNoOccur}: #{exceptTime'}
diff --git a/templates/widgets/occurence/cell/except-occur.hamlet b/templates/widgets/occurence/cell/except-occur.hamlet
new file mode 100644
index 000000000..2d8147d8b
--- /dev/null
+++ b/templates/widgets/occurence/cell/except-occur.hamlet
@@ -0,0 +1,2 @@
+$newline never
+_{MsgExceptionKindOccur}: #{exceptStart'}–#{exceptEnd'}
diff --git a/templates/widgets/occurence/cell/weekly.hamlet b/templates/widgets/occurence/cell/weekly.hamlet
new file mode 100644
index 000000000..0e3a39c2c
--- /dev/null
+++ b/templates/widgets/occurence/cell/weekly.hamlet
@@ -0,0 +1,2 @@
+$newline never
+_{ShortWeekDay scheduleDayOfWeek} #{scheduleStart'}–#{scheduleEnd'}
diff --git a/templates/widgets/occurence/form/except-add.hamlet b/templates/widgets/occurence/form/except-add.hamlet
new file mode 100644
index 000000000..bcb16ecfa
--- /dev/null
+++ b/templates/widgets/occurence/form/except-add.hamlet
@@ -0,0 +1,5 @@
+$newline never
+<td colspan=2>
+  ^{addWidget}
+<td>
+  ^{fvInput submitView}
diff --git a/templates/widgets/occurence/form/except-layout.hamlet b/templates/widgets/occurence/form/except-layout.hamlet
new file mode 100644
index 000000000..8dc00bc90
--- /dev/null
+++ b/templates/widgets/occurence/form/except-layout.hamlet
@@ -0,0 +1,11 @@
+$newline never
+<table>
+  <tbody>
+    $forall coord <- review liveCoords lLength
+      <tr .massinput--cell>
+        ^{cellWdgts ! coord}
+        <td>
+          ^{fvInput (delButtons ! coord)}
+  <tfoot>
+    <tr .massinput--add>
+      ^{addWdgts ! (0, 0)}
diff --git a/templates/widgets/occurence/form/except-no-occur.hamlet b/templates/widgets/occurence/form/except-no-occur.hamlet
new file mode 100644
index 000000000..17f441f9d
--- /dev/null
+++ b/templates/widgets/occurence/form/except-no-occur.hamlet
@@ -0,0 +1,5 @@
+$newline never
+<td>
+  _{ExceptionKindNoOccur}
+<td>
+  #{exceptTime'}
diff --git a/templates/widgets/occurence/form/except-occur.hamlet b/templates/widgets/occurence/form/except-occur.hamlet
new file mode 100644
index 000000000..60d567e32
--- /dev/null
+++ b/templates/widgets/occurence/form/except-occur.hamlet
@@ -0,0 +1,5 @@
+$newline never
+<td>
+  _{ExceptionKindOccur}
+<td>
+  #{exceptStart'}–#{exceptEnd'}
diff --git a/templates/widgets/occurence/form/scheduled-add.hamlet b/templates/widgets/occurence/form/scheduled-add.hamlet
new file mode 100644
index 000000000..bcb16ecfa
--- /dev/null
+++ b/templates/widgets/occurence/form/scheduled-add.hamlet
@@ -0,0 +1,5 @@
+$newline never
+<td colspan=2>
+  ^{addWidget}
+<td>
+  ^{fvInput submitView}
diff --git a/templates/widgets/occurence/form/scheduled-layout.hamlet b/templates/widgets/occurence/form/scheduled-layout.hamlet
new file mode 100644
index 000000000..8dc00bc90
--- /dev/null
+++ b/templates/widgets/occurence/form/scheduled-layout.hamlet
@@ -0,0 +1,11 @@
+$newline never
+<table>
+  <tbody>
+    $forall coord <- review liveCoords lLength
+      <tr .massinput--cell>
+        ^{cellWdgts ! coord}
+        <td>
+          ^{fvInput (delButtons ! coord)}
+  <tfoot>
+    <tr .massinput--add>
+      ^{addWdgts ! (0, 0)}
diff --git a/templates/widgets/occurence/form/weekly.hamlet b/templates/widgets/occurence/form/weekly.hamlet
new file mode 100644
index 000000000..accd1f4ef
--- /dev/null
+++ b/templates/widgets/occurence/form/weekly.hamlet
@@ -0,0 +1,5 @@
+$newline never
+<td>
+  _{ScheduleKindWeekly}
+<td>
+  _{scheduleDayOfWeek}, #{scheduleStart'}–#{scheduleEnd'}
diff --git a/test/Database.hs b/test/Database.hs
index 646539247..e20a3f73f 100755
--- a/test/Database.hs
+++ b/test/Database.hs
@@ -22,11 +22,11 @@ import System.FilePath ((</>))
 
 import qualified Data.ByteString as BS
 
-import Data.Time
-
 import Utils.Lens (review, view)
 import Control.Monad.Random.Class (MonadRandom(..))
 
+import qualified Data.Set as Set
+
 
 data DBAction = DBClear
               | DBTruncate
@@ -520,6 +520,39 @@ fillDb = do
   void . insert $ SubmissionUser maxMuster sub1
   sub1fid1 <- insertFile "AbgabeH10-1.hs"
   void . insert $ SubmissionFile sub1 sub1fid1 False False
+  tut1 <- insert Tutorial
+    { tutorialName = "Di08"
+    , tutorialCourse = pmo
+    , tutorialType = "Tutorium"
+    , tutorialCapacity = Just 30
+    , tutorialRoom = "Hilbert-Raum"
+    , tutorialTime = Occurences
+      { occurencesScheduled = Set.singleton $ ScheduleWeekly Tuesday (TimeOfDay 08 15 00) (TimeOfDay 10 00 00)
+      , occurencesExceptions = Set.empty
+      }
+    , tutorialRegGroup = Just "tutorium"
+    , tutorialRegisterFrom = Just now
+    , tutorialRegisterTo = Nothing
+    , tutorialDeregisterUntil = Nothing
+    }
+  void . insert $ Tutor tut1 gkleen
+  void . insert $ TutorialParticipant tut1 fhamann
+  tut2 <- insert Tutorial
+    { tutorialName = "Di10"
+    , tutorialCourse = pmo
+    , tutorialType = "Tutorium"
+    , tutorialCapacity = Just 30
+    , tutorialRoom = "Hilbert-Raum"
+    , tutorialTime = Occurences
+      { occurencesScheduled = Set.singleton $ ScheduleWeekly Tuesday (TimeOfDay 10 15 00) (TimeOfDay 12 00 00)
+      , occurencesExceptions = Set.empty
+      }
+    , tutorialRegGroup = Just "tutorium"
+    , tutorialRegisterFrom = Just now
+    , tutorialRegisterTo = Nothing
+    , tutorialDeregisterUntil = Nothing
+    }
+  void . insert $ Tutor tut2 gkleen
   -- datenbanksysteme
   dbs <- insert' Course
     { courseName = "Datenbanksysteme"

From b40096db8a825d0025b6881a0c671e804229e6a0 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 29 Apr 2019 00:45:08 +0200
Subject: [PATCH 167/238] Cleanup

---
 ChangeLog.md                      |  6 ++++
 src/Handler/Course.hs             |  8 +++---
 src/Handler/Tutorial.hs           |  6 +++-
 templates/info-lecturer/de.hamlet | 48 +++++++++++++++++++++++++++++++
 4 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 1e78cad00..8fe2401e2 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,9 @@
+  * Version 29.04.2019
+  
+    Tutorien
+    
+    Anzeige von Korrektoren auf den Kursseiten
+
   * Version 20.04.2019
   
     Versand von Benachrichtigungen an Kursteilnehmer
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 1163a9e8f..5d52bf869 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -999,7 +999,7 @@ makeCourseUserTable cid restrict colChoices psValidator = do
                   E.on $ tutorial E.^. TutorialId E.==. tutorialParticipant E.^. TutorialParticipantTutorial
                   E.where_ $ tutorial E.^. TutorialCourse E.==. E.val cid
                        E.&&. E.hasInfix (tutorial E.^. TutorialName) criterion
-                       E.&&. tutorialParticipant E.^. TutorialParticipantUser E.==. (queryUser row) E.^. UserId
+                       E.&&. tutorialParticipant E.^. TutorialParticipantUser E.==. queryUser row E.^. UserId
             )
           -- , ("course-registration", error "TODO") -- TODO
           -- , ("course-user-note", error "TODO") -- TODO
@@ -1051,7 +1051,7 @@ postCUsersR tid ssh csh = do
         psValidator = def & defaultSortingByName
     ent@(Entity cid _) <- getBy404 $ TermSchoolCourseShort tid ssh csh
     numParticipants <- count [CourseParticipantCourse ==. cid]
-    table <- makeCourseUserTable cid (const $ E.true) colChoices psValidator
+    table <- makeCourseUserTable cid (const E.true) colChoices psValidator
     return (ent, numParticipants, table)
   formResult participantRes $ \case
     (CourseUserSendMail, selectedUsers) -> do
@@ -1089,8 +1089,8 @@ postTUsersR tid ssh csh tutn = do
         psValidator = def
           & defaultSortingByName
           & restrictSorting (\name _ -> none (== name) ["note"]) -- We need to be careful to restrict allowed sorting/filter to not expose sensitive information
-        isInTut q = E.exists . E.from $ \tutorialParticipant -> do
-          E.where_ $ tutorialParticipant E.^. TutorialParticipantUser E.==. (queryUser q) E.^. UserId
+        isInTut q = E.exists . E.from $ \tutorialParticipant ->
+          E.where_ $ tutorialParticipant E.^. TutorialParticipantUser E.==. queryUser q E.^. UserId
                E.&&. tutorialParticipant E.^. TutorialParticipantTutorial E.==. E.val tutid
     cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
     table <- makeCourseUserTable cid isInTut colChoices psValidator
diff --git a/src/Handler/Tutorial.hs b/src/Handler/Tutorial.hs
index 55f2d0811..1919e6a38 100644
--- a/src/Handler/Tutorial.hs
+++ b/src/Handler/Tutorial.hs
@@ -18,8 +18,12 @@ import qualified Data.Set as Set
 
 import qualified Data.CaseInsensitive as CI
 
+import qualified Data.Text as Text
+
 import Utils.Lens
 
+{-# ANN module ("Hlint: ignore Redundant void" :: String) #-}
+
 
 getCTutorialListR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getCTutorialListR tid ssh csh = do
@@ -241,7 +245,7 @@ tutorialForm cid template html = do
     <*> aopt (natFieldI MsgTutorialCapacityNonPositive) (fslpI MsgTutorialCapacity (mr MsgTutorialCapacity) & setTooltip MsgTutorialCapacityTip) (tfCapacity <$> template)
     <*> areq textField (fslpI MsgTutorialRoom $ mr MsgTutorialRoomPlaceholder) (tfRoom <$> template)
     <*> occurencesAForm (tfTime <$> template)
-    <*> aopt ciField (fslI MsgTutorialRegGroup & setTooltip MsgTutorialRegGroupTip) ((tfRegGroup <$> template) <|> Just (Just "tutorial"))
+    <*> fmap (assertM (not . Text.null . CI.original) . fmap (CI.map Text.strip)) (aopt ciField (fslI MsgTutorialRegGroup & setTooltip MsgTutorialRegGroupTip) ((tfRegGroup <$> template) <|> Just (Just "tutorial")))
     <*> aopt utcTimeField   (fslpI MsgRegisterFrom (mr MsgDate)
                                & setTooltip MsgCourseRegisterFromTip
                             ) (tfRegisterFrom <$> template)
diff --git a/templates/info-lecturer/de.hamlet b/templates/info-lecturer/de.hamlet
index a7bcf0057..74bf737ca 100644
--- a/templates/info-lecturer/de.hamlet
+++ b/templates/info-lecturer/de.hamlet
@@ -182,6 +182,54 @@ $newline text
           in Uni2work Abgaben angelegt,
           welche wie üblich korrigiert werden können.
 
+<section>
+  <h2>Tutorien
+  
+  <dl .deflist>
+    <dt .deflist__dt> Termine
+    <dd .deflist__dd>
+      Tutorien können beliebig viele reguläre Termine haben, die sich wöchentlich wiederholen.
+      <br />
+      Zusätzlich können beliebig viele <i>Ausnahmen</i> angelegt werden.
+      <br />
+      Hierbei überschreibt eine Ausnahme, dass ein Termin nicht stattfindet, die reguläre Terminplanung (man gibt hierbei einen beliebigen Zeitpunkt innerhalb des regulären Termins an).
+      <br />
+      Eine Ausnahme, dass ein Termin außerplanmäßig stattfindet, überschreibt wiederrum Ausnahmen, die Termine ausfallen lassen.
+      <br />
+      Dieses Verhalten kann genutzt werden um einzelne Termine zeitlich zu verschieben, indem der reguläre Termin ausfällt und stattdessen ein außerplanmäßiger mit versetzter Zeit stattfindet.
+  
+    <dt .deflist__dt> Tutoren
+    <dd .deflist__dd>
+      <p>
+        Tutoren werden ad hoc pro Tutoriumsgruppe festgelegt.
+        <br />
+        Eine Tutoriumsgruppe kann beliebig viele Tutoren haben und ein Tutor kann beliebig viele Tutoriengruppen betreuen.
+
+      <p>
+        Tutoren haben Zugriff auf die Namen und Studiendaten ihrer Tutoriums-Teilnehmer und können auch Mitteilungen an sie verschicken (analog zu Kursmitteilungen).
+
+    <dt .deflist__dt> Anmeldung
+    <dd .deflist__dd>
+      <p>
+        Studenten können sich auf der Kursseite selbst zu Tutorien anmelden.
+        <br />
+        Die Anmeldung erfolgt momentan noch auf <i>first come, first served</i>-Basis
+        <br />
+        Eine vorherige Anmeldung zum Kurs ist Voraussetzung
+      <p>
+        Die Anmeldung kann pro Tutoriumsgruppe zeitlich beschränkt werden.
+      <p>
+        Tutoriumsgruppen können mit einer <i>Registrierungs-Gruppe</i> versehen werden.
+        <br />
+        Es handelt sich hierbei um einen beliebig wählbaren Text der ansonsten keine Bedeutung hat.
+        <br />
+        Studenten wird die Anmeldung nur in einem Tutorium pro Registrierungs-Gruppe erlaubt.
+
+        Leere Registrierungs-Gruppen zählen hierbei als <i>verschieden</i>.
+      <p>
+        Um die Anmeldung in beliebig viele Tutoriumsgruppen zuzulassen können alle Registrierungs-Gruppen leer gelassen werden.
+
+
 <section>
   <h2>Klausuren
   Das Verwalten von Klausuren und Notenmeldungen

From eb0e1382d0122f557e57aa4cebbc9f7385dd7b11 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 29 Apr 2019 09:44:39 +0200
Subject: [PATCH 168/238] MsgMassInputTip

---
 messages/uniworx/de.msg              | 8 +++++---
 models/tutorials                     | 1 +
 src/Handler/Course.hs                | 2 +-
 src/Handler/Sheet.hs                 | 2 +-
 src/Handler/Term.hs                  | 2 +-
 src/Handler/Tutorial.hs              | 6 +++++-
 src/Handler/Utils/Form/Occurences.hs | 4 ++--
 7 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 801076f6a..7f51fb19d 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -133,7 +133,7 @@ CourseLecturerAlreadyAdded email@UserEmail: Es gibt bereits einen Kursverwalter
 CourseRegistrationEndMustBeAfterStart: Ende des Anmeldezeitraums muss nach dem Anfang liegen
 CourseDeregistrationEndMustBeAfterStart: Ende des Abmeldezeitraums muss nach dem Anfang des Anmeldezeitraums liegen
 CourseUserMustBeLecturer: Aktueller Benutzer muss als Kursverwalter eingetragen sein
-CourseLecturerRightsIdentical: Alle Sorten von Kursverwalter haben identische Rechte
+CourseLecturerRightsIdentical: Alle Sorten von Kursverwalter haben identische Rechte.
 
 NoSuchTerm tid@TermId: Semester #{display tid} gibt es nicht.
 NoSuchSchool ssh@SchoolId: Institut #{display ssh} gibt es nicht.
@@ -828,7 +828,7 @@ OccurenceEnd: Ende
 ScheduleExists: Dieser Plan existiert bereits
 
 ScheduleExceptions: Termin-Ausnahmen
-ScheduleExceptionsTip: Ausfälle überschreiben planmäßiges Stattfinden. Außerplanmäßiges Stattfinden überschreibt Ausfall
+ScheduleExceptionsTip: Ausfälle überschreiben planmäßiges Stattfinden. Außerplanmäßiges Stattfinden überschreibt Ausfall.
 ExceptionKind: Termin ...
 ExceptionKindOccur: Findet statt
 ExceptionKindNoOccur: Findet nicht statt
@@ -872,4 +872,6 @@ TutorialNew: Neues Tutorium
 TutorialNameTaken tutn@TutorialName: Es existiert bereits anderes Tutorium mit Namen #{tutn}
 TutorialCreated tutn@TutorialName: Tutorium #{tutn} erfolgreich angelegt
 
-TutorialEditHeading tutn@TutorialName: #{tutn} bearbeiten
\ No newline at end of file
+TutorialEditHeading tutn@TutorialName: #{tutn} bearbeiten
+
+MassInputTip: Es können mehrere Werte angegeben werden. Werte müssen mit + zur Liste hinzugefügt werden und können mit - wieder entfernt werden. Die Liste wird zunächst nur lokal in Ihrem Browser gespeichert und muss noch zusammen mit dem Rest des Formulars Gesendet werden.
\ No newline at end of file
diff --git a/models/tutorials b/models/tutorials
index 1f47400bf..78571389c 100644
--- a/models/tutorials
+++ b/models/tutorials
@@ -9,6 +9,7 @@ Tutorial json
     registerFrom    UTCTime Maybe
     registerTo      UTCTime Maybe
     deregisterUntil UTCTime Maybe
+    lastChanged     UTCTime default='NOW()'
     UniqueTutorial course name
 Tutor
     tutorial    TutorialId
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 5d52bf869..eb29d534a 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -739,7 +739,7 @@ makeCourseForm miButtonAction template = identifyForm FIDcourse $ \html -> do
         lecturerForm :: AForm Handler [Either (UserEmail, Maybe LecturerType) (UserId, LecturerType)]
         lecturerForm = formToAForm . over (mapped._2) pure . over (mapped._1.mapped) (map liftEither . Map.elems) $ massInput
                 MassInput{..}
-                (fslI MsgCourseLecturers & setTooltip MsgCourseLecturerRightsIdentical)
+                (fslI MsgCourseLecturers & setTooltip (UniWorXMessages [SomeMessage MsgCourseLecturerRightsIdentical, SomeMessage MsgMassInputTip]))
                 True
                 (Just . Map.fromList . zip [0..] $ maybe [(Right uid, Just CourseLecturer)] (map unliftEither . cfLecturers) template)
                 mempty
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 5016f8662..8448a5203 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -753,7 +753,7 @@ correctorForm shid = wFormToAForm $ do
         postProcess' (Right sheetCorrectorUser, (sheetCorrectorState, sheetCorrectorLoad)) = Right SheetCorrector{..}
         postProcess' (Left sheetCorrectorInvitationEmail, (sheetCorrectorInvitationState, sheetCorrectorInvitationLoad)) = Left SheetCorrectorInvitation{..}
 
-  fmap postProcess <$> massInputW MassInput{..} (fslI MsgCorrectors) True (Just . Map.fromList . zip [0..] $ Map.toList loads)
+  fmap postProcess <$> massInputW MassInput{..} (fslI MsgCorrectors & setTooltip MsgMassInputTip) True (Just . Map.fromList . zip [0..] $ Map.toList loads)
 
 getSCorrR, postSCorrR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html
 postSCorrR = getSCorrR
diff --git a/src/Handler/Term.hs b/src/Handler/Term.hs
index 98085d947..ddb8abc51 100644
--- a/src/Handler/Term.hs
+++ b/src/Handler/Term.hs
@@ -255,7 +255,7 @@ newTermForm template html = do
         = aforced termNewField (fslpI MsgTerm (mr MsgTermPlaceholder)) tid
         | otherwise
         = areq termNewField (fslpI MsgTerm (mr MsgTermPlaceholder)) Nothing
-      holidayForm = formToAForm . over (mapped._2) pure $ massInputList dayField (const $ "" & addPlaceholder (mr MsgTermHolidayPlaceholder)) (const Nothing) (fslI MsgTermHolidays) True (tftHolidays template) mempty
+      holidayForm = formToAForm . over (mapped._2) pure $ massInputList dayField (const $ "" & addPlaceholder (mr MsgTermHolidayPlaceholder)) (const Nothing) (fslI MsgTermHolidays & setTooltip MsgMassInputTip) True (tftHolidays template) mempty
     (result, widget) <- flip (renderAForm FormStandard) html $ Term
       <$> tidForm
       <*> areq dayField  (fslI MsgTermStartDay & setTooltip MsgTermStartDayTooltip) (tftStart template)
diff --git a/src/Handler/Tutorial.hs b/src/Handler/Tutorial.hs
index 1919e6a38..c8c5bd108 100644
--- a/src/Handler/Tutorial.hs
+++ b/src/Handler/Tutorial.hs
@@ -212,7 +212,7 @@ tutorialForm cid template html = do
   uid <- liftHandlerT requireAuthId
 
   let 
-    tutorForm = Set.fromList <$> massInputAccumA miAdd' miCell' (\p -> Just . SomeRoute $ cRoute :#: p) miLayout' (fslI MsgTutorialTutors) True (Set.toList . tfTutors <$> template)
+    tutorForm = Set.fromList <$> massInputAccumA miAdd' miCell' (\p -> Just . SomeRoute $ cRoute :#: p) miLayout' (fslI MsgTutorialTutors & setTooltip MsgMassInputTip) True (Set.toList . tfTutors <$> template)
       where
         miAdd' :: (Text -> Text) -> FieldView UniWorX -> Form ([UserId] -> FormResult [UserId])
         miAdd' nudge submitView csrf = do
@@ -282,6 +282,7 @@ postCTutorialNewR tid ssh csh = do
 
   formResult newTutResult $ \TutorialForm{..} -> do
     insertRes <- runDB $ do
+      now <- liftIO getCurrentTime
       insertRes <- insertUnique Tutorial
         { tutorialName            = tfName
         , tutorialCourse          = cid
@@ -293,6 +294,7 @@ postCTutorialNewR tid ssh csh = do
         , tutorialRegisterFrom    = tfRegisterFrom
         , tutorialRegisterTo      = tfRegisterTo
         , tutorialDeregisterUntil = tfDeregisterUntil
+        , tutorialLastChanged     = now
         }
       forM_ tfTutors $ \tutor -> case insertRes of
         Just tutid -> void . insert $ Tutor tutid tutor
@@ -346,6 +348,7 @@ postTEditR tid ssh csh tutn = do
 
   formResult newTutResult $ \TutorialForm{..} -> do
     insertRes <- runDB $ do
+      now <- liftIO getCurrentTime
       insertRes <- myReplaceUnique tutid Tutorial
         { tutorialName            = tfName
         , tutorialCourse          = cid
@@ -357,6 +360,7 @@ postTEditR tid ssh csh tutn = do
         , tutorialRegisterFrom    = tfRegisterFrom
         , tutorialRegisterTo      = tfRegisterTo
         , tutorialDeregisterUntil = tfDeregisterUntil
+        , tutorialLastChanged     = now
         }
       deleteWhere [ TutorTutorial ==. tutid ]
       forM_ tfTutors $ void . insert . Tutor tutid
diff --git a/src/Handler/Utils/Form/Occurences.hs b/src/Handler/Utils/Form/Occurences.hs
index 4445413c9..4c5905b6b 100644
--- a/src/Handler/Utils/Form/Occurences.hs
+++ b/src/Handler/Utils/Form/Occurences.hs
@@ -45,7 +45,7 @@ occurencesAForm mPrev = wFormToAForm $ do
       miCell'
       (\p -> Just . SomeRoute $ cRoute :#: p)
       miLayout'
-      (fslI MsgScheduleRegular)
+      (fslI MsgScheduleRegular & setTooltip MsgMassInputTip)
       False
       (Set.toList . occurencesScheduled <$> mPrev)
       where
@@ -80,7 +80,7 @@ occurencesAForm mPrev = wFormToAForm $ do
       miCell'
       (\p -> Just . SomeRoute $ cRoute :#: p)
       miLayout'
-      (fslI MsgScheduleExceptions & setTooltip MsgScheduleExceptionsTip)
+      (fslI MsgScheduleExceptions & setTooltip (UniWorXMessages [SomeMessage MsgScheduleExceptionsTip, SomeMessage MsgMassInputTip]))
       False
       (Set.toList . occurencesExceptions <$> mPrev)
       where

From 6b86addb3edbba7bf3ebdb73133790e745956f9f Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 29 Apr 2019 09:50:22 +0200
Subject: [PATCH 169/238] Fix test

---
 test/Database.hs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/Database.hs b/test/Database.hs
index e20a3f73f..3774e09ea 100755
--- a/test/Database.hs
+++ b/test/Database.hs
@@ -534,6 +534,7 @@ fillDb = do
     , tutorialRegisterFrom = Just now
     , tutorialRegisterTo = Nothing
     , tutorialDeregisterUntil = Nothing
+    , tutorialLastChanged = now
     }
   void . insert $ Tutor tut1 gkleen
   void . insert $ TutorialParticipant tut1 fhamann
@@ -551,6 +552,7 @@ fillDb = do
     , tutorialRegisterFrom = Just now
     , tutorialRegisterTo = Nothing
     , tutorialDeregisterUntil = Nothing
+    , tutorialLastChanged = now
     }
   void . insert $ Tutor tut2 gkleen
   -- datenbanksysteme

From aefe4c571f0490040a717ae895007a4b266325f9 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 29 Apr 2019 11:39:09 +0200
Subject: [PATCH 170/238] Additional Tutorial information for students

---
 messages/uniworx/de.msg   |  1 +
 src/Handler/Course.hs     | 28 +++++++++++++++++++++-------
 src/Handler/Tutorial.hs   |  4 ++--
 src/Handler/Utils/Form.hs | 20 ++++++++++++--------
 templates/course.hamlet   |  8 --------
 5 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 7f51fb19d..4b8c7f201 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -839,6 +839,7 @@ TutorialType: Typ
 TutorialName: Bezeichnung
 TutorialParticipants: Teilnehmer
 TutorialCapacity: Kapazität
+TutorialFreeCapacity: Freie Plätze
 TutorialRoom: Regulärer Raum
 TutorialTime: Zeit
 TutorialRegistered: Angemeldet
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index eb29d534a..baceefdd1 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -274,7 +274,7 @@ getTermCourseListR tid = do
 getCShowR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getCShowR tid ssh csh = do
   mbAid <- maybeAuthId
-  (cid,course,schoolName,participants,registration,defSFid,lecturers,assistants,tutors,correctors) <- runDB . maybeT notFound $ do
+  (cid,course,schoolName,participants,registration,defSFid,lecturers,assistants,correctors) <- runDB . maybeT notFound $ do
     [(E.Entity cid course, E.Value schoolName, E.Value participants, fmap entityVal -> registration)]
        <- lift . E.select . E.from $
          \((school `E.InnerJoin` course) `E.LeftOuterJoin` participant) -> do
@@ -300,18 +300,13 @@ getCShowR tid ssh csh = do
         partStaff (CourseLecturer  ,name,surn,mail) = Right (name,surn,mail)
         partStaff (_courseAssistant,name,surn,mail) = Left (name,surn,mail)
         (assistants,lecturers) = partitionWith  partStaff $ map $(unValueN 4) staff
-    tutors <- fmap (map $(unValueN 3)) . lift . E.select $ E.from $ \(tutorial `E.InnerJoin` tutor `E.InnerJoin` user) -> E.distinctOnOrderBy [E.asc $ user E.^. UserSurname, E.asc $ user E.^. UserDisplayName, E.asc $ user E.^. UserEmail ] $ do
-      E.on $ tutor E.^. TutorUser E.==. user E.^. UserId
-      E.on $ tutor E.^. TutorTutorial E.==. tutorial E.^. TutorialId
-      E.where_ $ tutorial E.^. TutorialCourse E.==. E.val cid
-      return ( user E.^. UserEmail, user E.^. UserDisplayName, user E.^. UserSurname )
     correctors <- fmap (map $(unValueN 3)) . lift . E.select $ E.from $ \(sheet `E.InnerJoin` sheetCorrector `E.InnerJoin` user) -> E.distinctOnOrderBy [E.asc $ user E.^. UserSurname, E.asc $ user E.^. UserDisplayName, E.asc $ user E.^. UserEmail ] $ do
       E.on $ sheetCorrector E.^. SheetCorrectorUser E.==. user E.^. UserId
       E.on $ sheetCorrector E.^. SheetCorrectorSheet E.==. sheet E.^. SheetId
       E.where_ $ sheet E.^. SheetCourse E.==. E.val cid
       E.orderBy [ E.asc $ user E.^. UserSurname, E.asc $ user E.^. UserDisplayName ]
       return ( user E.^. UserEmail, user E.^. UserDisplayName, user E.^. UserSurname )
-    return (cid,course,schoolName,participants,registration,entityKey <$> defSFid,lecturers,assistants,tutors,correctors)
+    return (cid,course,schoolName,participants,registration,entityKey <$> defSFid,lecturers,assistants,correctors)
 
   mRegFrom <- traverse (formatTime SelFormatDateTime) $ courseRegisterFrom    course
   mRegTo   <- traverse (formatTime SelFormatDateTime) $ courseRegisterTo      course
@@ -336,11 +331,30 @@ getCShowR tid ssh csh = do
         dbtColonnade = dbColonnade $ mconcat
           [ sortable (Just "type") (i18nCell MsgTutorialType) $ \DBRow{ dbrOutput = Entity _ Tutorial{..} } -> textCell $ CI.original tutorialType
           , sortable (Just "name") (i18nCell MsgTutorialName) $ \DBRow{ dbrOutput = Entity _ Tutorial{..} } -> indicatorCell <> textCell (CI.original tutorialName)
+          , sortable Nothing (i18nCell MsgTutorialTutors) $ \DBRow{ dbrOutput = Entity tutid _ } -> sqlCell $ do
+              tutors <- fmap (map $(unValueN 3)) . E.select . E.from $ \(tutor `E.InnerJoin` user) -> do
+                E.on $ tutor E.^. TutorUser E.==. user E.^. UserId
+                E.where_ $ tutor E.^. TutorTutorial E.==. E.val tutid
+                return (user E.^. UserEmail, user E.^. UserDisplayName, user E.^. UserSurname)
+              return [whamlet|
+                       <ul .list--iconless .list--inline .list--comma-separated>
+                         $forall tutor <- tutors
+                           <li>
+                             ^{nameEmailWidget' tutor}
+                     |]
           , sortable (Just "room") (i18nCell MsgTutorialRoom) $ \DBRow{ dbrOutput = Entity _ Tutorial{..} } -> textCell tutorialRoom
           , sortable Nothing (i18nCell MsgTutorialTime) $ \DBRow{ dbrOutput = Entity _ Tutorial{..} } -> occurencesCell tutorialTime
           , sortable (Just "register-from") (i18nCell MsgTutorialRegisterFrom) $ \DBRow{ dbrOutput = Entity _ Tutorial{..} } -> maybeDateTimeCell tutorialRegisterFrom
           , sortable (Just "register-to") (i18nCell MsgTutorialRegisterTo) $ \DBRow{ dbrOutput = Entity _ Tutorial{..} } -> maybeDateTimeCell tutorialRegisterTo
           , sortable (Just "deregister-until") (i18nCell MsgTutorialDeregisterUntil) $ \DBRow{ dbrOutput = Entity _ Tutorial{..} } -> maybeDateTimeCell tutorialDeregisterUntil
+          , sortable Nothing (i18nCell MsgTutorialFreeCapacity) $ \DBRow{ dbrOutput = Entity tutid Tutorial{..} } -> case tutorialCapacity of
+              Nothing -> mempty
+              Just tutorialCapacity' -> sqlCell $ do
+                [E.Value freeCapacity] <- E.select $ let numParticipants = E.sub_select . E.from $ \participant -> do
+                                                           E.where_ $ participant E.^. TutorialParticipantTutorial E.==. E.val tutid
+                                                           return E.countRows :: E.SqlQuery (E.SqlExpr (E.Value Int))
+                                                      in return $ E.val tutorialCapacity' E.-. numParticipants
+                return . toWidget . tshow $ max 0 freeCapacity
           , sortable Nothing mempty $ \DBRow{ dbrOutput = Entity tutId Tutorial{..} } -> sqlCell $ do
               mayRegister <- (== Authorized) <$> evalAccessDB (CTutorialR tid ssh csh tutorialName TRegisterR) True
               isRegistered <- case mbAid of
diff --git a/src/Handler/Tutorial.hs b/src/Handler/Tutorial.hs
index c8c5bd108..3e8264169 100644
--- a/src/Handler/Tutorial.hs
+++ b/src/Handler/Tutorial.hs
@@ -63,8 +63,8 @@ getCTutorialListR tid ssh csh = do
           , sortable (Just "register-to") (i18nCell MsgTutorialRegisterTo) $ \DBRow{ dbrOutput = (Entity _ Tutorial{..}, _) } -> maybeDateTimeCell tutorialRegisterTo
           , sortable (Just "deregister-until") (i18nCell MsgTutorialDeregisterUntil) $ \DBRow{ dbrOutput = (Entity _ Tutorial{..}, _) } -> maybeDateTimeCell tutorialDeregisterUntil
           , sortable Nothing mempty $ \DBRow{ dbrOutput = (Entity _ Tutorial{..}, _) } -> cell $ do
-              linkButton [whamlet|_{MsgTutorialEdit}|] [BCIsButton] . SomeRoute $ CTutorialR tid ssh csh tutorialName TEditR
-              linkButton [whamlet|_{MsgTutorialDelete}|] [BCIsButton, BCDanger] . SomeRoute $ CTutorialR tid ssh csh tutorialName TDeleteR
+              linkButton mempty [whamlet|_{MsgTutorialEdit}|] [BCIsButton] . SomeRoute $ CTutorialR tid ssh csh tutorialName TEditR
+              linkButton mempty [whamlet|_{MsgTutorialDelete}|] [BCIsButton, BCDanger] . SomeRoute $ CTutorialR tid ssh csh tutorialName TDeleteR
           ]
         dbtSorting = Map.fromList
           [ ("type", SortColumn $ \tutorial -> tutorial E.^. TutorialType )
diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index 5f334f22f..bc0817d50 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -131,14 +131,18 @@ nullaryPathPiece ''ButtonSubmitDelete $ camelToPathPiece' 1 . dropSuffix "'"
 -- instance PathPiece LinkButton where
 --     LinkButton route = ???
 
-linkButton :: Widget -> [ButtonClass UniWorX] -> SomeRoute UniWorX -> Widget -- Alternative: Handler.Utils.simpleLink
-linkButton lbl cls url = do
-  url' <- toTextUrl url
-  [whamlet|
-    $newline never
-    <a href=#{url'} class=#{unwords $ map toPathPiece cls} role=button>
-      ^{lbl}
-  |]
+linkButton :: Widget -> Widget -> [ButtonClass UniWorX] -> SomeRoute UniWorX -> Widget -- Alternative: Handler.Utils.simpleLink
+linkButton defWdgt lbl cls url = do
+  access <- evalAccess (urlRoute url) False
+  case access of
+    Unauthorized _ -> defWdgt
+    _other -> do
+      url' <- toTextUrl url
+      [whamlet|
+        $newline never
+        <a href=#{url'} class=#{unwords $ map toPathPiece cls} role=button>
+          ^{lbl}
+      |]
 
 --------------------------
 -- Interactive fieldset --
diff --git a/templates/course.hamlet b/templates/course.hamlet
index 2d4f134be..dfe9c0235 100644
--- a/templates/course.hamlet
+++ b/templates/course.hamlet
@@ -33,14 +33,6 @@
             <ul .list--inline .list--comma-separated>
               $forall assi <- assistants
                 <li>^{nameEmailWidget' assi}
-    $with numtutor <- length tutors
-      $if numtutor /= 0
-        <dt .deflist__dt>_{MsgTutorsFor numtutor}
-        <dd .deflist__dd>
-          <div>
-            <ul .list--inline .list--comma-separated>
-              $forall tutor <- tutors
-                <li>^{nameEmailWidget' tutor}
     $with numcorrector <- length correctors
       $if numcorrector /= 0
         <dt .deflist__dt>_{MsgCorrectorsFor numcorrector}

From c7a7d5512adc0c2239d7e31b706b23cc29bc106f Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 29 Apr 2019 12:51:49 +0200
Subject: [PATCH 171/238] Cleanup course html

---
 templates/course.hamlet                              | 1 +
 templates/table/cell/header.hamlet                   | 1 +
 templates/widgets/link-email.hamlet                  | 3 ++-
 templates/widgets/register-form/register-form.hamlet | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/templates/course.hamlet b/templates/course.hamlet
index dfe9c0235..4fc2f9366 100644
--- a/templates/course.hamlet
+++ b/templates/course.hamlet
@@ -1,3 +1,4 @@
+$newline never
 <div .container>
   <dl .deflist>
     <dt .deflist__dt>Fakultät/Institut
diff --git a/templates/table/cell/header.hamlet b/templates/table/cell/header.hamlet
index 408dc4561..d5d86cf90 100644
--- a/templates/table/cell/header.hamlet
+++ b/templates/table/cell/header.hamlet
@@ -1,3 +1,4 @@
+$newline never
 <th .table__th *{attrs} :isSortable:.sortable :isSorted SortAsc:.sorted-asc :isSorted SortDesc:.sorted-desc>
   $maybe flag <- sortableKey
     $case directions
diff --git a/templates/widgets/link-email.hamlet b/templates/widgets/link-email.hamlet
index 80b6b03c9..ad08eeba5 100644
--- a/templates/widgets/link-email.hamlet
+++ b/templates/widgets/link-email.hamlet
@@ -1,3 +1,4 @@
+$newline never
 $# Used for all mailto-link, and used as both as shamlet and whamlet at once.
 <a href="mailto:#{email}">
-  ^{linkText}
\ No newline at end of file
+  ^{linkText}
diff --git a/templates/widgets/register-form/register-form.hamlet b/templates/widgets/register-form/register-form.hamlet
index c9a9fa1a3..347b94186 100644
--- a/templates/widgets/register-form/register-form.hamlet
+++ b/templates/widgets/register-form/register-form.hamlet
@@ -1,3 +1,4 @@
+$newline never
 $# extra protects us against CSRF
 #{extra}
 $# Maybe display textField for passcode

From 4eda7d20a23b50afbe24d28909506ad6e9cf90e0 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 29 Apr 2019 13:44:08 +0200
Subject: [PATCH 172/238] Further HTML cleanup

---
 src/Handler/Course.hs   | 1 +
 src/Handler/Term.hs     | 1 +
 src/Handler/Tutorial.hs | 1 +
 src/Handler/Users.hs    | 2 ++
 4 files changed, 5 insertions(+)

diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index baceefdd1..339349e73 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -337,6 +337,7 @@ getCShowR tid ssh csh = do
                 E.where_ $ tutor E.^. TutorTutorial E.==. E.val tutid
                 return (user E.^. UserEmail, user E.^. UserDisplayName, user E.^. UserSurname)
               return [whamlet|
+                       $newline never
                        <ul .list--iconless .list--inline .list--comma-separated>
                          $forall tutor <- tutors
                            <li>
diff --git a/src/Handler/Term.hs b/src/Handler/Term.hs
index ddb8abc51..abf1421bd 100644
--- a/src/Handler/Term.hs
+++ b/src/Handler/Term.hs
@@ -89,6 +89,7 @@ getTermShowR = do
                 cell $ do
                   termHolidays' <- mapM (formatTime SelFormatDate) termHolidays
                   [whamlet|
+                    $newline never
                     <ul .list--inline .list--comma-separated>
                       $forall holiday <- termHolidays'
                         <li>#{holiday}
diff --git a/src/Handler/Tutorial.hs b/src/Handler/Tutorial.hs
index 3e8264169..93b09166c 100644
--- a/src/Handler/Tutorial.hs
+++ b/src/Handler/Tutorial.hs
@@ -49,6 +49,7 @@ getCTutorialListR tid ssh csh = do
                 E.where_ $ tutor E.^. TutorTutorial E.==. E.val tutid
                 return (user E.^. UserEmail, user E.^. UserDisplayName, user E.^. UserSurname)
               return [whamlet|
+                       $newline never
                        <ul .list--iconless .list--inline .list--comma-separated>
                          $forall tutor <- tutors
                            <li>
diff --git a/src/Handler/Users.hs b/src/Handler/Users.hs
index a9ddbcb7f..546e3bf91 100644
--- a/src/Handler/Users.hs
+++ b/src/Handler/Users.hs
@@ -52,6 +52,7 @@ getUsersR = do
             E.orderBy [E.asc $ school E.^. SchoolShorthand]
             return $ school E.^. SchoolShorthand
           return [whamlet|
+            $newline never
             <ul .list--inline .list--comma-separated>
               $forall (E.Value sh) <- schools
                 <li>#{sh}
@@ -63,6 +64,7 @@ getUsersR = do
             E.orderBy [E.asc $ school E.^. SchoolShorthand]
             return $ school E.^. SchoolShorthand
           return [whamlet|
+            $newline never
             <ul .list--inline .list--comma-separated>
               $forall (E.Value sh) <- schools
                 <li>#{sh}

From 48c3e25d3751e3783cb83dea53cd4a1bfe4d42b0 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 29 Apr 2019 14:30:31 +0200
Subject: [PATCH 173/238] Fix #343

---
 src/Foundation.hs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 8b2769cea..88b202949 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -652,6 +652,7 @@ tagAccessPredicate AuthTime = APDB $ \mAuthId route _ -> case route of
       SFileR SheetExercise _ -> guard $ sheetActiveFrom <= cTime
       SFileR SheetHint     _ -> guard $ maybe False (<= cTime) sheetHintFrom
       SFileR SheetSolution _ -> guard $ maybe False (<= cTime) sheetSolutionFrom
+      SFileR _             _ -> mzero
       SubmissionNewR         -> guard   active
       SubmissionR _ SAssignR -> guard   marking -- Correctors can only be assigned when the Sheet is inactive, since submissions are subject to change
       SubmissionR _ _        -> guard   active

From 22ffa3477d342660f82a469c46e33b15004c7c22 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Mon, 29 Apr 2019 18:22:07 +0200
Subject: [PATCH 174/238] Saving material mostly implemented

---
 messages/uniworx/de.msg | 10 +++++---
 models/materials        |  1 +
 src/Handler/Material.hs | 57 ++++++++++++++++++++++++++++++-----------
 src/Handler/Sheet.hs    |  6 +----
 src/Model.hs            |  5 ++--
 src/Utils.hs            |  6 +++++
 src/Utils/DB.hs         | 21 ++++++++++++++-
 src/Utils/Form.hs       |  2 +-
 8 files changed, 80 insertions(+), 28 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index a13812838..1f391452a 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -142,8 +142,8 @@ SheetNewOk         tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetNa
 SheetTitle         tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName: #{display tid}-#{display ssh}-#{csh} #{sheetName}
 SheetTitleNew      tid@TermId ssh@SchoolId csh@CourseShorthand                    : #{display tid}-#{display ssh}-#{csh}: Neues Übungsblatt
 SheetEditHead      tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName: #{display tid}-#{display ssh}-#{csh} #{sheetName} editieren
-SheetEditOk        tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName: Übungsblatt #{sheetName} aus Kurs #{display tid}-#{display ssh}-#{csh} wurde gespeichert.
-SheetNameDup       tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName: Es gibt bereits ein Übungsblatt #{sheetName} in diesem Kurs #{display tid}-#{display ssh}-#{csh}.
+SheetEditOk        tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName: Übungsblatt #{sheetName} wurde gespeichert in Kurs #{display tid}-#{display ssh}-#{csh}
+SheetNameDup       tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName: Es gibt bereits ein Übungsblatt #{sheetName} in diesem Kurs #{display tid}-#{display ssh}-#{csh}
 SheetDelHead       tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName: #{sheetName} wirklich aus Kurs #{display tid}-#{display ssh}-#{csh} herauslöschen? Alle assoziierten Abgaben und Korrekturen gehen ebenfalls verloren!
 SheetDelOk         tid@TermId ssh@SchoolId csh@CourseShorthand sheetName@SheetName: #{display tid}-#{display ssh}-#{csh}: #{sheetName} gelöscht.
 SheetDelHasSubmissions objs@Int: Inkl. #{tshow objs} #{pluralDE objs "Abgabe" "Abgaben"}!
@@ -220,8 +220,10 @@ MaterialVisibleFromTip: Ohne Datum nie sichtbar für Teilnehmer; leer lassen ist
 MaterialFiles: Dateien
 MaterialNewHeading: Neues Material veröffentlichen
 MaterialNewTitle: Neues Material
-MaterialEditHeading name@Text: Material "#{name}" editieren
-MaterialEditTitle name@Text: Material "#{name}" editieren
+MaterialEditHeading materialName@MaterialName: Material "#{materialName}" editieren
+MaterialEditTitle materialName@MaterialName: Material "#{materialName}" editieren
+MaterialSaveOk  tid@TermId ssh@SchoolId csh@CourseShorthand materialName@MaterialName: Material "#{materialName}" erfolgreich gespeichert in Kurs #{display tid}-#{display ssh}-#{csh}
+MaterialNameDup tid@TermId ssh@SchoolId csh@CourseShorthand materialName@MaterialName: Es gibt bereits Material mit Namen "#{materialName}" in diesem Kurs #{display tid}-#{display ssh}-#{csh}
 
 
 Unauthorized: Sie haben hierfür keine explizite Berechtigung.
diff --git a/models/materials b/models/materials
index d715abc63..062ab3232 100644
--- a/models/materials
+++ b/models/materials
@@ -6,6 +6,7 @@ Material -- course material for disemination to course participants
   visibleFrom     UTCTime Maybe    -- Invisible to enrolled participants before
   lastEdit        UTCTime
   UniqueMaterial course name
+  deriving Generic
 MaterialFile -- a file that is part of a material distribution
   material MaterialId
   file     FileId
\ No newline at end of file
diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index 754672053..fd484d8ec 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -5,7 +5,7 @@ import Import
 import Data.Set (Set)
 import qualified Data.Set as Set
 import qualified Data.Conduit.List as C
-import qualified Data.CaseInsensitive as CI
+-- import qualified Data.CaseInsensitive as CI
 
 import qualified Database.Esqueleto as E
 
@@ -86,9 +86,9 @@ postMEditR tid ssh csh mnm = do
         , mfVisibleFrom  = materialVisibleFrom
         , mfFiles        = Just $ yieldMany files
         }
-  editWidget <- handleMaterialEdit tid ssh csh template
-  let headingLong  = prependCourseTitle tid ssh csh $ MsgMaterialEditHeading $ CI.original mnm
-      headingShort = prependCourseTitle tid ssh csh $ MsgMaterialEditTitle   $ CI.original mnm
+  editWidget <- handleMaterialEdit tid ssh csh cid template $ uniqueReplace mid
+  let headingLong  = prependCourseTitle tid ssh csh $ MsgMaterialEditHeading mnm
+      headingShort = prependCourseTitle tid ssh csh $ MsgMaterialEditTitle   mnm
   siteLayoutMsg headingLong $ do
     setTitleI headingShort
     editWidget
@@ -97,23 +97,50 @@ postMEditR tid ssh csh mnm = do
 getMaterialNewR, postMaterialNewR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getMaterialNewR = postMaterialNewR
 postMaterialNewR tid ssh csh = do
-  editWidget <- handleMaterialEdit tid ssh csh Nothing
+  Entity cid _ <- runDB . getBy404 $ TermSchoolCourseShort tid ssh csh
+  editWidget <- handleMaterialEdit tid ssh csh cid Nothing insertUnique
   let headingLong  = prependCourseTitle tid ssh csh MsgMaterialNewHeading
       headingShort = prependCourseTitle tid ssh csh MsgMaterialNewTitle
   siteLayoutMsg headingLong $ do
     setTitleI headingShort
     editWidget
 
-handleMaterialEdit :: TermId -> SchoolId -> CourseShorthand -> Maybe MaterialForm -> Handler Widget
-handleMaterialEdit tid ssh csh template = do
-  aid  <- requireAuthId
-  Entity cid _ <- runDB . getBy404 $ TermSchoolCourseShort tid ssh csh
-  ((res,formWidget), formEnctype) <- runFormPost $ makeMaterialForm cid template
-  actionUrl <- fromMaybe (CourseR tid ssh csh MaterialNewR) <$> getCurrentRoute
-  return $ wrapForm formWidget def
-      { formAction = Just $ SomeRoute actionUrl
-      , formEncoding = formEnctype
-      }
+handleMaterialEdit :: TermId -> SchoolId -> CourseShorthand -> CourseId -> Maybe MaterialForm -> (Material -> DB (Maybe MaterialId)) -> Handler Widget
+handleMaterialEdit tid ssh csh cid template dbMaterial = do
+    ((res,formWidget), formEnctype) <- runFormPost $ makeMaterialForm cid template
+    formResult res saveMaterial
+    -- actionUrl <- fromMaybe (CourseR tid ssh csh MaterialNewR) <$> getCurrentRoute
+    return $ wrapForm formWidget def
+        { formAction   = Nothing -- Just $ SomeRoute actionUrl
+        , formEncoding = formEnctype
+        }
+  where
+    saveMaterial :: MaterialForm -> Handler ()
+    saveMaterial MaterialForm{..} = do
+      _aid <- requireAuthId
+      now <- liftIO getCurrentTime
+      let newMaterial = Material
+            { materialCourse      = cid
+            , materialName        = mfName
+            , materialType        = mfType
+            , materialDescription = mfDescription
+            , materialVisibleFrom = mfVisibleFrom
+            , materialLastEdit    = now
+            }
+      saveOk <- runDB $ do
+        mbmid <- dbMaterial newMaterial
+        case mbmid of
+          Nothing -> False <$ addMessageI Error (MsgMaterialNameDup tid ssh csh mfName)
+          (Just mid) -> do -- save files in DB
+            whenIsJust mfFiles $ insertMaterialFile' mid
+            addMessageI Success $ MsgMaterialSaveOk tid ssh csh mfName
+            -- more info/warnings could go here
+            return True
+      when saveOk $ redirect -- redirect must happen outside of runDB
+        $ CourseR tid ssh csh (MaterialR mfName MShowR)
+
+    insertMaterialFile' :: MaterialId -> Source Handler (Either FileId File) -> DB ()
+    insertMaterialFile' = error "TODO"
 
 
 getMDelR, postMDelR :: TermId -> SchoolId -> CourseShorthand ->  MaterialName -> Handler Html
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index bd65e4d09..5f5dfe896 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -503,11 +503,7 @@ getSEditR tid ssh csh shn = do
         , sfMarkingF     = Just . yieldMany . map Left . Set.elems $ sheetFileIds SheetMarking
         , sfMarkingText  = sheetMarkingText
         }
-  let action newSheet = do
-        replaceRes <- myReplaceUnique sid $ newSheet
-        case replaceRes of
-          Nothing     -> return $ Just sid
-          (Just _err) -> return $ Nothing -- More specific error message for edit old sheet could go here
+  let action = uniqueReplace sid -- More specific error message for edit old sheet could go here by using myReplaceUnique instead
   handleSheetEdit tid ssh csh (Just sid) template action
 
 postSEditR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html
diff --git a/src/Model.hs b/src/Model.hs
index 7de0d7c1e..6198a2724 100644
--- a/src/Model.hs
+++ b/src/Model.hs
@@ -33,8 +33,9 @@ share [mkPersist sqlSettings, mkDeleteCascade sqlSettings, mkMigrate "migrateAll
     $(persistDirectoryWith lowerCaseSettings "models")
 
 -- (Eq Course) is impossible so we derive it for the Uniqueness Constraint only
-deriving instance Eq (Unique Course)
-deriving instance Eq (Unique Sheet)
+deriving instance Eq (Unique Course)    -- instance Eq TermSchoolCourseShort; instance Eq TermSchoolCourseName
+deriving instance Eq (Unique Sheet)     -- instance Eq CourseSheet
+deriving instance Eq (Unique Material)  -- instance Eq UniqueMaterial
 
 -- Primary keys mentioned in dbtable row-keys must be Binary
 -- Automatically generated (i.e. numeric) ids are already taken care of
diff --git a/src/Utils.hs b/src/Utils.hs
index 3ac062bcf..2db129c24 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -405,6 +405,12 @@ toNothing = const Nothing
 toNothingS :: String -> Maybe b
 toNothingS = const Nothing
 
+-- MOVED TO UTILS.DB due to cyclic dependency
+--  Swap 'Nothing' for 'Just' and vice versa
+-- flipMaybe :: b -> Maybe b -> Maybe b
+-- flipMaybe x Nothing  = Just x
+-- flipMaybe _ (Just _) = Nothing
+
 maybeAdd :: Num a => Maybe a -> Maybe a -> Maybe a -- treats Nothing as neutral/zero, unlike fmap/ap
 maybeAdd (Just x) (Just y) = Just (x + y)
 maybeAdd Nothing y  = y
diff --git a/src/Utils/DB.hs b/src/Utils/DB.hs
index 9700dd88f..fbfcd7e8c 100644
--- a/src/Utils/DB.hs
+++ b/src/Utils/DB.hs
@@ -10,6 +10,16 @@ import qualified Data.Set as Set
 import qualified Database.Esqueleto as E
 -- import Database.Persist -- currently not needed here
 
+
+-- | Swap 'Nothing' for 'Just' and vice versa
+-- This belongs into Module 'Utils' but we have a weird cyclic
+-- dependency
+flipMaybe :: b -> Maybe a -> Maybe b
+flipMaybe x Nothing  = Just x
+flipMaybe _ (Just _) = Nothing
+
+
+
 emptyOrIn :: PersistField typ =>
   E.SqlExpr (E.Value typ) -> Set typ -> E.SqlExpr (E.Value Bool)
 emptyOrIn criterion testSet
@@ -41,7 +51,16 @@ updateBy uniq updates = do
   key <- getKeyBy uniq
   for_ key $ flip update updates
 
-myReplaceUnique -- Identical to Database.Persist.Class, except for the better type signature (original requires Eq  record which is not needed anyway)
+-- | Like 'myReplaceUnique' or 'replaceUnique' but with reversed result: returns 'Nothing' if the replacement was not possible,
+--   and 'Just key' for the successfully replaced record
+uniqueReplace :: (MonadIO m
+       ,Eq (Unique record)
+       ,PersistRecordBackend record backend
+       ,PersistUniqueWrite backend)
+    => Key record -> record -> ReaderT backend m (Maybe (Key record))
+uniqueReplace key datumNew = flipMaybe key <$> myReplaceUnique key datumNew
+
+myReplaceUnique -- | Identical to 'Database.Persist.Class', except for the better type signature (original requires Eq  record which is not needed anyway)
     :: (MonadIO m
        ,Eq (Unique record)
        ,PersistRecordBackend record backend
diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index 0cd5d0335..082a90b33 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -572,7 +572,7 @@ formFailure errs' = do
   mr <- getMessageRender
   return . FormFailure $ map mr errs'
 
-
+-- | Turns errors into alerts, ignores missing forms and applies processing function
 formResult :: MonadHandler m => FormResult a -> (a -> m ()) -> m ()
 formResult res f = void . formResultMaybe res $ \x -> Nothing <$ f x
 

From 2f4f88ad76aeea467a659d5cd439b471d9ce1a0e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 29 Apr 2019 18:35:35 +0200
Subject: [PATCH 175/238] Address #344

---
 src/Foundation.hs | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 88b202949..654df9ded 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -699,18 +699,6 @@ tagAccessPredicate AuthCourseRegistered = APDB $ \mAuthId route _ -> case route
     return Authorized
   r -> $unsupportedAuthPredicate AuthCourseRegistered r
 tagAccessPredicate AuthTutorialRegistered = APDB $ \mAuthId route _ -> case route of
-  CourseR tid ssh csh _ -> exceptT return return $ do
-    authId <- maybeExceptT AuthenticationRequired $ return mAuthId
-    [E.Value c] <- lift . E.select . E.from $ \(course `E.InnerJoin` tutorial `E.InnerJoin` tutorialParticipant) -> do
-      E.on $ tutorial E.^. TutorialId E.==. tutorialParticipant E.^. TutorialParticipantTutorial
-      E.on $ course E.^. CourseId E.==. tutorial E.^. TutorialCourse
-      E.where_ $ tutorialParticipant E.^. TutorialParticipantUser E.==. E.val authId
-           E.&&. course E.^. CourseTerm      E.==. E.val tid
-           E.&&. course E.^. CourseSchool    E.==. E.val ssh
-           E.&&. course E.^. CourseShorthand E.==. E.val csh
-      return (E.countRows :: E.SqlExpr (E.Value Int64))
-    guardMExceptT (c > 0) (unauthorizedI MsgUnauthorizedRegistered)
-    return Authorized
   CTutorialR tid ssh csh tutn _ -> exceptT return return $ do
     authId <- maybeExceptT AuthenticationRequired $ return mAuthId
     [E.Value c] <- lift . E.select . E.from $ \(course `E.InnerJoin` tutorial `E.InnerJoin` tutorialParticipant) -> do
@@ -724,6 +712,18 @@ tagAccessPredicate AuthTutorialRegistered = APDB $ \mAuthId route _ -> case rout
       return (E.countRows :: E.SqlExpr (E.Value Int64))
     guardMExceptT (c > 0) (unauthorizedI MsgUnauthorizedRegistered)
     return Authorized
+  CourseR tid ssh csh _ -> exceptT return return $ do
+    authId <- maybeExceptT AuthenticationRequired $ return mAuthId
+    [E.Value c] <- lift . E.select . E.from $ \(course `E.InnerJoin` tutorial `E.InnerJoin` tutorialParticipant) -> do
+      E.on $ tutorial E.^. TutorialId E.==. tutorialParticipant E.^. TutorialParticipantTutorial
+      E.on $ course E.^. CourseId E.==. tutorial E.^. TutorialCourse
+      E.where_ $ tutorialParticipant E.^. TutorialParticipantUser E.==. E.val authId
+           E.&&. course E.^. CourseTerm      E.==. E.val tid
+           E.&&. course E.^. CourseSchool    E.==. E.val ssh
+           E.&&. course E.^. CourseShorthand E.==. E.val csh
+      return (E.countRows :: E.SqlExpr (E.Value Int64))
+    guardMExceptT (c > 0) (unauthorizedI MsgUnauthorizedRegistered)
+    return Authorized
   r -> $unsupportedAuthPredicate AuthTutorialRegistered r
 tagAccessPredicate AuthParticipant = APDB $ \_ route _ -> case route of
   CourseR tid ssh csh (CUserR cID) -> exceptT return return $ do

From c4f47c4856e958dbc9fb94850eb747b2bc21b39e Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Tue, 30 Apr 2019 10:25:50 +0200
Subject: [PATCH 176/238] minor

---
 src/Handler/Material.hs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index fd484d8ec..ca7a05b62 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -140,7 +140,11 @@ handleMaterialEdit tid ssh csh cid template dbMaterial = do
         $ CourseR tid ssh csh (MaterialR mfName MShowR)
 
     insertMaterialFile' :: MaterialId -> Source Handler (Either FileId File) -> DB ()
-    insertMaterialFile' = error "TODO"
+    insertMaterialFile' mid fs = do
+      oldFileIds <- E.select . E.from $ \(file `E.InnerJoin` materialFile) -> do
+        error "TODO"
+
+      error "TODO"
 
 
 getMDelR, postMDelR :: TermId -> SchoolId -> CourseShorthand ->  MaterialName -> Handler Html

From 4bd26a2dae4bf35dc04af03c1217c3e3df68c2cf Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Tue, 30 Apr 2019 10:51:24 +0200
Subject: [PATCH 177/238] =?UTF-8?q?Hinweise=20zur=20Sichtbarkeit=20von=20?=
 =?UTF-8?q?=C3=9Cbungsblatt-Dateien?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Handler/Sheet.hs           |  9 +++++----
 templates/sheet-edit/de.hamlet | 22 ++++++++++++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 templates/sheet-edit/de.hamlet

diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 8448a5203..c454b4e06 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -564,10 +564,11 @@ handleSheetEdit tid ssh csh msId template dbAction = do
   actionUrl <- fromMaybe (CourseR tid ssh csh SheetNewR) <$> getCurrentRoute
   defaultLayout $ do
     setTitleI pageTitle
-    wrapForm formWidget def
-      { formAction = Just $ SomeRoute actionUrl
-      , formEncoding = formEnctype
-      }
+    let sheetEditForm = wrapForm formWidget def
+          { formAction = Just $ SomeRoute actionUrl
+          , formEncoding = formEnctype
+          }
+    $(i18nWidgetFile "sheet-edit")
 
 
 getSDelR, postSDelR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html
diff --git a/templates/sheet-edit/de.hamlet b/templates/sheet-edit/de.hamlet
new file mode 100644
index 000000000..08e231090
--- /dev/null
+++ b/templates/sheet-edit/de.hamlet
@@ -0,0 +1,22 @@
+<section>
+  ^{sheetEditForm}
+
+<section>
+  <h2>Hinweise
+  <ul>
+    <li>
+      <p>
+        Reine Tutoren haben keinen Vorab Zugriff auf Musterlösungen.
+      <p>
+        Wenn reine Tutoren vorab Zugriff auf Musterlösungen erhalten sollen,
+        dann sind diese momentan als Korrektoren mit Anteil 0 einzutragen.
+    <li>
+      <p>
+        Korrektoren haben nur Zugriff auf das jeweilige Übungsblatt.
+      <p>
+        Auf andere Übungsblätter, bei denen jemand nicht als Korrektor
+        eingetragen ist, gibt es keinen Zugriff auf Lösungen.
+    <li>
+      <p>
+        Alle für diesen Kurs eingetragenen Dozenten und Assistenten
+        haben vollen Zugriff auf alle Dateien der Übungsblatter dieses Kurses.
\ No newline at end of file

From 25badbe030884eba1d61e72cf32f83f11f2d763b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 30 Apr 2019 17:19:42 +0200
Subject: [PATCH 178/238] HealthReport

---
 config/settings.yml      |  2 ++
 messages/uniworx/de.msg  |  8 ++++-
 routes                   |  2 ++
 src/Application.hs       |  8 +++--
 src/Foundation.hs        |  6 ++++
 src/Handler/Health.hs    | 55 +++++++++++++++++++++++++++++++
 src/Jobs.hs              | 19 +++++++++++
 src/Jobs/Crontab.hs      |  9 +++++
 src/Jobs/HealthReport.hs | 71 ++++++++++++++++++++++++++++++++++++++++
 src/Jobs/Types.hs        |  1 +
 src/Model/Types.hs       | 36 ++++++++++++++++++++
 src/Settings.hs          |  5 +++
 src/Settings/Cluster.hs  | 10 ++++++
 13 files changed, 229 insertions(+), 3 deletions(-)
 create mode 100644 src/Handler/Health.hs
 create mode 100644 src/Jobs/HealthReport.hs

diff --git a/config/settings.yml b/config/settings.yml
index 287baf0b3..168ba3688 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -30,6 +30,8 @@ session-timeout: 7200
 jwt-expiration: 604800
 jwt-encoding: HS256
 maximum-content-length: 52428800
+health-check-interval: "_env:HEALTHCHECK_INTERVAL:60"
+health-check-http: "_env:HEALTHCHECK_HTTP:true"
 
 log-settings:
   detailed:      "_env:DETAILED_LOGGING:false"
diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 4b8c7f201..259162ce0 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -875,4 +875,10 @@ TutorialCreated tutn@TutorialName: Tutorium #{tutn} erfolgreich angelegt
 
 TutorialEditHeading tutn@TutorialName: #{tutn} bearbeiten
 
-MassInputTip: Es können mehrere Werte angegeben werden. Werte müssen mit + zur Liste hinzugefügt werden und können mit - wieder entfernt werden. Die Liste wird zunächst nur lokal in Ihrem Browser gespeichert und muss noch zusammen mit dem Rest des Formulars Gesendet werden.
\ No newline at end of file
+MassInputTip: Es können mehrere Werte angegeben werden. Werte müssen mit + zur Liste hinzugefügt werden und können mit - wieder entfernt werden. Die Liste wird zunächst nur lokal in Ihrem Browser gespeichert und muss noch zusammen mit dem Rest des Formulars Gesendet werden.
+
+HealthReport: Instanz-Zustand
+InstanceIdentification: Instanz-Identifikation
+
+InstanceId: Instanz-Nummer
+ClusterId: Cluster-Nummer
\ No newline at end of file
diff --git a/routes b/routes
index dd82ed43b..2fd5f7985 100644
--- a/routes
+++ b/routes
@@ -50,6 +50,8 @@
 /admin/test                   AdminTestR        GET POST
 /admin/errMsg                 AdminErrMsgR      GET POST
 
+/health                       HealthR           GET            !free
+/instance                     InstanceR         GET            !free
 /info                         InfoR             GET            !free
 /info/lecturer                InfoLecturerR     GET            !lecturer
 /info/data                    DataProtR         GET            !free
diff --git a/src/Application.hs b/src/Application.hs
index 77a19df68..7d8927e73 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -95,6 +95,7 @@ import Handler.Tutorial
 import Handler.Corrections
 import Handler.CryptoIDDispatch
 import Handler.SystemMessage
+import Handler.Health
 
 
 -- This line actually creates our YesodDispatch instance. It is the second half
@@ -141,13 +142,14 @@ makeFoundation appSettings'@AppSettings{..} = do
 
     appJobCtl <- liftIO $ newTVarIO Map.empty
     appCronThread <- liftIO newEmptyTMVarIO
+    appHealthReport <- liftIO $ newTVarIO Nothing
 
     -- We need a log function to create a connection pool. We need a connection
     -- pool to create our foundation. And we need our foundation to get a
     -- logging function. To get out of this loop, we initially create a
     -- temporary foundation without a real connection pool, get a log function
     -- from there, and then create the real foundation.
-    let mkFoundation appConnPool appSmtpPool appLdapPool appCryptoIDKey appSessionKey appSecretBoxKey appWidgetMemcached appJSONWebKeySet = UniWorX {..}
+    let mkFoundation appConnPool appSmtpPool appLdapPool appCryptoIDKey appSessionKey appSecretBoxKey appWidgetMemcached appJSONWebKeySet appClusterID = UniWorX {..}
         -- The UniWorX {..} syntax is an example of record wild cards. For more
         -- information, see:
         -- https://ocharles.org.uk/blog/posts/2014-12-04-record-wildcards.html
@@ -160,6 +162,7 @@ makeFoundation appSettings'@AppSettings{..} = do
           (error "secretBoxKey forced in tempFoundation")
           (error "widgetMemcached forced in tempFoundation")
           (error "JSONWebKeySet forced in tempFoundation")
+          (error "ClusterID forced in tempFoundation")
 
     runAppLoggingT tempFoundation $ do
       $logInfoS "InstanceID" $ UUID.toText appInstanceID
@@ -191,8 +194,9 @@ makeFoundation appSettings'@AppSettings{..} = do
       appSessionKey <- clusterSetting (Proxy :: Proxy 'ClusterClientSessionKey) `runSqlPool` sqlPool
       appSecretBoxKey <- clusterSetting (Proxy :: Proxy 'ClusterSecretBoxKey) `runSqlPool` sqlPool
       appJSONWebKeySet <- clusterSetting (Proxy :: Proxy 'ClusterJSONWebKeySet) `runSqlPool` sqlPool
+      appClusterID <- clusterSetting (Proxy :: Proxy 'ClusterId) `runSqlPool` sqlPool
 
-      let foundation = mkFoundation sqlPool smtpPool ldapPool appCryptoIDKey appSessionKey appSecretBoxKey appWidgetMemcached appJSONWebKeySet
+      let foundation = mkFoundation sqlPool smtpPool ldapPool appCryptoIDKey appSessionKey appSecretBoxKey appWidgetMemcached appJSONWebKeySet appClusterID
 
       $logDebugS "setup" "Job-Handling"
       handleJobs foundation
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 654df9ded..1560cab35 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -118,12 +118,14 @@ data UniWorX = UniWorX
     , appLogger          :: (ReleaseKey, TVar Logger)
     , appLogSettings     :: TVar LogSettings
     , appCryptoIDKey     :: CryptoIDKey
+    , appClusterID       :: ClusterId
     , appInstanceID      :: InstanceId
     , appJobCtl          :: TVar (Map ThreadId (TMChan JobCtl))
     , appCronThread      :: TMVar (ReleaseKey, ThreadId)
     , appSessionKey      :: ClientSession.Key
     , appSecretBoxKey    :: SecretBox.Key
     , appJSONWebKeySet   :: Jose.JwkSet
+    , appHealthReport    :: TVar (Maybe (UTCTime, HealthReport))
     }
 
 makeLenses_ ''UniWorX
@@ -1346,6 +1348,10 @@ instance YesodBreadcrumbs UniWorX where
   breadcrumb HelpR            = return ("Hilfe"        , Just HomeR)
 
 
+  breadcrumb HealthR          = return ("Status"        , Nothing)
+  breadcrumb InstanceR        = return ("Identifikation", Nothing)
+
+
   breadcrumb ProfileR         = return ("User"             , Just HomeR)
   breadcrumb ProfileDataR     = return ("Profile"          , Just ProfileR)
   breadcrumb AuthPredsR       = return ("Authentifizierung", Just ProfileR)
diff --git a/src/Handler/Health.hs b/src/Handler/Health.hs
new file mode 100644
index 000000000..ecc16589d
--- /dev/null
+++ b/src/Handler/Health.hs
@@ -0,0 +1,55 @@
+module Handler.Health where
+
+import Import
+
+import qualified Data.Aeson.Encode.Pretty as Aeson
+import qualified Data.Text.Lazy.Builder as Builder
+
+import Utils.Lens
+
+
+getHealthR :: Handler TypedContent
+getHealthR = do
+  healthReport' <- liftIO . readTVarIO =<< getsYesod appHealthReport
+  case healthReport' of
+    Nothing -> sendResponseStatus noContent204 ()
+    Just (lastUpdated, healthReport) -> do
+      rContent <- selectRep $ do
+        provideRep $
+          siteLayoutMsg MsgHealthReport $ do
+            setTitleI MsgHealthReport
+            let report' = Aeson.encodePrettyToTextBuilder healthReport
+            [whamlet|
+              <pre style="font-family: monospace; white-space: pre-wrap">
+                #{report'}
+            |]
+        provideJson healthReport
+        provideRep . return . Builder.toLazyText $ Aeson.encodePrettyToTextBuilder healthReport
+
+      interval <- getsYesod $ view _appHealthCheckInterval
+      expiresAt $ interval `addUTCTime` lastUpdated
+      addHeader "Last-Modified" $ formatRFC1123 lastUpdated
+      let
+        status 
+          | HealthSuccess <- classifyHealthReport healthReport
+          = ok200
+          | otherwise
+          = internalServerError500
+      sendResponseStatus status rContent
+
+getInstanceR :: Handler TypedContent
+getInstanceR = do
+  instanceInfo@(clusterId, instanceId) <- getsYesod $ (,) <$> appClusterID <*> appInstanceID
+  selectRep $ do
+    provideRep $
+      siteLayoutMsg MsgInstanceIdentification $ do
+        setTitleI MsgInstanceIdentification
+        [whamlet|
+          <dl .deflist>
+            <dt .deflist__dt>_{MsgClusterId}
+            <dd .deflist__dd style="font-family: monospace">#{tshow clusterId}
+            <dt .deflist__dt>_{MsgInstanceId}
+            <dd .deflist__dd style="font-family: monospace">#{tshow instanceId}
+        |]
+    provideJson instanceInfo
+    provideRep . return $ tshow instanceInfo
diff --git a/src/Jobs.hs b/src/Jobs.hs
index 8af6f7235..9c7fd3674 100644
--- a/src/Jobs.hs
+++ b/src/Jobs.hs
@@ -51,6 +51,8 @@ import Data.Time.Zones
 
 import Control.Concurrent.STM (retry)
 
+import qualified System.Systemd.Daemon as Systemd
+
 
 import Jobs.Handler.SendNotification
 import Jobs.Handler.SendTestEmail
@@ -62,6 +64,8 @@ import Jobs.Handler.SendCourseCommunication
 import Jobs.Handler.LecturerInvitation
 import Jobs.Handler.CorrectorInvitation
 
+import Jobs.HealthReport
+
   
 data JobQueueException = JInvalid QueuedJobId QueuedJob
                        | JLocked QueuedJobId InstanceId UTCTime
@@ -280,6 +284,21 @@ handleJobs' wNum = C.mapM_ $ \jctl -> do
       -- logDebugS logIdent $ tshow newCTab
       mapReaderT (liftIO . atomically) $ 
         lift . void . flip swapTMVar newCTab =<< asks jobCrontab
+    handleCmd JobCtlGenerateHealthReport = do
+      hrStorage <- getsYesod appHealthReport
+      newReport@(classifyHealthReport -> newStatus) <- lift generateHealthReport
+
+      $logInfoS "HealthReport" $ toPathPiece newStatus
+      unless (newStatus == HealthSuccess) $ do
+        $logErrorS "HealthReport" $ tshow newReport
+  
+      liftIO $ do
+        now <- getCurrentTime
+        atomically . writeTVar hrStorage $ Just (now, newReport)
+        
+        void . Systemd.notifyStatus . unpack $ toPathPiece newStatus
+        when (newStatus == HealthSuccess) $
+          void Systemd.notifyWatchdog
 
 jLocked :: QueuedJobId -> (QueuedJob -> Handler a) -> Handler a
 jLocked jId act = do
diff --git a/src/Jobs/Crontab.hs b/src/Jobs/Crontab.hs
index 434185d2b..5dd98d9b8 100644
--- a/src/Jobs/Crontab.hs
+++ b/src/Jobs/Crontab.hs
@@ -44,6 +44,15 @@ determineCrontab = execWriterT $ do
       , cronNotAfter = Right CronNotScheduled
       }
 
+  tell $ HashMap.singleton
+    JobCtlGenerateHealthReport
+    Cron
+      { cronInitial = CronAsap
+      , cronRepeat = CronRepeatScheduled CronAsap
+      , cronRateLimit = appHealthCheckInterval
+      , cronNotAfter = Right CronNotScheduled
+      }
+
   let
     sheetJobs (Entity nSheet Sheet{..}) = do
       tell $ HashMap.singleton
diff --git a/src/Jobs/HealthReport.hs b/src/Jobs/HealthReport.hs
new file mode 100644
index 000000000..2c10b8f82
--- /dev/null
+++ b/src/Jobs/HealthReport.hs
@@ -0,0 +1,71 @@
+{-# LANGUAGE AllowAmbiguousTypes #-}
+
+module Jobs.HealthReport
+  ( generateHealthReport
+  ) where
+
+import Import
+
+import qualified Data.Aeson as Aeson
+import Data.Proxy (Proxy(..))
+
+import qualified Data.ByteArray as ByteArray
+
+import Utils.Lens
+
+import Network.HTTP.Simple (httpJSON)
+import qualified Network.HTTP.Simple as HTTP
+
+
+generateHealthReport :: Handler HealthReport
+generateHealthReport = HealthReport
+  <$> matchingClusterConfig
+  <*> httpReachable
+  
+matchingClusterConfig :: Handler Bool
+-- ^ Can the cluster configuration be read from the database and does it match our configuration?
+matchingClusterConfig = runDB $ and <$> forM universeF clusterSettingMatches
+  where
+    clusterSettingMatches ClusterCryptoIDKey = do
+      ourSetting <- getsYesod appCryptoIDKey
+      dbSetting <- clusterSetting @'ClusterCryptoIDKey
+      return $ ((==) `on` fmap (ByteArray.convert :: CryptoIDKey -> ByteString)) (Just ourSetting) dbSetting
+    clusterSettingMatches ClusterClientSessionKey = do
+      ourSetting <- getsYesod appSessionKey
+      dbSetting <- clusterSetting @'ClusterClientSessionKey
+      return $ Just ourSetting == dbSetting
+    clusterSettingMatches ClusterSecretBoxKey = do
+      ourSetting <- getsYesod appSecretBoxKey
+      dbSetting <- clusterSetting @'ClusterSecretBoxKey
+      return $ Just ourSetting == dbSetting
+    clusterSettingMatches ClusterJSONWebKeySet = do
+      ourSetting <- getsYesod appJSONWebKeySet
+      dbSetting <- clusterSetting @'ClusterJSONWebKeySet
+      return $ Just ourSetting == dbSetting
+    clusterSettingMatches ClusterId = do
+      ourSetting <- getsYesod appClusterID
+      dbSetting <- clusterSetting @'ClusterId
+      return $ Just ourSetting == dbSetting
+    
+
+    clusterSetting :: forall key.
+                      ( ClusterSetting key
+                      )
+                   => DB (Maybe (ClusterSettingValue key))
+    clusterSetting = do
+      current' <- get . ClusterConfigKey $ knownClusterSetting (Proxy @key)
+      case Aeson.fromJSON . clusterConfigValue <$> current' of
+        Just (Aeson.Success c) -> return $ Just c
+        _other                 -> return Nothing
+
+httpReachable :: Handler (Maybe Bool)
+httpReachable = do
+  staticAppRoot <- getsYesod $ view _appRoot
+  for staticAppRoot $ \_textAppRoot -> do
+    url <- getUrlRender <*> pure InstanceR
+    baseRequest <- HTTP.parseRequest $ unpack url
+    httpManager <- getsYesod appHttpManager
+    let httpRequest = baseRequest
+          & HTTP.setRequestManager httpManager
+    (clusterId, _ :: InstanceId) <- responseBody <$> httpJSON httpRequest
+    getsYesod $ (== clusterId) . appClusterID
diff --git a/src/Jobs/Types.hs b/src/Jobs/Types.hs
index fc399d6a5..80d308626 100644
--- a/src/Jobs/Types.hs
+++ b/src/Jobs/Types.hs
@@ -69,6 +69,7 @@ data JobCtl = JobCtlFlush
             | JobCtlPerform QueuedJobId
             | JobCtlDetermineCrontab
             | JobCtlQueue Job
+            | JobCtlGenerateHealthReport
   deriving (Eq, Ord, Read, Show, Generic, Typeable)
 
 instance Hashable JobCtl
diff --git a/src/Model/Types.hs b/src/Model/Types.hs
index 28ecff845..ac780c123 100644
--- a/src/Model/Types.hs
+++ b/src/Model/Types.hs
@@ -86,6 +86,10 @@ import qualified Data.Binary as Binary
 
 import Time.Types (WeekDay(..))
 import Data.Time.LocalTime (LocalTime, TimeOfDay)
+
+import Data.Semigroup (Min(..))
+import Control.Monad.Trans.Writer (execWriter)
+import Control.Monad.Writer.Class (MonadWriter(..))
   
 
 instance PathPiece UUID where
@@ -922,6 +926,37 @@ deriveJSON defaultOptions
 derivePersistFieldJSON ''Occurences
 
 
+data HealthReport = HealthReport
+  { healthMatchingClusterConfig :: Bool
+    -- ^ Is the database-stored configuration we're running under still up to date?
+  , healthHTTPReachable :: Maybe Bool
+    -- ^ Can we reach a uni2work-instance with the same `ClusterId` under our configured `approot` via HTTP?
+    --
+    -- Can be nothing if we don't have a static configuration setting `appRoot` or if check is disabled in settings
+  } deriving (Eq, Ord, Read, Show, Generic, Typeable)
+
+deriveJSON defaultOptions
+  { fieldLabelModifier = camelToPathPiece' 1
+  , omitNothingFields  = True
+  } ''HealthReport
+
+data HealthStatus = HealthFailure | HealthWarning | HealthSuccess
+  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
+
+instance Universe HealthStatus
+instance Finite HealthStatus
+
+deriveJSON defaultOptions
+  { constructorTagModifier = camelToPathPiece' 1
+  } ''HealthStatus
+nullaryPathPiece ''HealthStatus $ camelToPathPiece' 1
+
+classifyHealthReport :: HealthReport -> HealthStatus
+classifyHealthReport HealthReport{..} = getMin . execWriter $ do
+  unless healthMatchingClusterConfig . tell $ Min HealthFailure
+  unless (fromMaybe True healthHTTPReachable) . tell $ Min HealthFailure
+
+
 -- Type synonyms
 
 type Email           = Text
@@ -936,5 +971,6 @@ type TutorialName    = CI Text
 
 type PWHashAlgorithm = ByteString -> PWStore.Salt -> Int -> ByteString
 type InstanceId      = UUID
+type ClusterId       = UUID
 type TokenId         = UUID
 type TermCandidateIncidence = UUID
diff --git a/src/Settings.hs b/src/Settings.hs
index 085ec469a..ac5e832c2 100644
--- a/src/Settings.hs
+++ b/src/Settings.hs
@@ -111,6 +111,8 @@ data AppSettings = AppSettings
     , appMaximumContentLength   :: Maybe Word64
     , appJwtExpiration          :: Maybe NominalDiffTime
     , appJwtEncoding            :: JwtEncoding
+    , appHealthCheckInterval    :: NominalDiffTime
+    , appHealthCheckHTTP        :: Bool
 
     , appInitialLogSettings     :: LogSettings
 
@@ -378,6 +380,9 @@ instance FromJSON AppSettings where
         appJwtExpiration          <- o .:? "jwt-expiration"
         appJwtEncoding            <- o .: "jwt-encoding"
 
+        appHealthCheckInterval    <- o .:  "health-check-interval"
+        appHealthCheckHTTP        <- o .:  "health-check-http"
+
         appSessionTimeout         <- o .: "session-timeout"
 
         appMaximumContentLength   <- o .: "maximum-content-length"
diff --git a/src/Settings/Cluster.hs b/src/Settings/Cluster.hs
index 872d901b7..037c9d967 100644
--- a/src/Settings/Cluster.hs
+++ b/src/Settings/Cluster.hs
@@ -36,12 +36,16 @@ import qualified Jose.Jwa as Jose
 import qualified Jose.Jwk as Jose
 import qualified Jose.Jwt as Jose
 
+import Data.UUID (UUID)
+import Control.Monad.Random.Class (MonadRandom(..))
+
 
 data ClusterSettingsKey
   = ClusterCryptoIDKey
   | ClusterClientSessionKey
   | ClusterSecretBoxKey
   | ClusterJSONWebKeySet
+  | ClusterId
   deriving (Eq, Ord, Enum, Bounded, Show, Read)
 
 instance Universe ClusterSettingsKey
@@ -134,3 +138,9 @@ instance ClusterSetting 'ClusterJSONWebKeySet where
     jwkSig <- Jose.generateSymmetricKey 32 (Jose.UTCKeyId now) Jose.Sig (Just $ Jose.Signed Jose.HS256)
     return $ Jose.JwkSet [jwkSig]
   knownClusterSetting _ = ClusterJSONWebKeySet
+
+
+instance ClusterSetting 'ClusterId where
+  type ClusterSettingValue 'ClusterId = UUID
+  initClusterSetting _ = liftIO getRandom
+  knownClusterSetting _ = ClusterId

From 3e00f4255a04d72a57dd3d3a13091317b0d99bce Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Tue, 30 Apr 2019 19:19:09 +0200
Subject: [PATCH 179/238] saving probably complete

---
 src/Handler/Material.hs | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index ca7a05b62..a0e2097b7 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -13,6 +13,9 @@ import Utils.Lens
 import Utils.Form
 import Handler.Utils
 
+import Control.Monad.Writer (MonadWriter(..), execWriterT)
+
+
 
 data MaterialForm = MaterialForm
       { mfName         :: MaterialName
@@ -141,10 +144,18 @@ handleMaterialEdit tid ssh csh cid template dbMaterial = do
 
     insertMaterialFile' :: MaterialId -> Source Handler (Either FileId File) -> DB ()
     insertMaterialFile' mid fs = do
-      oldFileIds <- E.select . E.from $ \(file `E.InnerJoin` materialFile) -> do
-        error "TODO"
-
-      error "TODO"
+        oldFileIdVals <- E.select . E.from $ \(file `E.InnerJoin` materialFile) -> do
+          E.on     $  materialFile E.^. MaterialFileFile E.==. file E.^. FileId
+          E.where_ $  materialFile E.^. MaterialFileMaterial E.==. E.val mid
+          return $ file E.^. FileId
+        let oldFileIds = setFromList $ map E.unValue oldFileIdVals
+        keep <- execWriterT . runConduit $ transPipe (lift . lift) fs =$= C.mapM_ finsert
+        mapM_ deleteCascade $ (oldFileIds \\ keep :: Set FileId)
+      where
+        finsert (Left fileId) = tell $ singleton fileId
+        finsert (Right file) = lift $ do
+          fid <- insert file
+          void . insert $ MaterialFile mid fid -- cannot fail due to uniqueness, since we generated a fresh FileId in the previous step
 
 
 getMDelR, postMDelR :: TermId -> SchoolId -> CourseShorthand ->  MaterialName -> Handler Html

From 369c2227a036ef3179a651507e720df6350be68c Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 30 Apr 2019 19:36:43 +0200
Subject: [PATCH 180/238] healthLDAPAdmins

---
 src/Handler/Utils/Form.hs  |  1 -
 src/Import/NoFoundation.hs |  4 +++-
 src/Jobs/HealthReport.hs   | 31 +++++++++++++++++++++++++++++++
 src/Model/Types.hs         |  7 ++++++-
 4 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index bc0817d50..94504f1ea 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -37,7 +37,6 @@ import Control.Monad.Trans.Except (throwE, runExceptT)
 import Control.Monad.Writer.Class
 
 import Data.Scientific (Scientific)
-import Data.Ratio
 import Text.Read (readMaybe)
 import Data.Either (partitionEithers)
 
diff --git a/src/Import/NoFoundation.hs b/src/Import/NoFoundation.hs
index d0a4e7fa4..e057be569 100644
--- a/src/Import/NoFoundation.hs
+++ b/src/Import/NoFoundation.hs
@@ -53,7 +53,7 @@ import Data.List.NonEmpty.Instances as Import ()
 import Data.NonNull.Instances as Import ()
 import Data.Text.Encoding.Error as Import(UnicodeException(..))
 import Data.Semigroup         as Import (Semigroup)
-import Data.Monoid            as Import (Last(..), First(..), Any(..), All(..))
+import Data.Monoid            as Import (Last(..), First(..), Any(..), All(..), Sum(..))
 import Data.Monoid.Instances  as Import ()
 import Data.Set.Instances     as Import ()
 import Data.HashMap.Strict.Instances as Import ()
@@ -95,6 +95,8 @@ import Time.Types.Instances as Import ()
 
 import Data.CaseInsensitive as Import (CI, FoldCase(..), foldedCase)
 
+import Data.Ratio as Import ((%))
+
 
 import Control.Monad.Trans.RWS (RWST)
 
diff --git a/src/Jobs/HealthReport.hs b/src/Jobs/HealthReport.hs
index 2c10b8f82..e54de26e1 100644
--- a/src/Jobs/HealthReport.hs
+++ b/src/Jobs/HealthReport.hs
@@ -6,6 +6,8 @@ module Jobs.HealthReport
 
 import Import
 
+import Data.List (genericLength)
+
 import qualified Data.Aeson as Aeson
 import Data.Proxy (Proxy(..))
 
@@ -16,11 +18,18 @@ import Utils.Lens
 import Network.HTTP.Simple (httpJSON)
 import qualified Network.HTTP.Simple as HTTP
 
+import qualified Database.Esqueleto as E
+
+import Auth.LDAP
+
+import qualified Data.CaseInsensitive as CI
+
 
 generateHealthReport :: Handler HealthReport
 generateHealthReport = HealthReport
   <$> matchingClusterConfig
   <*> httpReachable
+  <*> ldapAdmins
   
 matchingClusterConfig :: Handler Bool
 -- ^ Can the cluster configuration be read from the database and does it match our configuration?
@@ -58,6 +67,7 @@ matchingClusterConfig = runDB $ and <$> forM universeF clusterSettingMatches
         Just (Aeson.Success c) -> return $ Just c
         _other                 -> return Nothing
 
+
 httpReachable :: Handler (Maybe Bool)
 httpReachable = do
   staticAppRoot <- getsYesod $ view _appRoot
@@ -69,3 +79,24 @@ httpReachable = do
           & HTTP.setRequestManager httpManager
     (clusterId, _ :: InstanceId) <- responseBody <$> httpJSON httpRequest
     getsYesod $ (== clusterId) . appClusterID
+
+
+ldapAdmins :: Handler (Maybe Rational)
+ldapAdmins = do
+  ldapPool' <- getsYesod appLdapPool
+  ldapConf' <- getsYesod $ view _appLdapConf
+  ldapAdminUsers <- fmap (map E.unValue) . runDB . E.select . E.from $ \(user `E.InnerJoin` lecturer) -> E.distinctOnOrderBy [E.asc $ user E.^. UserId] $ do
+    E.on $ user E.^. UserId E.==. lecturer E.^. LecturerUser
+    E.where_ $ user E.^. UserAuthentication E.==. E.val AuthLDAP
+    return $ user E.^. UserIdent
+  case (,) <$> ldapPool' <*> ldapConf' of
+    Just (ldapPool, ldapConf)
+      | not $ null ldapAdminUsers
+        -> do
+          let numAdmins = genericLength ldapAdminUsers
+              hCampusExc :: CampusUserException -> Handler (Sum Integer)
+              hCampusExc _ = return $ Sum 0
+          Sum numResolved <- fmap fold . forM ldapAdminUsers $
+            \(CI.original -> adminIdent) -> handle hCampusExc $ Sum 1 <$ campusUser ldapConf ldapPool (Creds "LDAP" adminIdent [])
+          return . Just $ numResolved % numAdmins
+    _other -> return Nothing
diff --git a/src/Model/Types.hs b/src/Model/Types.hs
index ac780c123..e7834a59f 100644
--- a/src/Model/Types.hs
+++ b/src/Model/Types.hs
@@ -932,7 +932,11 @@ data HealthReport = HealthReport
   , healthHTTPReachable :: Maybe Bool
     -- ^ Can we reach a uni2work-instance with the same `ClusterId` under our configured `approot` via HTTP?
     --
-    -- Can be nothing if we don't have a static configuration setting `appRoot` or if check is disabled in settings
+    -- Can be `Nothing` if we don't have a static configuration setting `appRoot` or if check is disabled in settings
+  , healthLDAPAdmins :: Maybe Rational
+    -- ^ Proportion of school admins that could be found in LDAP
+    --
+    -- Is `Nothing` if LDAP is not configured or no users are school admins
   } deriving (Eq, Ord, Read, Show, Generic, Typeable)
 
 deriveJSON defaultOptions
@@ -955,6 +959,7 @@ classifyHealthReport :: HealthReport -> HealthStatus
 classifyHealthReport HealthReport{..} = getMin . execWriter $ do
   unless healthMatchingClusterConfig . tell $ Min HealthFailure
   unless (fromMaybe True healthHTTPReachable) . tell $ Min HealthFailure
+  unless (maybe True (> 0) healthLDAPAdmins) . tell $ Min HealthFailure
 
 
 -- Type synonyms

From 8ade1a1bb1fbc9588ff9d864b53709cc5d750aa7 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 30 Apr 2019 19:59:47 +0200
Subject: [PATCH 181/238] Delay systemd notify ready until first successful
 healthcheck

---
 config/settings.yml |  1 +
 src/Application.hs  | 14 +++++++++++---
 src/Model/Types.hs  |  2 +-
 src/Settings.hs     |  8 ++++----
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/config/settings.yml b/config/settings.yml
index 168ba3688..60e25dd9a 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -32,6 +32,7 @@ jwt-encoding: HS256
 maximum-content-length: 52428800
 health-check-interval: "_env:HEALTHCHECK_INTERVAL:60"
 health-check-http: "_env:HEALTHCHECK_HTTP:true"
+health-check-delay-notify: "_env:HEALTHCHECK_DELAY_NOTIFY:true"
 
 log-settings:
   detailed:      "_env:DETAILED_LOGGING:false"
diff --git a/src/Application.hs b/src/Application.hs
index 7d8927e73..91ef1c7fe 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -64,7 +64,7 @@ import qualified Yesod.Core.Types as Yesod (Logger(..))
 
 import qualified Data.HashMap.Strict as HashMap
 
-import Control.Lens
+import Utils.Lens
 
 import Data.Proxy
 
@@ -315,8 +315,16 @@ makeLogWare app = do
 warpSettings :: UniWorX -> Settings
 warpSettings foundation = defaultSettings
     & setBeforeMainLoop (runAppLoggingT foundation $ do
-                            $logInfoS "setup" "Ready"
-                            void $ liftIO Systemd.notifyReady
+                            let notifyReady = do
+                                  $logInfoS "setup" "Ready"
+                                  void $ liftIO Systemd.notifyReady
+                            if
+                              | foundation ^. _appHealthCheckDelayNotify
+                                -> void . fork $ do
+                                  atomically $ readTVar (foundation ^. _appHealthReport) >>= guard . maybe False ((== HealthSuccess) . classifyHealthReport . snd)
+                                  notifyReady
+                              | otherwise
+                                -> notifyReady
                         )
     & setHost (foundation ^. _appHost)
     & setPort (foundation ^. _appPort)
diff --git a/src/Model/Types.hs b/src/Model/Types.hs
index e7834a59f..8978b16d6 100644
--- a/src/Model/Types.hs
+++ b/src/Model/Types.hs
@@ -944,7 +944,7 @@ deriveJSON defaultOptions
   , omitNothingFields  = True
   } ''HealthReport
 
-data HealthStatus = HealthFailure | HealthWarning | HealthSuccess
+data HealthStatus = HealthFailure | HealthSuccess
   deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
 
 instance Universe HealthStatus
diff --git a/src/Settings.hs b/src/Settings.hs
index ac5e832c2..d9798caea 100644
--- a/src/Settings.hs
+++ b/src/Settings.hs
@@ -48,9 +48,6 @@ import qualified Ldap.Client as Ldap
 import Utils hiding (MessageStatus(..))
 import Control.Lens
 
-import Data.Maybe (fromJust)
-import qualified Data.Char as Char
-
 import qualified Network.HaskellNet.Auth as HaskellNet (UserName, Password, AuthType(..))
 import qualified Network.Socket as HaskellNet (PortNumber(..), HostName)
 import qualified Network
@@ -111,8 +108,10 @@ data AppSettings = AppSettings
     , appMaximumContentLength   :: Maybe Word64
     , appJwtExpiration          :: Maybe NominalDiffTime
     , appJwtEncoding            :: JwtEncoding
+    
     , appHealthCheckInterval    :: NominalDiffTime
     , appHealthCheckHTTP        :: Bool
+    , appHealthCheckDelayNotify :: Bool
 
     , appInitialLogSettings     :: LogSettings
 
@@ -280,7 +279,7 @@ deriveFromJSON
 
 deriveJSON
   defaultOptions
-    { constructorTagModifier = over (ix 1) Char.toLower . fromJust . stripPrefix "Level"
+    { constructorTagModifier = camelToPathPiece' 1
     , sumEncoding = UntaggedValue
     }
   ''LogLevel
@@ -382,6 +381,7 @@ instance FromJSON AppSettings where
 
         appHealthCheckInterval    <- o .:  "health-check-interval"
         appHealthCheckHTTP        <- o .:  "health-check-http"
+        appHealthCheckDelayNotify <- o .:  "health-check-delay-notify"
 
         appSessionTimeout         <- o .: "session-timeout"
 

From 667677731e25c289e5c12e9cd4ffeb18d33116d8 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 30 Apr 2019 20:18:54 +0200
Subject: [PATCH 182/238] healthSMTPConnect

---
 src/Jobs/HealthReport.hs | 25 +++++++++++++++++++++----
 src/Model/Types.hs       | 12 +++++++++++-
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/Jobs/HealthReport.hs b/src/Jobs/HealthReport.hs
index e54de26e1..1e8cfa4b9 100644
--- a/src/Jobs/HealthReport.hs
+++ b/src/Jobs/HealthReport.hs
@@ -24,12 +24,17 @@ import Auth.LDAP
 
 import qualified Data.CaseInsensitive as CI
 
+import qualified Network.HaskellNet.SMTP as SMTP
+import Data.Pool (withResource)
+
 
 generateHealthReport :: Handler HealthReport
-generateHealthReport = HealthReport
-  <$> matchingClusterConfig
-  <*> httpReachable
-  <*> ldapAdmins
+generateHealthReport
+  = runConcurrently $ HealthReport
+    <$> Concurrently matchingClusterConfig
+    <*> Concurrently httpReachable
+    <*> Concurrently ldapAdmins
+    <*> Concurrently smtpConnect
   
 matchingClusterConfig :: Handler Bool
 -- ^ Can the cluster configuration be read from the database and does it match our configuration?
@@ -100,3 +105,15 @@ ldapAdmins = do
             \(CI.original -> adminIdent) -> handle hCampusExc $ Sum 1 <$ campusUser ldapConf ldapPool (Creds "LDAP" adminIdent [])
           return . Just $ numResolved % numAdmins
     _other -> return Nothing
+
+
+smtpConnect :: Handler (Maybe Bool)
+smtpConnect = do
+  smtpPool <- getsYesod appSmtpPool
+  for smtpPool . flip withResource $ \smtpConn -> do
+    response@(rCode, _) <- liftIO $ SMTP.sendCommand smtpConn SMTP.NOOP
+    case rCode of
+      250 -> return True
+      _   -> do 
+        $logErrorS "Mail" $ "NOOP failed: " <> tshow response
+        return False
diff --git a/src/Model/Types.hs b/src/Model/Types.hs
index 8978b16d6..0e0cb2884 100644
--- a/src/Model/Types.hs
+++ b/src/Model/Types.hs
@@ -937,6 +937,8 @@ data HealthReport = HealthReport
     -- ^ Proportion of school admins that could be found in LDAP
     --
     -- Is `Nothing` if LDAP is not configured or no users are school admins
+  , healthSMTPConnect :: Maybe Bool
+    -- ^ Can we connect to the SMTP server and say @NOOP@?
   } deriving (Eq, Ord, Read, Show, Generic, Typeable)
 
 deriveJSON defaultOptions
@@ -944,6 +946,12 @@ deriveJSON defaultOptions
   , omitNothingFields  = True
   } ''HealthReport
 
+-- | `HealthReport` classified (`classifyHealthReport`) by badness
+--
+-- > a < b = a `worseThan` b
+--
+-- Currently all consumers of this type check for @(== HealthSuccess)@; this
+-- needs to be adjusted on a case-by-case basis if new constructors are added
 data HealthStatus = HealthFailure | HealthSuccess
   deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
 
@@ -956,10 +964,12 @@ deriveJSON defaultOptions
 nullaryPathPiece ''HealthStatus $ camelToPathPiece' 1
 
 classifyHealthReport :: HealthReport -> HealthStatus
-classifyHealthReport HealthReport{..} = getMin . execWriter $ do
+-- ^ Classify `HealthReport` by badness
+classifyHealthReport HealthReport{..} = getMin . execWriter $ do -- Construction with `Writer (Min HealthStatus) a` returns worst `HealthStatus` passed to `tell` at any point
   unless healthMatchingClusterConfig . tell $ Min HealthFailure
   unless (fromMaybe True healthHTTPReachable) . tell $ Min HealthFailure
   unless (maybe True (> 0) healthLDAPAdmins) . tell $ Min HealthFailure
+  unless (fromMaybe True healthSMTPConnect) . tell $ Min HealthFailure
 
 
 -- Type synonyms

From 32512db3cba291e9c860f85a089490e557572529 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 30 Apr 2019 20:34:31 +0200
Subject: [PATCH 183/238] healthWidgetMemcached

---
 src/Jobs/HealthReport.hs | 22 +++++++++++++++++++++-
 src/Model/Types.hs       |  3 +++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/Jobs/HealthReport.hs b/src/Jobs/HealthReport.hs
index 1e8cfa4b9..d1edc5faf 100644
--- a/src/Jobs/HealthReport.hs
+++ b/src/Jobs/HealthReport.hs
@@ -15,7 +15,7 @@ import qualified Data.ByteArray as ByteArray
 
 import Utils.Lens
 
-import Network.HTTP.Simple (httpJSON)
+import Network.HTTP.Simple (httpJSON, httpLBS)
 import qualified Network.HTTP.Simple as HTTP
 
 import qualified Database.Esqueleto as E
@@ -35,6 +35,7 @@ generateHealthReport
     <*> Concurrently httpReachable
     <*> Concurrently ldapAdmins
     <*> Concurrently smtpConnect
+    <*> Concurrently widgetMemcached
   
 matchingClusterConfig :: Handler Bool
 -- ^ Can the cluster configuration be read from the database and does it match our configuration?
@@ -117,3 +118,22 @@ smtpConnect = do
       _   -> do 
         $logErrorS "Mail" $ "NOOP failed: " <> tshow response
         return False
+
+
+widgetMemcached :: Handler (Maybe Bool)
+widgetMemcached = do
+  memcachedConn <- getsYesod appWidgetMemcached
+  for memcachedConn $ \_memcachedConn' -> do
+    let ext = "bin"
+        mimeType = "application/octet-stream"
+    content <- pack . take 256 <$> liftIO getRandoms
+    staticLink <- addStaticContent ext mimeType content
+    case staticLink of
+      Just (Left url) -> do
+        baseRequest <- HTTP.parseRequest $ unpack url
+        httpManager <- getsYesod appHttpManager
+        let httpRequest = baseRequest
+              & HTTP.setRequestManager httpManager
+        (== content) . responseBody <$> httpLBS httpRequest
+      _other -> return False
+      
diff --git a/src/Model/Types.hs b/src/Model/Types.hs
index 0e0cb2884..50335333d 100644
--- a/src/Model/Types.hs
+++ b/src/Model/Types.hs
@@ -939,6 +939,8 @@ data HealthReport = HealthReport
     -- Is `Nothing` if LDAP is not configured or no users are school admins
   , healthSMTPConnect :: Maybe Bool
     -- ^ Can we connect to the SMTP server and say @NOOP@?
+  , healthWidgetMemcached :: Maybe Bool
+    -- ^ Can we store values in memcached and retrieve them via HTTP?
   } deriving (Eq, Ord, Read, Show, Generic, Typeable)
 
 deriveJSON defaultOptions
@@ -970,6 +972,7 @@ classifyHealthReport HealthReport{..} = getMin . execWriter $ do -- Construction
   unless (fromMaybe True healthHTTPReachable) . tell $ Min HealthFailure
   unless (maybe True (> 0) healthLDAPAdmins) . tell $ Min HealthFailure
   unless (fromMaybe True healthSMTPConnect) . tell $ Min HealthFailure
+  unless (fromMaybe True healthWidgetMemcached) . tell $ Min HealthFailure
 
 
 -- Type synonyms

From 6871a695b41e930a5c2a981f31e80b6cf6629aa4 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 30 Apr 2019 20:44:54 +0200
Subject: [PATCH 184/238] 500 instead of 204 when no report is available for
 too long

---
 src/Handler/Health.hs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Handler/Health.hs b/src/Handler/Health.hs
index ecc16589d..d21b7734a 100644
--- a/src/Handler/Health.hs
+++ b/src/Handler/Health.hs
@@ -12,7 +12,13 @@ getHealthR :: Handler TypedContent
 getHealthR = do
   healthReport' <- liftIO . readTVarIO =<< getsYesod appHealthReport
   case healthReport' of
-    Nothing -> sendResponseStatus noContent204 ()
+    Nothing -> do
+      interval <- getsYesod $ round . (* 1e6) . toRational . view _appHealthCheckInterval
+      reportStore <- getsYesod appHealthReport
+      waitResult <- threadDelay interval `race` atomically (readTVar reportStore >>= guard . is _Just)
+      case waitResult of
+        Left () -> fail "System is not generating HealthReports"
+        Right _ -> redirect HealthR
     Just (lastUpdated, healthReport) -> do
       rContent <- selectRep $ do
         provideRep $

From 99fdd4b46f4c2b794243fca79905068c803ab0d3 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 30 Apr 2019 21:15:37 +0200
Subject: [PATCH 185/238] Assimilate WATCHDOG_USEC

---
 config/settings.yml |  2 +-
 package.yaml        |  1 +
 src/Application.hs  | 17 ++++++++++++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/config/settings.yml b/config/settings.yml
index 60e25dd9a..974b2e7e2 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -30,7 +30,7 @@ session-timeout: 7200
 jwt-expiration: 604800
 jwt-encoding: HS256
 maximum-content-length: 52428800
-health-check-interval: "_env:HEALTHCHECK_INTERVAL:60"
+health-check-interval: "_env:HEALTHCHECK_INTERVAL:600" # or WATCHDOG_USEC/2, whichever is smaller
 health-check-http: "_env:HEALTHCHECK_HTTP:true"
 health-check-delay-notify: "_env:HEALTHCHECK_DELAY_NOTIFY:true"
 
diff --git a/package.yaml b/package.yaml
index d1c262645..3994357bf 100644
--- a/package.yaml
+++ b/package.yaml
@@ -125,6 +125,7 @@ dependencies:
   - lifted-async
   - streaming-commons
   - hourglass
+  - unix
 
 other-extensions:
   - GeneralizedNewtypeDeriving
diff --git a/src/Application.hs b/src/Application.hs
index 91ef1c7fe..30d0947de 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -76,6 +76,10 @@ import qualified Database.Memcached.Binary.IO as Memcached
 
 import qualified System.Systemd.Daemon as Systemd
 import Control.Concurrent.Async.Lifted.Safe (async, waitAnyCancel)
+import System.Environment (lookupEnv)
+import System.Posix.Process (getProcessID)
+
+import Control.Monad.Trans.State (execStateT)
   
 -- Import all relevant handler modules here.
 -- (HPack takes care to add new modules to our cabal file nowadays.)
@@ -360,7 +364,7 @@ develMain = runResourceT $
 appMain :: MonadResourceBase m => m ()
 appMain = runResourceT $ do
     -- Get the settings from all relevant sources
-    settings <- liftIO $
+    settings' <- liftIO $
       loadYamlSettingsArgs
         -- fall back to compile-time values, set to [] to require values at runtime
         [configSettingsYmlValue]
@@ -368,6 +372,17 @@ appMain = runResourceT $ do
         -- allow environment variables to override
         useEnv
 
+    settings <- execStateT ?? settings' $ do
+      watchdogMicroSec <- liftIO $ (>>= readMay) <$> lookupEnv "WATCHDOG_USEC"
+      watchdogProcess <- liftIO $ (>>= fmap fromInteger . readMay) <$> lookupEnv "WATCHDOG_PID"
+      myProcessID <- liftIO getProcessID
+      $logDebugS "WATCHDOG_USEC" $ tshow (watchdogMicroSec, watchdogProcess, myProcessID)
+      case watchdogMicroSec of
+        Just wInterval
+          | maybe True (== myProcessID) watchdogProcess
+            -> _appHealthCheckInterval %= min (fromRational $ (toRational wInterval / 1e6) / 2)
+        _other -> return ()
+
     -- Generate the foundation from the settings
     foundation <- makeFoundation settings
   

From 347a5ace6327446ed8c3e811580bf6193684f924 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 30 Apr 2019 21:23:05 +0200
Subject: [PATCH 186/238] Fix build

---
 src/Application.hs       | 36 +++++++++++++++---------------------
 src/Jobs/HealthReport.hs |  5 ++++-
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/Application.hs b/src/Application.hs
index 30d0947de..503386d64 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -352,8 +352,20 @@ getApplicationDev = do
     app <- makeApplication foundation
     return (wsettings, app)
 
-getAppDevSettings :: MonadIO m => m AppSettings
-getAppDevSettings = liftIO $ loadYamlSettings [configSettingsYml] [configSettingsYmlValue] useEnv
+getAppDevSettings, getAppSettings :: MonadIO m => m AppSettings
+getAppDevSettings = liftIO $ adjustSettings =<< loadYamlSettings [configSettingsYml] [configSettingsYmlValue] useEnv
+getAppSettings = liftIO $ adjustSettings =<< loadYamlSettingsArgs [configSettingsYmlValue] useEnv
+
+adjustSettings :: MonadIO m => AppSettings -> m AppSettings
+adjustSettings = execStateT $ do
+  watchdogMicroSec <- liftIO $ (>>= readMay) <$> lookupEnv "WATCHDOG_USEC"
+  watchdogProcess <- liftIO $ (>>= fmap fromInteger . readMay) <$> lookupEnv "WATCHDOG_PID"
+  myProcessID <- liftIO getProcessID
+  case watchdogMicroSec of
+    Just wInterval
+      | maybe True (== myProcessID) watchdogProcess
+        -> _appHealthCheckInterval %= min (fromRational $ (toRational wInterval / 1e6) / 2)
+    _other -> return () 
 
 -- | main function for use by yesod devel
 develMain :: IO ()
@@ -363,25 +375,7 @@ develMain = runResourceT $
 -- | The @main@ function for an executable running this site.
 appMain :: MonadResourceBase m => m ()
 appMain = runResourceT $ do
-    -- Get the settings from all relevant sources
-    settings' <- liftIO $
-      loadYamlSettingsArgs
-        -- fall back to compile-time values, set to [] to require values at runtime
-        [configSettingsYmlValue]
-
-        -- allow environment variables to override
-        useEnv
-
-    settings <- execStateT ?? settings' $ do
-      watchdogMicroSec <- liftIO $ (>>= readMay) <$> lookupEnv "WATCHDOG_USEC"
-      watchdogProcess <- liftIO $ (>>= fmap fromInteger . readMay) <$> lookupEnv "WATCHDOG_PID"
-      myProcessID <- liftIO getProcessID
-      $logDebugS "WATCHDOG_USEC" $ tshow (watchdogMicroSec, watchdogProcess, myProcessID)
-      case watchdogMicroSec of
-        Just wInterval
-          | maybe True (== myProcessID) watchdogProcess
-            -> _appHealthCheckInterval %= min (fromRational $ (toRational wInterval / 1e6) / 2)
-        _other -> return ()
+    settings <- getAppSettings
 
     -- Generate the foundation from the settings
     foundation <- makeFoundation settings
diff --git a/src/Jobs/HealthReport.hs b/src/Jobs/HealthReport.hs
index d1edc5faf..a8f6a0ff4 100644
--- a/src/Jobs/HealthReport.hs
+++ b/src/Jobs/HealthReport.hs
@@ -77,7 +77,8 @@ matchingClusterConfig = runDB $ and <$> forM universeF clusterSettingMatches
 httpReachable :: Handler (Maybe Bool)
 httpReachable = do
   staticAppRoot <- getsYesod $ view _appRoot
-  for staticAppRoot $ \_textAppRoot -> do
+  doHTTP <- getsYesod $ view _appHealthCheckHTTP
+  for (staticAppRoot <* guard doHTTP) $ \_textAppRoot -> do
     url <- getUrlRender <*> pure InstanceR
     baseRequest <- HTTP.parseRequest $ unpack url
     httpManager <- getsYesod appHttpManager
@@ -128,7 +129,9 @@ widgetMemcached = do
         mimeType = "application/octet-stream"
     content <- pack . take 256 <$> liftIO getRandoms
     staticLink <- addStaticContent ext mimeType content
+    doHTTP <- getsYesod $ view _appHealthCheckHTTP
     case staticLink of
+      _ | not doHTTP -> return True
       Just (Left url) -> do
         baseRequest <- HTTP.parseRequest $ unpack url
         httpManager <- getsYesod appHttpManager

From 09d8c0bb07e05edcf44ed309d3a9b5ddc8bf01aa Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Tue, 30 Apr 2019 22:20:21 +0200
Subject: [PATCH 187/238] Deletion stub

---
 messages/uniworx/de.msg |  2 ++
 src/Handler/Material.hs | 40 +++++++++++++++++++++++++++++++---------
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 1f391452a..746d60dce 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -224,6 +224,8 @@ MaterialEditHeading materialName@MaterialName: Material "#{materialName}" editie
 MaterialEditTitle materialName@MaterialName: Material "#{materialName}" editieren
 MaterialSaveOk  tid@TermId ssh@SchoolId csh@CourseShorthand materialName@MaterialName: Material "#{materialName}" erfolgreich gespeichert in Kurs #{display tid}-#{display ssh}-#{csh}
 MaterialNameDup tid@TermId ssh@SchoolId csh@CourseShorthand materialName@MaterialName: Es gibt bereits Material mit Namen "#{materialName}" in diesem Kurs #{display tid}-#{display ssh}-#{csh}
+MaterialDeleteQuestion: Wollen Sie das unten aufgeführte Material wirklich löschen?
+MaterialDeleted materialName@MaterialName: Material "#{materialName}" gelöscht
 
 
 Unauthorized: Sie haben hierfür keine explizite Berechtigung.
diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index a0e2097b7..b989e45e0 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -12,6 +12,7 @@ import qualified Database.Esqueleto as E
 import Utils.Lens
 import Utils.Form
 import Handler.Utils
+import Handler.Utils.Delete
 
 import Control.Monad.Writer (MonadWriter(..), execWriterT)
 
@@ -58,6 +59,19 @@ makeMaterialForm cid template = identifyForm FIDmaterial $ \html -> do
       <*> aopt (multiFileField oldFileIds)
                               (fslI MsgMaterialFiles)        (mfFiles <$> template)
 
+fetchMaterial :: TermId -> SchoolId -> CourseShorthand -> MaterialName -> DB (CourseId, Entity Material)
+fetchMaterial tid ssh csh mnm = do
+  [(E.Value cid, matEnt)] <- E.select . E.from  $ -- uniqueness guaranteed by DB constraints
+    \(course `E.InnerJoin` material) -> do
+      E.on     $ course   E.^. CourseId   E.==.   material E.^. MaterialCourse
+      E.where_ $ course   E.^. CourseTerm      E.==. E.val tid
+          E.&&.  course   E.^. CourseSchool    E.==. E.val ssh
+          E.&&.  course   E.^. CourseShorthand E.==. E.val csh
+          E.&&.  material E.^. MaterialName    E.==. E.val mnm
+      return (course E.^. CourseId, material)
+  return (cid, matEnt)
+
+
 getMaterialListR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getMaterialListR = error "unimplemented" -- TODO
 
@@ -69,14 +83,7 @@ getMEditR, postMEditR :: TermId -> SchoolId -> CourseShorthand -> MaterialName -
 getMEditR = postMEditR
 postMEditR tid ssh csh mnm = do
   (cid, Entity mid Material{..}, files) <- runDB $ do
-    [(E.Value cid, matEnt)] <- E.select . E.from  $ -- uniqueness guaranteed
-      \(course `E.InnerJoin` material) -> do
-        E.on     $ course   E.^. CourseId   E.==.   material E.^. MaterialCourse
-        E.where_ $ course   E.^. CourseTerm      E.==. E.val tid
-            E.&&.  course   E.^. CourseSchool    E.==. E.val ssh
-            E.&&.  course   E.^. CourseShorthand E.==. E.val csh
-            E.&&.  material E.^. MaterialName    E.==. E.val mnm
-        return (course E.^. CourseId, material)
+    (cid, matEnt) <- fetchMaterial tid ssh csh mnm
     fileIds <- E.select . E.from $ \(matFile `E.InnerJoin` file) -> do
       E.on     $ matFile  E.^. MaterialFileFile     E.==. file E.^. FileId
       E.where_ $ matFile  E.^. MaterialFileMaterial E.==. E.val (entityKey matEnt)
@@ -160,4 +167,19 @@ handleMaterialEdit tid ssh csh cid template dbMaterial = do
 
 getMDelR, postMDelR :: TermId -> SchoolId -> CourseShorthand ->  MaterialName -> Handler Html
 getMDelR = postMDelR
-postMDelR = error "unimplemented" -- TODO
\ No newline at end of file
+postMDelR tid ssh csh mnm = do
+  (_cid, _matEnt) <- runDB $ fetchMaterial tid ssh csh mnm
+  error "todo"
+  {-
+  deleteR DeleteRoute
+    { drRecords = Set.singleton $ entityKey matEnt
+    , drGetInfo = error "todo"
+    , drUnjoin  = error "todo"
+    , drRenderRecord = error "todo"
+    , drRecordConfirmString = error "todo"
+    , drCaption        = SomeMessage   MsgMaterialDeleteQuestion
+    , drSuccessMessage = SomeMessage $ MsgMaterialDeleted mnm
+    , drSuccess = SomeRoute $ CourseR tid ssh csh   MaterialListR
+    , drAbort   = SomeRoute $ CourseR tid ssh csh $ MaterialR mnm MShowR
+    }
+  -}
\ No newline at end of file

From d0b2ffe93630eb5cafea92c7f4b1039391d005cd Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Tue, 30 Apr 2019 22:54:29 +0200
Subject: [PATCH 188/238] Prettier human-readable health reports

---
 messages/uniworx/de.msg | 10 +++++++++-
 src/Foundation.hs       | 20 ++++++++++++++++++++
 src/Handler/Health.hs   | 27 ++++++++++++++++++++++-----
 src/Utils.hs            |  4 ++++
 4 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 259162ce0..7f0df9e9a 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -700,6 +700,8 @@ MenuInformation: Informationen
 MenuImpressum: Impressum
 MenuDataProt: Datenschutz
 MenuVersion: Versionsgeschichte
+MenuInstance: Instanz-Identifikation
+MenuHealth: Instanz-Zustand
 MenuHelp: Hilfe
 MenuProfile: Anpassen
 MenuLogin: Login
@@ -881,4 +883,10 @@ HealthReport: Instanz-Zustand
 InstanceIdentification: Instanz-Identifikation
 
 InstanceId: Instanz-Nummer
-ClusterId: Cluster-Nummer
\ No newline at end of file
+ClusterId: Cluster-Nummer
+
+HealthMatchingClusterConfig: Cluster-geteilte Konfiguration ist aktuell
+HealthHTTPReachable: Cluster kann an der erwarteten URL über HTTP erreicht werden
+HealthLDAPAdmins: Anteil der Administratoren, die im LDAP-Verzeichnis gefunden werden können
+HealthSMTPConnect: SMTP-Server kann erreicht werden
+HealthWidgetMemcached: Memcached-Server liefert Widgets korrekt aus
\ No newline at end of file
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 1560cab35..d7b1060ae 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1655,6 +1655,26 @@ pageActions (VersionR) = [
       , menuItemAccessCallback' = return True
       }
   ]
+pageActions  HealthR = [
+    MenuItem
+      { menuItemType  = PageActionPrime
+      , menuItemLabel = MsgMenuInstance
+      , menuItemIcon  = Nothing
+      , menuItemRoute = SomeRoute InstanceR
+      , menuItemModal = False
+      , menuItemAccessCallback' = return True
+      }
+  ]
+pageActions  InstanceR = [
+    MenuItem
+      { menuItemType  = PageActionPrime
+      , menuItemLabel = MsgMenuHealth
+      , menuItemIcon  = Nothing
+      , menuItemRoute = SomeRoute HealthR
+      , menuItemModal = False
+      , menuItemAccessCallback' = return True
+      }
+  ]
 pageActions (HelpR) = [
     -- MenuItem
     --   { menuItemType = PageActionPrime
diff --git a/src/Handler/Health.hs b/src/Handler/Health.hs
index d21b7734a..f3d5b4007 100644
--- a/src/Handler/Health.hs
+++ b/src/Handler/Health.hs
@@ -7,6 +7,8 @@ import qualified Data.Text.Lazy.Builder as Builder
 
 import Utils.Lens
 
+import qualified Data.UUID as UUID
+
 
 getHealthR :: Handler TypedContent
 getHealthR = do
@@ -24,10 +26,24 @@ getHealthR = do
         provideRep $
           siteLayoutMsg MsgHealthReport $ do
             setTitleI MsgHealthReport
-            let report' = Aeson.encodePrettyToTextBuilder healthReport
+            let HealthReport{..} = healthReport
             [whamlet|
-              <pre style="font-family: monospace; white-space: pre-wrap">
-                #{report'}
+              $newline never
+              <dl .deflist>
+                <dt .deflist__dt>_{MsgHealthMatchingClusterConfig}
+                <dd .deflist__dd>#{boolSymbol healthMatchingClusterConfig}
+                $maybe httpReachable <- healthHTTPReachable
+                  <dt .deflist__dt>_{MsgHealthHTTPReachable}
+                  <dd .deflist__dd>#{boolSymbol httpReachable}
+                $maybe ldapAdmins <- healthLDAPAdmins
+                  <dt .deflist__dt>_{MsgHealthLDAPAdmins}
+                  <dd .deflist__dd>#{textPercent ldapAdmins}
+                $maybe smtpConnect <- healthSMTPConnect
+                  <dt .deflist__dt>_{MsgHealthSMTPConnect}
+                  <dd .deflist__dd>#{boolSymbol smtpConnect}
+                $maybe widgetMemcached <- healthWidgetMemcached
+                  <dt .deflist__dt>_{MsgHealthWidgetMemcached}
+                  <dd .deflist__dd>#{boolSymbol widgetMemcached}
             |]
         provideJson healthReport
         provideRep . return . Builder.toLazyText $ Aeson.encodePrettyToTextBuilder healthReport
@@ -51,11 +67,12 @@ getInstanceR = do
       siteLayoutMsg MsgInstanceIdentification $ do
         setTitleI MsgInstanceIdentification
         [whamlet|
+          $newline never
           <dl .deflist>
             <dt .deflist__dt>_{MsgClusterId}
-            <dd .deflist__dd style="font-family: monospace">#{tshow clusterId}
+            <dd .deflist__dd style="font-family: monospace">#{UUID.toText clusterId}
             <dt .deflist__dt>_{MsgInstanceId}
-            <dd .deflist__dd style="font-family: monospace">#{tshow instanceId}
+            <dd .deflist__dd style="font-family: monospace">#{UUID.toText instanceId}
         |]
     provideJson instanceInfo
     provideRep . return $ tshow instanceInfo
diff --git a/src/Utils.hs b/src/Utils.hs
index 40fa580ee..7084ecbcb 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -152,6 +152,10 @@ isNew :: Bool -> Markup
 isNew True  = [shamlet|<i .fas .fa-seedling>|] -- was exclamation
 isNew False = mempty
 
+boolSymbol :: Bool -> Markup
+boolSymbol True  = [shamlet|<i .fas .fa-check>|]
+boolSymbol False = [shamlet|<i .fas .fa-times>|]
+
 
 ---------------------
 -- Text and String --

From 707beee3e349f4f2e56119c3525bf97ddad1dd2d Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 1 May 2019 12:23:11 +0200
Subject: [PATCH 189/238] Minor HTML tweaks

Fixes #324
---
 src/Foundation.hs                        |   2 +
 templates/course.hamlet                  | 159 +++++++++++------------
 templates/default-layout-wrapper.hamlet  |  30 +++--
 templates/default-layout.hamlet          |   1 +
 templates/home/openCourses.hamlet        |   1 +
 templates/home/upcomingSheets.hamlet     |   1 +
 templates/table/layout-standalone.hamlet |   1 +
 templates/table/sortable-header.hamlet   |   1 +
 templates/terms.hamlet                   |   4 +-
 templates/widgets/alerts/alerts.hamlet   |   1 +
 templates/widgets/footer/footer.hamlet   |   1 +
 templates/widgets/footer/footer.lucius   |   8 ++
 templates/widgets/navbar/item.hamlet     |   1 +
 13 files changed, 118 insertions(+), 93 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index d7b1060ae..05b086ed0 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1162,6 +1162,8 @@ siteLayout' headingOverride widget = do
 
   isModal <- hasCustomHeader HeaderIsModal
 
+  primaryLanguage <- unsafeHead . Text.splitOn "-" <$> selectLanguage appLanguages
+
   mcurrentRoute <- getCurrentRoute
 
   -- Get the breadcrumbs, as defined in the YesodBreadcrumbs instance.
diff --git a/templates/course.hamlet b/templates/course.hamlet
index 4fc2f9366..6f4b83866 100644
--- a/templates/course.hamlet
+++ b/templates/course.hamlet
@@ -1,94 +1,93 @@
 $newline never
-<div .container>
-  <dl .deflist>
-    <dt .deflist__dt>Fakultät/Institut
+<dl .deflist>
+  <dt .deflist__dt>Fakultät/Institut
+  <dd .deflist__dd>
+    <div>
+      #{schoolName}
+
+  $maybe descr <- courseDescription course
+    <dt .deflist__dt>_{MsgCourseDescription}
     <dd .deflist__dd>
       <div>
-        #{schoolName}
+        #{descr}
 
-    $maybe descr <- courseDescription course
-      <dt .deflist__dt>_{MsgCourseDescription}
+  $with numlecs <- length lecturers
+    $if numlecs /= 0
+      $if numlecs > 1
+        <dt .deflist__dt>_{MsgLecturersFor}
+      $else
+        <dt .deflist__dt>_{MsgLecturerFor}
       <dd .deflist__dd>
         <div>
-          #{descr}
-
-    $with numlecs <- length lecturers
-      $if numlecs /= 0
-        $if numlecs > 1
-          <dt .deflist__dt>_{MsgLecturersFor}
-        $else
-          <dt .deflist__dt>_{MsgLecturerFor}
-        <dd .deflist__dd>
-          <div>
-            <ul .list--inline .list--comma-separated>
-              $forall lect <- lecturers
-                <li>^{nameEmailWidget' lect}
-    $with numassi <- length assistants
-      $if numassi /= 0
-        $if numassi > 1
-          <dt .deflist__dt>_{MsgAssistantsFor}
-        $else
-          <dt .deflist__dt>_{MsgAssistantFor}
-        <dd .deflist__dd>
-          <div>
-            <ul .list--inline .list--comma-separated>
-              $forall assi <- assistants
-                <li>^{nameEmailWidget' assi}
-    $with numcorrector <- length correctors
-      $if numcorrector /= 0
-        <dt .deflist__dt>_{MsgCorrectorsFor numcorrector}
-        <dd .deflist__dd>
-          <div>
-            <ul .list--inline .list--comma-separated>
-              $forall corrector <- correctors
-                <li>^{nameEmailWidget' corrector}
-
-    $maybe link <- courseLinkExternal course
-      <dt .deflist__dt>Website
+          <ul .list--inline .list--comma-separated>
+            $forall lect <- lecturers
+              <li>^{nameEmailWidget' lect}
+  $with numassi <- length assistants
+    $if numassi /= 0
+      $if numassi > 1
+        <dt .deflist__dt>_{MsgAssistantsFor}
+      $else
+        <dt .deflist__dt>_{MsgAssistantFor}
       <dd .deflist__dd>
         <div>
-          <a href=#{link} target="_blank" rel="noopener" title="Website des Kurses">#{link}
+          <ul .list--inline .list--comma-separated>
+            $forall assi <- assistants
+              <li>^{nameEmailWidget' assi}
+  $with numcorrector <- length correctors
+    $if numcorrector /= 0
+      <dt .deflist__dt>_{MsgCorrectorsFor numcorrector}
+      <dd .deflist__dd>
+        <div>
+          <ul .list--inline .list--comma-separated>
+            $forall corrector <- correctors
+              <li>^{nameEmailWidget' corrector}
+
+  $maybe link <- courseLinkExternal course
+    <dt .deflist__dt>Website
+    <dd .deflist__dd>
+      <div>
+        <a href=#{link} target="_blank" rel="noopener" title="Website des Kurses">#{link}
 $#    $if NTop (Just 0) < NTop (courseCapacity course)
-    <dt .deflist__dt>Teilnehmer
-    <dd .deflist__dd>
-        <div>
-          #{participants}
-          $maybe capacity <- courseCapacity course
-            \ von #{capacity}
-    $maybe regFrom <- mRegFrom
-      <dt .deflist__dt>Anmeldezeitraum
-      <dd .deflist__dd>
-        <div>
-          Ab #{regFrom}
-          $maybe regTo <- mRegTo
-            \ bis #{regTo}
-        $maybe dereg <- mDereg
-          <div>
-            \ <em>Achtung:</em>
-            \ Abmeldung nur bis #{dereg} erlaubt.
-    $if registrationOpen || isJust mRegAt
-      <dt .deflist__dt>
-      <dd .deflist__dd>
-        <div .course__registration>
-          $if registrationOpen
-            $# regForm is defined through templates/widgets/registerForm
-            ^{regForm}
-          $maybe date <- mRegAt
-            _{MsgRegisteredSince date}
-    <dt .deflist__dt>
-      Material
+  <dt .deflist__dt>Teilnehmer
+  <dd .deflist__dd>
+      <div>
+        #{participants}
+        $maybe capacity <- courseCapacity course
+          \ von #{capacity}
+  $maybe regFrom <- mRegFrom
+    <dt .deflist__dt>Anmeldezeitraum
     <dd .deflist__dd>
       <div>
-        $if courseMaterialFree course
-          Das Kursmaterial ist ohne Anmeldung frei zugänglich.
-        $else
-          Eine Anmeldung zum Kurs ist Voraussetzung zum Zugang zu Kursmaterial
-          (z.B. Übungsblätter).
-    $if hasTutorials
-      <dt .deflist__dt>_{MsgCourseTutorials}
-      <dd .deflist__dd>
-        ^{tutorialTable}
-      
+        Ab #{regFrom}
+        $maybe regTo <- mRegTo
+          \ bis #{regTo}
+      $maybe dereg <- mDereg
+        <div>
+          \ <em>Achtung:</em>
+          \ Abmeldung nur bis #{dereg} erlaubt.
+  $if registrationOpen || isJust mRegAt
+    <dt .deflist__dt>
+    <dd .deflist__dd>
+      <div .course__registration>
+        $if registrationOpen
+          $# regForm is defined through templates/widgets/registerForm
+          ^{regForm}
+        $maybe date <- mRegAt
+          _{MsgRegisteredSince date}
+  <dt .deflist__dt>
+    Material
+  <dd .deflist__dd>
+    <div>
+      $if courseMaterialFree course
+        Das Kursmaterial ist ohne Anmeldung frei zugänglich.
+      $else
+        Eine Anmeldung zum Kurs ist Voraussetzung zum Zugang zu Kursmaterial
+        (z.B. Übungsblätter).
+  $if hasTutorials
+    <dt .deflist__dt>_{MsgCourseTutorials}
+    <dd .deflist__dd>
+      ^{tutorialTable}
+
 
 $# <div .container>
 $#   <div .tab-group>
diff --git a/templates/default-layout-wrapper.hamlet b/templates/default-layout-wrapper.hamlet
index 014edc30f..9626ad816 100644
--- a/templates/default-layout-wrapper.hamlet
+++ b/templates/default-layout-wrapper.hamlet
@@ -1,20 +1,28 @@
 $newline never
 \<!doctype html>
-\<!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
-\<!--[if IE 7]>    <html class="no-js ie7 oldie" lang="en"> <![endif]-->
-\<!--[if IE 8]>    <html class="no-js ie8 oldie" lang="en"> <![endif]-->
-\<!--[if gt IE 8]><!-->
-<html class="no-js" lang="en"> <!--<![endif]-->
+<html lang=#{primaryLanguage}>
   <head>
     <meta charset="UTF-8">
-    <title>#{pageTitle pc}
     <meta name="viewport" content="width=device-width,initial-scale=1">
 
+    $case currentTheme
+      $of ThemeDefault
+        <meta name="theme-color" content="#0a9342">
+      $of ThemeLavender
+        <meta name="theme-color" content="#584c9c">
+      $of ThemeNeutralBlue
+        <meta name="theme-color" content="#3e606f">
+      $of ThemeAberdeenReds
+        <meta name="theme-color" content="#820333">
+      $of ThemeMossGreen
+        <meta name="theme-color" content="#5c996b">
+      $of ThemeSkyLove
+        <meta name="theme-color" content="#87abe5">
+
+    $# title-tag is required even if it is empty
+    <title>#{pageTitle pc}
+
     ^{pageHead pc}
 
-  <body .no-js .theme--#{toPathPiece currentTheme} :isAuth:.logged-in>
-    <!-- removes no-js class from body if client supports javascript -->
-    <script>
-      document.body.classList.remove('no-js');
-
+  <body .theme--#{toPathPiece currentTheme} :isAuth:.logged-in>
     ^{pageBody pc}
diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet
index 701b464ce..21ac81042 100644
--- a/templates/default-layout.hamlet
+++ b/templates/default-layout.hamlet
@@ -1,3 +1,4 @@
+$newline never
 $if not isModal
   <!-- secondary navigation at the side -->
   ^{asidenav}
diff --git a/templates/home/openCourses.hamlet b/templates/home/openCourses.hamlet
index d578cf404..913275128 100644
--- a/templates/home/openCourses.hamlet
+++ b/templates/home/openCourses.hamlet
@@ -1,3 +1,4 @@
+$newline never
 <section>
   <h2>_{MsgHomeOpenCourses}
   ^{courseTable}
diff --git a/templates/home/upcomingSheets.hamlet b/templates/home/upcomingSheets.hamlet
index d109294c9..f82dcf616 100644
--- a/templates/home/upcomingSheets.hamlet
+++ b/templates/home/upcomingSheets.hamlet
@@ -1,3 +1,4 @@
+$newline never
 <section>
   <h2>_{MsgHomeUpcomingSheets}
   ^{sheetTable}
diff --git a/templates/table/layout-standalone.hamlet b/templates/table/layout-standalone.hamlet
index 34b53ce1f..589eb3eeb 100644
--- a/templates/table/layout-standalone.hamlet
+++ b/templates/table/layout-standalone.hamlet
@@ -1 +1,2 @@
+$newline never
 ^{pageBody tbl}
diff --git a/templates/table/sortable-header.hamlet b/templates/table/sortable-header.hamlet
index 188c3a779..39ae44b3b 100644
--- a/templates/table/sortable-header.hamlet
+++ b/templates/table/sortable-header.hamlet
@@ -1,3 +1,4 @@
+$newline never
 $maybe flag <- sortableKey
   $case directions
     $of [SortAsc]
diff --git a/templates/terms.hamlet b/templates/terms.hamlet
index 2d2943787..cdf839b7f 100644
--- a/templates/terms.hamlet
+++ b/templates/terms.hamlet
@@ -1,2 +1,2 @@
-<div .container>
-  ^{table}
+$newline never
+^{table}
diff --git a/templates/widgets/alerts/alerts.hamlet b/templates/widgets/alerts/alerts.hamlet
index 196890850..4527e62d3 100644
--- a/templates/widgets/alerts/alerts.hamlet
+++ b/templates/widgets/alerts/alerts.hamlet
@@ -1,3 +1,4 @@
+$newline never
 <div #alerts-1 .alerts uw-alerts>
   <div .alerts__toggler>
   $forall (status, msg) <- mmsgs
diff --git a/templates/widgets/footer/footer.hamlet b/templates/widgets/footer/footer.hamlet
index e133ec47b..b7d8f6a35 100644
--- a/templates/widgets/footer/footer.hamlet
+++ b/templates/widgets/footer/footer.hamlet
@@ -1,3 +1,4 @@
+$newline never
 <footer .footer>
   <div .footer-links>
     $forall (MenuItem{menuItemType, menuItemRoute = _, menuItemIcon = _, menuItemLabel, menuItemModal = _}, menuIdent, route) <- menuTypes
diff --git a/templates/widgets/footer/footer.lucius b/templates/widgets/footer/footer.lucius
index b00b13588..26c2ae10f 100644
--- a/templates/widgets/footer/footer.lucius
+++ b/templates/widgets/footer/footer.lucius
@@ -14,3 +14,11 @@
     background-color: var(--color-grey-light);
   }
 }
+
+.footer-links * {
+    margin-right: 0.5em;
+
+    &:last {
+        margin-right: 0;
+    }
+}
diff --git a/templates/widgets/navbar/item.hamlet b/templates/widgets/navbar/item.hamlet
index 470ea054f..6446b6366 100644
--- a/templates/widgets/navbar/item.hamlet
+++ b/templates/widgets/navbar/item.hamlet
@@ -1,3 +1,4 @@
+$newline never
 <a .navbar__link-wrapper href=#{route} ##{menuIdent}>
   <i .fas.fa-#{fromMaybe "none" menuItemIcon}>
   <div .navbar__link-label>_{SomeMessage menuItemLabel}

From 97c0c312b762bd996d89a968c686b58ad3cdabbe Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 1 May 2019 12:53:04 +0200
Subject: [PATCH 190/238] Mark sorting links nofollow

---
 templates/table/cell/header.hamlet | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/table/cell/header.hamlet b/templates/table/cell/header.hamlet
index d5d86cf90..ddea5960c 100644
--- a/templates/table/cell/header.hamlet
+++ b/templates/table/cell/header.hamlet
@@ -3,10 +3,10 @@ $newline never
   $maybe flag <- sortableKey
     $case directions
       $of [SortAsc]
-        <a .table__th-link href=^{tblLink' $ setParams (wIdent "sorting") (map toPathPiece (SortingSetting flag SortDesc : piSorting'))}>
+        <a .table__th-link rel=nofollow href=^{tblLink' $ setParams (wIdent "sorting") (map toPathPiece (SortingSetting flag SortDesc : piSorting'))}>
           ^{widget}
       $of _
-        <a .table__th-link href=^{tblLink' $ setParams (wIdent "sorting") (map toPathPiece (SortingSetting flag SortAsc : piSorting'))}>
+        <a .table__th-link rel=nofollow href=^{tblLink' $ setParams (wIdent "sorting") (map toPathPiece (SortingSetting flag SortAsc : piSorting'))}>
           ^{widget}
   $nothing
     ^{widget}

From 309eb116f6169d0edb622a39421c7ddc0a9b2a4f Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 1 May 2019 13:28:17 +0200
Subject: [PATCH 191/238] Info Message for Ldap opening new connections

---
 src/Ldap/Client/Pool.hs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Ldap/Client/Pool.hs b/src/Ldap/Client/Pool.hs
index 875078b6f..dbd5189e9 100644
--- a/src/Ldap/Client/Pool.hs
+++ b/src/Ldap/Client/Pool.hs
@@ -92,6 +92,8 @@ createLdapPool host port stripes timeoutConn (round . (* 1e6) -> timeoutAct) lim
               go Nothing ldap
 
       withTimeout $ do
+        $logInfoS "Ldap" "Opening new connection"
+
         setup <- newEmptyTMVarIO
 
         void . fork . flip runLoggingT logFunc $ do

From c10dcde04a53ee1da6d76bea3921302d0fc131fc Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 1 May 2019 18:41:15 +0200
Subject: [PATCH 192/238] Some Caching & minor

---
 src/Handler/Common.hs   | 17 +++------
 src/Handler/Health.hs   | 79 +++++++++++++++++++++--------------------
 src/Ldap/Client/Pool.hs |  4 +--
 src/Utils.hs            | 33 ++++++++++++++++-
 4 files changed, 79 insertions(+), 54 deletions(-)

diff --git a/src/Handler/Common.hs b/src/Handler/Common.hs
index 54eddd1c3..de1e706e0 100644
--- a/src/Handler/Common.hs
+++ b/src/Handler/Common.hs
@@ -1,17 +1,10 @@
 -- | Common handler functions.
 module Handler.Common where
 
-import Data.FileEmbed (embedFile)
-import Import hiding (embedFile)
+import Import
 
--- These handlers embed files in the executable at compile time to avoid a
--- runtime dependency, and for efficiency.
+getFaviconR :: Handler ()
+getFaviconR = redirectWith movedPermanently301 $ StaticR favicon_ico
 
-getFaviconR :: Handler TypedContent
-getFaviconR = do cacheSeconds $ 60 * 60 * 24 * 30 -- cache for a month
-                 return $ TypedContent "image/x-icon"
-                        $ toContent $(embedFile "static/favicon.ico")
-
-getRobotsR :: Handler TypedContent
-getRobotsR = return $ TypedContent typePlain
-                    $ toContent $(embedFile "static/robots.txt")
+getRobotsR :: Handler ()
+getRobotsR = redirectWith movedPermanently301 $ StaticR robots_txt
diff --git a/src/Handler/Health.hs b/src/Handler/Health.hs
index f3d5b4007..872ab3410 100644
--- a/src/Handler/Health.hs
+++ b/src/Handler/Health.hs
@@ -13,55 +13,58 @@ import qualified Data.UUID as UUID
 getHealthR :: Handler TypedContent
 getHealthR = do
   healthReport' <- liftIO . readTVarIO =<< getsYesod appHealthReport
-  case healthReport' of
-    Nothing -> do
+  let
+    handleMissing = do
       interval <- getsYesod $ round . (* 1e6) . toRational . view _appHealthCheckInterval
       reportStore <- getsYesod appHealthReport
       waitResult <- threadDelay interval `race` atomically (readTVar reportStore >>= guard . is _Just)
       case waitResult of
         Left () -> fail "System is not generating HealthReports"
         Right _ -> redirect HealthR
-    Just (lastUpdated, healthReport) -> do
-      rContent <- selectRep $ do
-        provideRep $
-          siteLayoutMsg MsgHealthReport $ do
-            setTitleI MsgHealthReport
-            let HealthReport{..} = healthReport
-            [whamlet|
-              $newline never
-              <dl .deflist>
-                <dt .deflist__dt>_{MsgHealthMatchingClusterConfig}
-                <dd .deflist__dd>#{boolSymbol healthMatchingClusterConfig}
-                $maybe httpReachable <- healthHTTPReachable
-                  <dt .deflist__dt>_{MsgHealthHTTPReachable}
-                  <dd .deflist__dd>#{boolSymbol httpReachable}
-                $maybe ldapAdmins <- healthLDAPAdmins
-                  <dt .deflist__dt>_{MsgHealthLDAPAdmins}
-                  <dd .deflist__dd>#{textPercent ldapAdmins}
-                $maybe smtpConnect <- healthSMTPConnect
-                  <dt .deflist__dt>_{MsgHealthSMTPConnect}
-                  <dd .deflist__dd>#{boolSymbol smtpConnect}
-                $maybe widgetMemcached <- healthWidgetMemcached
-                  <dt .deflist__dt>_{MsgHealthWidgetMemcached}
-                  <dd .deflist__dd>#{boolSymbol widgetMemcached}
-            |]
-        provideJson healthReport
-        provideRep . return . Builder.toLazyText $ Aeson.encodePrettyToTextBuilder healthReport
+  (lastUpdated, healthReport) <- maybe handleMissing return healthReport'
+  interval <- getsYesod $ view _appHealthCheckInterval
+  instanceId <- getsYesod appInstanceID
 
-      interval <- getsYesod $ view _appHealthCheckInterval
-      expiresAt $ interval `addUTCTime` lastUpdated
-      addHeader "Last-Modified" $ formatRFC1123 lastUpdated
-      let
-        status 
-          | HealthSuccess <- classifyHealthReport healthReport
-          = ok200
-          | otherwise
-          = internalServerError500
-      sendResponseStatus status rContent
+  setWeakEtagHashable (instanceId, lastUpdated)
+  expiresAt $ interval `addUTCTime` lastUpdated
+  setLastModified lastUpdated
+  
+  let status 
+        | HealthSuccess <- classifyHealthReport healthReport
+        = ok200
+        | otherwise
+        = internalServerError500
+  sendResponseStatus status <=< selectRep $ do
+    provideRep . siteLayoutMsg MsgHealthReport $ do
+      setTitleI MsgHealthReport
+      let HealthReport{..} = healthReport
+      [whamlet|
+        $newline never
+        <dl .deflist>
+          <dt .deflist__dt>_{MsgHealthMatchingClusterConfig}
+          <dd .deflist__dd>#{boolSymbol healthMatchingClusterConfig}
+          $maybe httpReachable <- healthHTTPReachable
+            <dt .deflist__dt>_{MsgHealthHTTPReachable}
+            <dd .deflist__dd>#{boolSymbol httpReachable}
+          $maybe ldapAdmins <- healthLDAPAdmins
+            <dt .deflist__dt>_{MsgHealthLDAPAdmins}
+            <dd .deflist__dd>#{textPercent ldapAdmins}
+          $maybe smtpConnect <- healthSMTPConnect
+            <dt .deflist__dt>_{MsgHealthSMTPConnect}
+            <dd .deflist__dd>#{boolSymbol smtpConnect}
+          $maybe widgetMemcached <- healthWidgetMemcached
+            <dt .deflist__dt>_{MsgHealthWidgetMemcached}
+            <dd .deflist__dd>#{boolSymbol widgetMemcached}
+      |]
+    provideJson healthReport
+    provideRep . return . Builder.toLazyText $ Aeson.encodePrettyToTextBuilder healthReport
 
 getInstanceR :: Handler TypedContent
 getInstanceR = do
   instanceInfo@(clusterId, instanceId) <- getsYesod $ (,) <$> appClusterID <*> appInstanceID
+
+  setWeakEtagHashable (clusterId, instanceId)
+  
   selectRep $ do
     provideRep $
       siteLayoutMsg MsgInstanceIdentification $ do
diff --git a/src/Ldap/Client/Pool.hs b/src/Ldap/Client/Pool.hs
index dbd5189e9..6682d7c98 100644
--- a/src/Ldap/Client/Pool.hs
+++ b/src/Ldap/Client/Pool.hs
@@ -92,12 +92,10 @@ createLdapPool host port stripes timeoutConn (round . (* 1e6) -> timeoutAct) lim
               go Nothing ldap
 
       withTimeout $ do
-        $logInfoS "Ldap" "Opening new connection"
-
         setup <- newEmptyTMVarIO
 
         void . fork . flip runLoggingT logFunc $ do
-          $logDebugS "LdapExecutor" "Starting"
+          $logInfoS "LdapExecutor" "Starting"
           res <- liftIO . Ldap.with host port $ flip runLoggingT logFunc . go (Just setup)
           case res of
             Left exc -> do
diff --git a/src/Utils.hs b/src/Utils.hs
index 7084ecbcb..bb2efad89 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -17,6 +17,7 @@ import qualified Data.CaseInsensitive as CI
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Lazy as LBS
 import qualified Data.Text as Text
+import qualified Data.Text.Encoding as Text
 
 import Utils.DB as Utils
 import Utils.TH as Utils
@@ -72,6 +73,12 @@ import Data.Ratio ((%))
 
 import qualified Data.Binary as Binary
 
+import qualified Data.ByteString.Base64.URL as Base64 (encode)
+
+import Network.Wai (requestMethod)
+
+import Data.Time.Clock
+
 {-# ANN choice ("HLint: ignore Use asum" :: String) #-}
 
 
@@ -657,7 +664,7 @@ instance Finite CustomHeader
 nullaryPathPiece ''CustomHeader (intercalate "-" . drop 1 . splitCamel)
 
 lookupCustomHeader :: (MonadHandler m, PathPiece result) => CustomHeader -> m (Maybe result)
-lookupCustomHeader ident = (>>= fromPathPiece . decodeUtf8) <$> lookupHeader (CI.mk . encodeUtf8 $ toPathPiece ident)
+lookupCustomHeader ident = (=<<) (fromPathPiece <=< either (const Nothing) Just . Text.decodeUtf8') <$> lookupHeader (CI.mk . encodeUtf8 $ toPathPiece ident)
 
 hasCustomHeader :: MonadHandler m => CustomHeader -> m Bool
 hasCustomHeader ident = isJust <$> lookupHeader (CI.mk . encodeUtf8 $ toPathPiece ident)
@@ -756,3 +763,27 @@ cachedHere :: Q Exp
 cachedHere = do
   loc <- location
   [e| cachedBy (toStrict $ Binary.encode loc) |]
+
+hashToText :: Hashable a => a -> Text
+hashToText = decodeUtf8 . Base64.encode . toStrict . Binary.encode . hash
+
+setEtagHashable, setWeakEtagHashable :: (MonadHandler m, Hashable a) => a -> m ()
+setEtagHashable = setEtag . hashToText
+setWeakEtagHashable = setEtag . hashToText
+
+setLastModified :: (MonadHandler m, MonadLogger m) => UTCTime -> m ()
+setLastModified lastModified = do
+  rMethod <- requestMethod <$> waiRequest
+
+  when (rMethod `elem` safeMethods) $ do
+    ifModifiedSince <- (=<<) (parseTimeM True defaultTimeLocale "%a, %d %b %Y %X %Z" . unpack <=< either (const Nothing) Just . Text.decodeUtf8') <$> lookupHeader "If-Modified-Since"
+    $logDebugS "LastModified" $ tshow (lastModified, ifModifiedSince)
+    when (maybe False ((lastModified <=) . addUTCTime precision) ifModifiedSince) $
+      notModified
+  
+  addHeader "Last-Modified" $ formatRFC1123 lastModified
+  where
+    precision :: NominalDiffTime
+    precision = 1
+    
+    safeMethods = [ methodGet, methodHead, methodOptions ]

From d2e10b83065523801aee2d2b1bd2c86f27a8a962 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 1 May 2019 19:14:08 +0200
Subject: [PATCH 193/238] Fix tests & restore Common handlers

---
 src/Handler/Common.hs | 26 +++++++++++++++++++++-----
 src/Utils.hs          |  4 +---
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/Handler/Common.hs b/src/Handler/Common.hs
index de1e706e0..f11a76cfb 100644
--- a/src/Handler/Common.hs
+++ b/src/Handler/Common.hs
@@ -1,10 +1,26 @@
 -- | Common handler functions.
 module Handler.Common where
 
-import Import
+import Data.FileEmbed (embedFile)
+import Import hiding (embedFile)
 
-getFaviconR :: Handler ()
-getFaviconR = redirectWith movedPermanently301 $ StaticR favicon_ico
+-- These handlers embed files in the executable at compile time to avoid a
+-- runtime dependency, and for efficiency.
 
-getRobotsR :: Handler ()
-getRobotsR = redirectWith movedPermanently301 $ StaticR robots_txt
+getFaviconR :: Handler TypedContent
+getFaviconR = do
+  let content = $(embedFile "static/favicon.ico")
+
+  setEtagHashable content
+
+  return $ TypedContent "image/x-icon"
+         $ toContent content
+
+getRobotsR :: Handler TypedContent
+getRobotsR = do
+  let content = $(embedFile "static/robots.txt")
+
+  setEtagHashable content
+  
+  return $ TypedContent typePlain
+         $ toContent content
diff --git a/src/Utils.hs b/src/Utils.hs
index bb2efad89..0d656c1fd 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -73,8 +73,6 @@ import Data.Ratio ((%))
 
 import qualified Data.Binary as Binary
 
-import qualified Data.ByteString.Base64.URL as Base64 (encode)
-
 import Network.Wai (requestMethod)
 
 import Data.Time.Clock
@@ -778,7 +776,7 @@ setLastModified lastModified = do
   when (rMethod `elem` safeMethods) $ do
     ifModifiedSince <- (=<<) (parseTimeM True defaultTimeLocale "%a, %d %b %Y %X %Z" . unpack <=< either (const Nothing) Just . Text.decodeUtf8') <$> lookupHeader "If-Modified-Since"
     $logDebugS "LastModified" $ tshow (lastModified, ifModifiedSince)
-    when (maybe False ((lastModified <=) . addUTCTime precision) ifModifiedSince) $
+    when (maybe False ((lastModified <=) . addUTCTime precision) ifModifiedSince)
       notModified
   
   addHeader "Last-Modified" $ formatRFC1123 lastModified

From d78cb079ca006a8be8613a3d9b94b69e13160249 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 1 May 2019 20:42:11 +0200
Subject: [PATCH 194/238] replace asidenav logo with proper vector of lmu logo

---
 assets/logo.svg                            |  6 ++++
 static/css/utils/asidenav.scss             | 33 ++++++++--------------
 templates/widgets/asidenav/asidenav.hamlet | 11 ++++++--
 3 files changed, 27 insertions(+), 23 deletions(-)
 create mode 100644 assets/logo.svg

diff --git a/assets/logo.svg b/assets/logo.svg
new file mode 100644
index 000000000..6b72bb7b9
--- /dev/null
+++ b/assets/logo.svg
@@ -0,0 +1,6 @@
+<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <rect x="0" y="0" width="80" height="80" fill="white" stroke="currentColor" stroke-width="2" />
+  <path d="M6.28906 73.7111V46.4124H8.85405V71.6958H16.7322V73.7111H6.28906Z" fill="currentColor" />
+  <path d="M19.4804 73.7111V46.4124H28.0914L32.0305 67.8483H32.5801L36.6108 46.4124H45.3135V73.7111H40.0003V50.443H39.5422L34.8703 73.7111H29.5571L24.7936 50.443H24.2439V73.7111H19.4804Z" fill="currentColor" />
+  <path d="M48.7945 64.0008V46.4124H58.0468V65.0085C58.0468 66.9322 59.6452 67.872 61.3446 67.8483C63.0171 67.8249 64.5508 66.749 64.5508 65.0085V46.4124H73.8031V64.0008C73.8031 66.1078 73.6565 74.2412 61.3446 74.3523C49.0327 74.4635 48.7945 66.0161 48.7945 64.0008Z" fill="currentColor" />
+</svg>
diff --git a/static/css/utils/asidenav.scss b/static/css/utils/asidenav.scss
index 101bf5506..10f26cadc 100644
--- a/static/css/utils/asidenav.scss
+++ b/static/css/utils/asidenav.scss
@@ -120,41 +120,32 @@
   flex-basis: var(--asidenav-width-xl, 250px);
   font-size: 16px;
   align-items: center;
-  color: var(--color-primary);
+  color: var(--color-dark);
   transform-origin: left;
 
   &:hover {
-    color: var(--color-lightwhite);
-
-    .asidenav__logo-link-item {
-      background-color: var(--color-primary);
-    }
+    color: var(--color-primary);
   }
 }
 
-.asidenav__logo-link-item {
-  font-weight: bold;
-  display: flex;
-  align-items: flex-end;
-  height: calc(100% - 4px);
-  padding: 0 6px 4px;
-  border: 1px solid var(--color-primary);
-  letter-spacing: 2px;
-  background-color: var(--color-lightwhite);
-  transition: background-color .3s ease;
-}
-
 .asidenav__logo-lmu {
-  font-family: var(--font-logo);
-  font-size: 30px;
+  width: 80px;
+  height: 100%;
 }
 
 .asidenav__logo-uni2work {
+  display: flex;
+  align-items: flex-end;
   min-width: 70px;
   margin-left: 12px;
-  font-weight: normal;
   text-transform: uppercase;
   width: 100%;
+  height: 100%;
+  padding: 0 4px 2px;
+  border: 1px solid currentColor;
+  letter-spacing: 2px;
+  background-color: white;
+  transition: background-color .3s ease;
 }
 
 @media (max-width: 1199px) {
diff --git a/templates/widgets/asidenav/asidenav.hamlet b/templates/widgets/asidenav/asidenav.hamlet
index 1640e0953..2e72c4e7e 100644
--- a/templates/widgets/asidenav/asidenav.hamlet
+++ b/templates/widgets/asidenav/asidenav.hamlet
@@ -2,8 +2,15 @@ $newline never
 <aside .main__aside uw-asidenav>
   <div .asidenav__logo>
     <a href="/" .asidenav__logo-link>
-      <span .asidenav__logo-link-item.asidenav__logo-lmu>LMU
-      <span .asidenav__logo-link-item.asidenav__logo-uni2work>UNI2WORK
+      <div .asidenav__logo-lmu >
+        $# TODO: logo is supposed to be loaded from /assets/logo.svg and placed here
+        <svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+          <rect x="0" y="0" width="80" height="80" fill="white" stroke="currentColor" stroke-width="2" />
+          <path d="M6.28906 73.7111V46.4124H8.85405V71.6958H16.7322V73.7111H6.28906Z" fill="currentColor" />
+          <path d="M19.4804 73.7111V46.4124H28.0914L32.0305 67.8483H32.5801L36.6108 46.4124H45.3135V73.7111H40.0003V50.443H39.5422L34.8703 73.7111H29.5571L24.7936 50.443H24.2439V73.7111H19.4804Z" fill="currentColor" />
+          <path d="M48.7945 64.0008V46.4124H58.0468V65.0085C58.0468 66.9322 59.6452 67.872 61.3446 67.8483C63.0171 67.8249 64.5508 66.749 64.5508 65.0085V46.4124H73.8031V64.0008C73.8031 66.1078 73.6565 74.2412 61.3446 74.3523C49.0327 74.4635 48.7945 66.0161 48.7945 64.0008Z" fill="currentColor" />
+
+      <span .asidenav__logo-uni2work>UNI2WORK
 
   <div .asidenav>
     $forall tid <- favouriteTerms

From 493286ab43d3903ab2b01efd34fb000083b47d2e Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 1 May 2019 20:42:29 +0200
Subject: [PATCH 195/238] remove obsolete assets

---
 assets/logo-o2.svg |   4 ----
 assets/logo.png    | Bin 6698 -> 0 bytes
 2 files changed, 4 deletions(-)
 delete mode 100644 assets/logo-o2.svg
 delete mode 100644 assets/logo.png

diff --git a/assets/logo-o2.svg b/assets/logo-o2.svg
deleted file mode 100644
index 80620673b..000000000
--- a/assets/logo-o2.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="158" height="158" viewBox="0 0 158 158" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M31 16.2494C12.1534 30.6875 0 53.4245 0 79C0 122.63 35.3695 158 79 158C122.63 158 158 122.63 158 79C158 53.4245 145.847 30.6875 127 16.2494V39.7542C135.75 50.4433 141 64.1086 141 79C141 113.242 113.242 141 79 141C44.7583 141 17 113.242 17 79C17 64.1086 22.25 50.4433 31 39.7542V16.2494Z" fill="#0A9342"/>
-<path d="M119.111 121H40.5371V107.597L79.4631 65.1392C85.0813 58.879 89.0675 53.6621 91.4218 49.4886C93.8296 45.2616 95.0335 41.0345 95.0335 36.8075C95.0335 31.2429 93.4551 26.7483 90.2982 23.3239C87.1948 19.8995 82.9945 18.1873 77.6974 18.1873C71.3836 18.1873 66.4878 20.1135 63.0099 23.966C59.5319 27.8184 57.793 33.0888 57.793 39.7771H38.2899C38.2899 32.6608 39.8951 26.2668 43.1055 20.5951C46.3693 14.8699 50.9977 10.4288 56.9904 7.27195C63.0366 4.11506 69.9925 2.53662 77.8579 2.53662C89.2013 2.53662 98.1369 5.39922 104.665 11.1244C111.246 16.7961 114.537 24.6616 114.537 34.7208C114.537 40.553 112.878 46.6795 109.561 53.1003C106.297 59.4675 100.919 66.7177 93.4283 74.8506L64.8558 105.43H119.111V121Z" fill="#0A9342"/>
-</svg>
diff --git a/assets/logo.png b/assets/logo.png
deleted file mode 100644
index 4ef03212ece5a17e763ac4dc0a1bae6fb6bf561f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6698
zcmV+_8r9{AP)<h;3K|Lk000e1NJLTq005o<005o{1^@s6!-cbZ00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru;{p!{04AyB6T$!h8MjG9
zK~#9!?Ol6(RMoZq);=?nd4vGrB`R0JYPBjpPzptGG7}>BqOA=|uf46cNFkZ<@M2Nh
z-t^Y0NK0TQfkvxns};ejw~FDFhXVCgtJSvJ2L&G}YQig-naoViUiXhgjA9_k*=Od=
z<NN*m2Vu?LYkz0$wf9<kEg**+a>yZDKsgokjQrIl!(}`%ifm#SB!)6cH%mB$AQvP{
z7B~n1%(S0~!^GM<#Ie0?727__X)i~-W24e*a~0wOfW{Nyd_bH7@D~8&_fujFz(1Mz
z&w|BkAiNTeYJb4u&EcG~vz&PO!O6p<uzd|oS1{pXVhk|(Cu2<bg8*+K(w=B5+xkY1
zc-ey5adua{;7Wp+4RA34Erp|b0pMRdI{3E-7B(Ho5ib)_<IVTzG?z&%1bC#ChQ@?e
zVyf00`tsH}P0cytWrXim>TnI+S5C~g02pHN(S|{&io~P0W6^Wb9P!c=o*Mr&NDeY^
zYMKrGUqm!7TwcE=N4zw`;M(GWvAC=Pa9x^Dr8?p`xCnDzPUMJZc`N5Vm!)_Vz$qCr
zr5%7aGZNVHUXFNHC0(fKn+&=afHT9^XpaV2+!|<lGm|DIGGP*~kbgddev^Tu1Ar5B
zh-W;(qH}V@vk=_X{vQ)~MW%d2JzzK!)ei`HPtR?&R@h#HMT?o}E@TM^_=io4PdGSl
z`~IB8OWF47D`ldk$RaRsT0(a`f_0@@j(GhgPS7{2-`i`j_&fscM|Q@Vr@B7aSFU6Y
zs{Pkw5Ahh}4*4pH@KC@0{jw4dll(0JH?kB2zTLU1c#L5=%ny62{VP*pL2b$WvBKc=
zg7)gzZvb4`Z)@l5_&I>nlk|}^gYY~EuR`)JBJ7bs8%eaoCIm4CLGlSK_*4c>B*p{)
zu4J64gf6Q9%rHDf<_h=T=F=Qi-dV{^R!G`b<yu+%A0*^P0B3ysXOTby^-YHFD<rVZ
zWJ`U3823v->!M}#&x63d{+Bi0e2>(=%HRNi@uq(kk}r(RZ+yAm><#(4&+V_wa$2;a
z>D`PWUVcsS8B*$-02<Z(&-+BYb)}knZ_A%R7;DNZ5?Te*ZLUcB>gFHpXf<q-f<>2s
z5CUkliK=}f5@`6EBH{tSdjv5p9N7AL+WUB}pl`g?<+Gn9U7xQ`KHPV$S)>DK6EvI=
z4%FYJf^+~7sc75~X}6zEz*-a4J0ox9RFz2($1~(Ju29jWv?iW2SadNF8bBCoNKoxK
zJG1;Bb2!JhM_MLd8lBs)N4f09o5SHi!z^Z)b?rl%(En4h%)tcO=&C8cC@qQC>5tKq
z06a!zd18ZRnzCgv-5M!xycLy|(o7{sD;ky%QP3n`X_g6M^GV8$&T8M3v?89X+CLE*
zHmZ8Zz=Q=R3^Np|sJ}f~hpX`L!bJc!t3P4jG*77bY!im;5sW8Y)kR-U3*vc#MduK+
zGSa!Ledhywf!fvL?U5F_D4ADDn7LjDwCeyU4|g%KS(d4Qm^S9G^qysD;<;A)PGG{5
z01DK(V7ONCoZEFFu19542a=3PV9R?T`jL7!mCf|W21y|{xoS#AS(12#!RZCmfel7a
zub<gRh=G}kx26@b^7?-uMTj&P-UGsJwR2*#Poc+??5G=5<sD=#;#GQWQN$htpfqR9
z6Dk@D-~@#t57~%*j#Q#@eVl+_Dz<qiqV@{2Lx^X_ZDJiNy*A4b&oe~aMFhWk50s`U
z_QW4*Ew67uszLGr04h(?l%HrDorIB3bqx`BSb})2YX3D1EHq=53`|li?|xVS;j*T^
z0A5llQ%V|>ly3&O(N$eEGo{4q%!uW?O`BzB&|MYwL<0>k!6INrlVXv_CCgqD)4loC
zMQ5glc*`fcbco-XRdd9(+IIqgVG7l?sZRla^G(OgN{K9tU)1*j`I2cZ)_9#sC!WXQ
zz7xQg%$k|jfiEf*DEWC<2tvqzs&yMF+4+fQd0OdbNhO{qSX|7^0W)VMS?$|c2L5a*
z;<5IQT7lA&>^U&eg8Y!rmlWa+s`3tEl51dgN);)+Mu9U={M|~#Yi-sKDrP|{Dh>z<
zzJG9S@j%mw7q^K!0GyZvCuo>LVd4FAwjQ(+@wy@>%E&^56czfRQL(tZ%~ayKYy1}i
zxFI>dHxE`Q?gLm2wd3qi`1F8*RNha{a|OK<%pu;oQVo)8k)#Jg4CE;kXSuRpp6H-L
zrS1x2PYS0aNQmmbJR0it7w6jBTn3`^6b?3iREx)Wn}wPy2L@ZN?g-hbkfplY9i3=r
zKi9yai1_2&AMX2p1gPoVj@AowmHyfZg~bgSv>+O&Ux_S*ySiuwn4VB1?qH<6VQ^pX
zDP5tWg#=oz(CRijk$1|zin>Eew%S-izX@t9YCaV$uMZ--q3{(Nzto@0@o0JD3ILBO
zbj*jgi`Zf%KAyX3@<=evSE%r}Z3+9gEfqyb0a%i<%w7ilvA-ucM~A!~;9Ux>-i@xH
z_e8_QgJ%B`pe!5{2jo?U7H!&>)wXU~iHAsG9Gbb`G3Wyen+`yTtB>V#_hkns(rz|H
zJkJXM2oS!bP~~?-0!@EJmcx^$e^uef-0p&Ns}TW_vig?*l?9OadUw_2k^Lr~wBbf5
zD#<{=KO*_^PUHY4R{13H>E1Z=$0Q#+eg;5Q)0aHh9D#ljZ*Xn#Kw`c@nXZAkxUQ)^
z+ezoF_MHS^s=8ekk17#VQ5TcUa{*PpH<ukPRlY~!#S{8G00R~2=l-@pLqpEi0Rnt8
z)I}`XJ<-@xs>aq{(fAAq4=55>kkDv$--uUPDHx>6+8xv!@}?Z+09Q@PC@?AWnF)AY
zRmqJ{&XRI5fI})|G0_}UR*GH|&pqVXOTai;(Ojyssa4WZi6ZqMLSZP7A(yKjW7k?$
zDH3;zr*ONkFI%lDYuDoBys8}KK2EUU>(w1l&}h~Tfs^x=Ls8NJ3puA(#Opc+U#?~=
zpu1F@xY8b#URzg!g|f<<1UBuN=Dv!$Lqu4n$SlwBtniOGCh^$jn5oG5-5Yket8=yv
z@C?xw0Z^G>@z+RMW1X2}4o7X(P?Jt(XB)n8OyUvoOhrtu!JH=}Sx>rE{;>@HiAtFa
z{KWK-<KoR>5Uo;To%u*ki6c*4n5f{l5+LoqtT%OQyiV5nL8$FGv?E&H@MtoIPo&=s
z1zFMzT;vW-J-$cc30<EF1<8rTcsvsuzxDY*5vCOYRF)8vkUT$G2^Qh9ro9BHNZk?)
z{i+^`CrPR~RFGJm?WA*simn3F9K~YqHBxN5Uu!8z$y(B94y>OLZ&`_lKwnYt8*j9g
zZ+#}4NjD(mJ)J<RU5!H|<d2g*m$r)fCa8(wPQmhtt|N%&b|o%`iZp1Vwb`6&H>k=x
zNJ9J`3Tp&*IZFTCRdXe|=v>Q36i9M<Y_7>i5RW7&30xD?<5_F!Dl0|Yrah>>9X)M|
z1R8#os%ep?W=$o1k{ltrojiOBWbaHyj|9v5bwi&08Nin*wsg%T^zWo{7YWa+e+|ID
zjT=uY{xtDwy!jxUX<SFhT5IPC`K}{iiE6n_n3s|*_Q-K4SX(|D%St?liRaX59F&A}
z_=#*JU4E$8%gU>K0s#Fw8faK=iAj=Bv9_AaEzdhlJdK2khbNI}3%`(cq+97dOF}*Y
zRqs=~xh;7Ps<6sDqqhAo05BejVjkbk$1`5epMaNAQAs_Oa92$pDTR0n>JnxTuQOPb
zTB_d5oR<>>7|w<f%oiReo>b5yOajkk6X^<r(+gm;Zvb$TdVh+(8>!g(iq+;U+4veW
za8@VrD!n#h7%tpQ;Orq@WvQc`Vvj;?#>vM{{4b*A^=qv-Z4ye>_*ASb)kNN4`)C#Z
z3F#s`{JV9fntN!=Ls0l&ryJ=Sqs?-ORi`dAy9(mvIrn@tN@!Y#g3C^NKfIv+gN!E~
zgWMl9*Mg7CFH<1=9Zj=cV`V?NZSLj|0eau?(bh&^6fE%t1xoujvH-5?qB{Y)UOD9m
ztt9x$&V{x7*JpUGCDW+_pyQ37kdg7ka|M0n1Ty2bTtY~EBV5+>YI+!b7_PHIf=3Dx
z7-3itWj66VA^){RFr%az6XS+(MZ@NF(FL)B-HkCqfK?EWc4aE*+|~Ze8N3E&R6-@H
z3|BPVpHBK9s90+nAygE(CZ@MCb9?np0P|WXtX15NboWKd>;E_1bfRdjhYNrU4Lge@
zGwunaXO({}k*EVq=$OO2F=9XP{dClegp#!$A^<X64N3>KWfJL}tBS|4j*S2YnIQg!
zh{mOu^Kv2`b)yLmD-e?>05)7wL1;<_V+rI3Cl4bjp9XlO3F2S3CG3}?tSN0j)DGb=
zzSaz<fP$xYdF?VIh*ub#ULeW7kyvpbwNC6rN8*xnuZHTNi1CkxI*Di4;vI0era$r4
zc%3nd{T{&iCP?2SVVfFRxb6LPSJS}{N2*wBr<yB*_pi{?TAS-iHFul#AOjbxKS-ci
zFqO0iHfP3_)0d!Ptw}&d(dCnx9BHe_kK?c4t4xr72qdSsRn-42V@_WC+f|fVizy*q
zVXG@`iDy>)6+l!#%*eE2;{)~m%7_;;Dy3a-^Q0x|LcV}W@mHOhuWbu#Z9;}2P7W0f
znd1U5eicHtyrJo)Ku^ejEy1MtD=<4+(fAlL5F)`U*1AoA$#9uiQrm9Ibhv}QE4t#Z
zWCH6Jg#!(1kf{(*Ks@?L0BpGAs16>HE_!nXy%Ruq7$(GDiTIXidBX~1Fr=j63O>($
zg2}kW6DB-(F=u-%KAT894HM$8L=+5{H{O8^hY)<S0^)rn02qFy&a7fE=EAwEcnpI#
z0T`@aIzJFDt6zXD05gqNAY-o}6`lJCr&w88`N7G<G+ox26n}j@(!$@%mI_(S7-M{Q
zz-|GCiu|gxtg5K4`0FMHPBUQ{wnjK_RyI9kCo*2)lo<aO0zyS7=lJ~K<YAW6((;L}
z7{#813GZJ4dOp%_|0*i#V%b7EPmT9D0EQ129jxsVZE)-aVEBt=<eg(FEv+ln+;;bG
z7?`5o(BU<^7P}OSH;0i;(8X8<QsS}wgWeKdU+muvuLbE7Eu$cF<FEfBO<r<v-uC^-
zGB80&sbW;FkBiQ;0bWyZ(4J%!1-WYcOHGQuzAHQAR4df0OVPpNBI7mzuLB>yoFZ0G
z#giwX(rZgO=|a8$F)ubj^hZL7lJ<p7yR(sWs4R65!EiY{0qRCP;6(*P8|WHBUrwcN
zOpL!Cg5>FKWn14smLh-fzDWS`4IjxsFCHddIBI`h#Q}qerlm?TCdOZ*l5j<``%75v
zTtR$^0x^j;hwBsKb)C+PZ?{aBr$Q;NYX3x&;;#uXm$sKTJc}#`5sViVXT17xf4lCf
z?>iLudFSS>oO)_972*jMpH0jgpg#U8ndrYF6^$FRopb|2-qWEVNI-<`pZI#8kY<aD
zL25#unJk5v7=L9D&$ViS#H4St5Z9<tDz+R!yolfiD9A<zFe@p}u8Hwi0xgM@H{PA2
z++o68t-@E1B%)16TD-ERHdeCT;!Iby-_*-wQ{%71w}%7ucjf5T<v-UHUqry^#@Wly
zV9|5Y&)I4L5N%Mic0AiOO_&*fWvq^rH{P0~Ter28`u7xB%};d{7oRyZKic_s4CCtj
z)g{A~Yhhif=C->YG$a1Xz;7e_rj+NX*6rZ7!ao8a6+XL!oqpFN@uKs$z761c1wZ7L
z9r^;r%;<{0;_D{pcyqL6$aSc!lsUR}V~Zvi0We(DiGc0Vxea?h^Jkyg)2n?8h*70r
z+=uL1{A5+ZbXT?iE|WrGk{J&XQ8d$tW7lF!`m6tf<(CvD9Esh;7+`$Art(O6eNFd2
zI^x1rkX*|wmcjUCY(YY|mjn2zVUr*7-^AvSu5-$SZy^H{h~pi$p91I?@jC2@3MHfi
z;zHAo=*M<M?Ub&}i>DO1rVEBHon&b6?oiQ{48AkB@g)z1!RZA6)bvp!{QmQ**^3^I
zrT3_sL)4Qu&zO~_Gho8|*Bp9AJH-M}bSY2FpWER1bBPxjK6Dd+x0N_hz^$&;z7ulG
znI3S}l#Bv!vm$G^JKS>dmR=JNGuP|HT&;%j7$7?M7r7-(50LCw0Y!0dW)AjrQ_y35
zygWE-0Vru($)Ky<A>Z`evRWISpsxh#uB#3?9ol_8p6Gh|ANwlm4iWRc%DyCECDwSI
zx#hJeg46Rr2&odsjMYc$w=0hBpK%q`Bo2UqQ{7?hrrZi!6K=HMqA>OyCDMXN`wK@U
zUbLd=T>$q$-DmJ4SEy)GZka81pa^;=faqpb@(B24B(UYZeiIJ>(2=+uDtgg(!bYIA
z18TiPbIWZF6fD1_kVvcrU{@qE44sx9>n|OXc#(zM-e+Ky!nvNP$Hf|O?rtvSU{HrW
z@gNjd`(hx}o8HB}s`~EYyq^M4*$DY^PsqP0xAG}I#n$+40-*A?;X|iG^eW2KE8^{|
zs5=CpQt8J=e1|hwba8I^Q-l1K{vu}Frc@~5)}x(d`%F9lh>RF=4_HOTfy1y1qW|-(
z@{i5YAla7Ad#)7xIMlw%dnM95<-Xqj<=!_~nYmtP!8ZU<nX@*Kb>5QfmucAy=c?i{
zEJYoFfeOV+mMHH_K4YI9e0Q*@8boD^^|6z5n$#PoGzSCQYjE-~UD&s&?$t)X%5b2e
zPl>;MZYkxC#%~7r9mP61g*7~7G=(aMo>3T_ULb|N&V&YmZ-s^YVPF4IpNZG}gB`5|
z%!cyJNxmTBb~c#uRwLUj-RhFz?IP9y#yG{IB@xZ;PaD*JHPH(P8aEM}Q5=UakR2V*
z<<)q<kfVztpRUS#GIw-rGl6tqLRGlDzF&m^`rW-TjJzcP{%nG-#%NM(^VE3H&C$l_
zm5KK(VH4ZUssD_>L_K}qVhs}y6?HMe^i2R}beleorD)3C^BEzXzeozP9f0yATqd+?
zkfpe;slC54G$R9u*X{bqcG>7R3784>>FG`)y4HT_Xf5&OZ$FEsCeG2RH>?1;hWh7&
z_}2j3ru+i%t#F{xPz5a|WN}sdeol-VP1NRA(#5s8>z1QqK&^ME9v2S)xYV?jU@VPR
zG%PVHM@fh7XtP`bV6%BDrDE3POSzP)qihdB|71NbUNMt&0P3R04N+3!L)rFN7@S_v
zPO<HP@dg}6K?i`_BAj<;HuaY{D%N<N?pC@PM7O|%#(>?Z@~S)1KBf5wJ6bJ8JOFTq
zrXCOIF90~vWOeTZ5QqdC>azL(5%T$TphihGr=#ON7Pbk|vdzi@2g-BeJgfX;S?5Lo
zg{Ets@F+{Uuq#tKYv8IW8P)X~?CVMRxfUU%w{3pYU(_z08Hx$|#zSDMq7n$lLK_j^
z?h41NRc!-S#n7db21ML>73h5T>Pf;+9s;C45@`CPdYfUEvs>+(A{cch9qB(0`v3&(
zT0EF(U3UtWUsBj%PgJ0@ti<3X{cJ=sO>3{H-)7EcW%5Z&5I+T=Ac^bLMnv~9i>1eU
zaAJ8ME;xCZBzqZv`2YqbQ-=bW(H3ZEFwaXe+aC$~#uK3~DL&t)5e4B9X8u()(6}R=
z2<NIPzNoVjC(VR{`gDEu=>R#+jO{h4#Orq8r~`0(iq`TCfFIU$tZQA+_;)LkZ9vF-
zx=z|mW}cOVQ)*9mS4cTs^+6(K#Ornv+W>R#`Hl_7YfN~WnK!oQ9r^?2yqrkMIBLh)
z^W%dj=`5#pH7`kVvuS#jZG8D>D|e<n@qojZ%<BP^Si#CLp_LfV1K2@~=g4k*_48`E
zDY5!1{39UvoX*ypJPDu)P|zDp5$fEL*wx9r6-fTu)=IC<HB{V5j76|!-MbH%@fRZ6
zNhEiJ@fJz(KHJeEiCY{Tj~rxM;&Ad~jW>TFb=c$Na0{j(l)w-cawG^RG1F*fjOl8p
zZp8#wX7IA;h@rP&=6XG;_BB;Ac2^h80Mi3d`{*QxKAc<`_--`Nus$Uldup!>{9lsb
zhe60aaZIv5r$L|98fbbmRU;57{p2d@{}w^scxEhx+GmqF^yJnO1taX3kV?{}+~R%8
z`40L@nD|!!jmq)E6ud=5v-|r-BBLx`cZ4e%Hb)%!r*~ODJ;xJekO1B7j>OKk3h69m
z@w&rR?Vm`@s{x#o<BcJ_!o+i<<&7^`ZD7KR+KQIfKNo44ay~JC8)~amWeZvuv>-BK
z$c0uUon<XvcMPsA9@rk&Zy``Ql9%a{t_U*_a&g`rT@}8pd#+9wjphd@57S}4kq8w?
ze&F2dhy!##I^va)h1=dwhXJQuRZiDx-wEiz0s?M8a?`D>h=UBSCD>M`TMAg(mV+$}
zPA`ZdKAVXHP*_SeO;&9;gF>Eg`#tHJb)Eioh$}0Fr*OLuByV6~1^`Ef(oF}rkwJGy
zTjb-YZ0bnwZzqG`S>Ycc1(y=|Y7l+Js;BloKoYQni5?M}w%)AFnH=#{`hr34i2!|_
zh%Q5CEBSQkDij6iSq5)_4UZ)&KQ2c+Gf;bl+ns3hlBB5&OakFNnELp+Pv`*fCjxdb
zuqBd+Heu0o(M(^G?CdqMti+S=(8sgJ<0WG(G0p<v45(`|((|<k<4qR)x&XaSI=$Ey
z*IvZp&EafYf?Si6!&Y&eeL%EejMQ*4gGMuWG?+#bVF+;ezrkI8qaB}Q54QnGfT4qM
z06+_X7G|^nc#jCX3B0R=#IBhAz^;^~+FK0&55Brl#4;xynE(I)07*qoM6N<$f{E^>
Ap8x;=


From 19b7b1e9a5acd62df7ab125decbf2d5c60c6b7d1 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Wed, 1 May 2019 21:05:48 +0200
Subject: [PATCH 196/238] rework icons in navbar items

---
 static/css/utils/asidenav.scss         |  2 +-
 templates/widgets/navbar/item.hamlet   |  4 +++-
 templates/widgets/navbar/navbar.lucius | 11 ++++++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/static/css/utils/asidenav.scss b/static/css/utils/asidenav.scss
index 10f26cadc..fa7eadb1d 100644
--- a/static/css/utils/asidenav.scss
+++ b/static/css/utils/asidenav.scss
@@ -141,7 +141,7 @@
   text-transform: uppercase;
   width: 100%;
   height: 100%;
-  padding: 0 4px 2px;
+  padding: 2px 4px;
   border: 1px solid currentColor;
   letter-spacing: 2px;
   background-color: white;
diff --git a/templates/widgets/navbar/item.hamlet b/templates/widgets/navbar/item.hamlet
index 6446b6366..156844387 100644
--- a/templates/widgets/navbar/item.hamlet
+++ b/templates/widgets/navbar/item.hamlet
@@ -1,4 +1,6 @@
 $newline never
 <a .navbar__link-wrapper href=#{route} ##{menuIdent}>
-  <i .fas.fa-#{fromMaybe "none" menuItemIcon}>
+  $if isJust menuItemIcon
+    <div .navbar__link-icon>
+      <i .fas.fa-2x.fa-#{fromMaybe "none" menuItemIcon}>
   <div .navbar__link-label>_{SomeMessage menuItemLabel}
diff --git a/templates/widgets/navbar/navbar.lucius b/templates/widgets/navbar/navbar.lucius
index 335c59d03..8dde8fbc5 100644
--- a/templates/widgets/navbar/navbar.lucius
+++ b/templates/widgets/navbar/navbar.lucius
@@ -58,6 +58,7 @@
 
 /* links */
 .navbar__link-wrapper {
+  position: relative;
   display: flex;
   flex-direction: column;
   justify-content: flex-end;
@@ -66,15 +67,23 @@
   min-width: 90px;
   color: var(--color-lightwhite);
   transition: height .2s cubic-bezier(0.03, 0.43, 0.58, 1);
+  overflow: hidden;
 
   &:hover {
     color: var(--color-lightwhite);
   }
 }
 
+.navbar__link-icon {
+  position: absolute;
+  right: 4px;
+  top: 4px;
+  opacity: 0.3;
+}
+
 .navbar__link-label {
   transition: opacity .2s ease;
-  padding: 4px 6px;
+  padding: 2px 4px;
   text-transform: uppercase;
 }
 

From d017196245281f916ad7b2950226007d1136bcf3 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Wed, 1 May 2019 21:09:36 +0200
Subject: [PATCH 197/238] Embed Logo from assets

---
 src/Foundation.hs                          | 5 ++++-
 templates/widgets/asidenav/asidenav.hamlet | 7 +------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 05b086ed0..452eaca2f 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -4,7 +4,7 @@
 
 module Foundation where
 
-import Import.NoFoundation
+import Import.NoFoundation hiding (embedFile)
 import Database.Persist.Sql (ConnectionPool, runSqlPool)
 import Text.Hamlet          (hamletFile)
 
@@ -85,6 +85,8 @@ import Data.Bits (Bits(zeroBits))
 
 import Network.Wai.Parse (lbsBackEnd)
 
+import Data.FileEmbed (embedFile)
+
 
 instance DisplayAble b => DisplayAble (E.CryptoID a b) where
   display = display . ciphertext
@@ -1239,6 +1241,7 @@ siteLayout' headingOverride widget = do
       navbar = $(widgetFile "widgets/navbar/navbar")
       asidenav :: Widget
       asidenav = $(widgetFile "widgets/asidenav/asidenav")
+        where logo = preEscapedToMarkup $ decodeUtf8 $(embedFile "assets/logo.svg")
       footer :: Widget
       footer = $(widgetFile "widgets/footer/footer")
       alerts :: Widget
diff --git a/templates/widgets/asidenav/asidenav.hamlet b/templates/widgets/asidenav/asidenav.hamlet
index 2e72c4e7e..2c49a065d 100644
--- a/templates/widgets/asidenav/asidenav.hamlet
+++ b/templates/widgets/asidenav/asidenav.hamlet
@@ -3,12 +3,7 @@ $newline never
   <div .asidenav__logo>
     <a href="/" .asidenav__logo-link>
       <div .asidenav__logo-lmu >
-        $# TODO: logo is supposed to be loaded from /assets/logo.svg and placed here
-        <svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
-          <rect x="0" y="0" width="80" height="80" fill="white" stroke="currentColor" stroke-width="2" />
-          <path d="M6.28906 73.7111V46.4124H8.85405V71.6958H16.7322V73.7111H6.28906Z" fill="currentColor" />
-          <path d="M19.4804 73.7111V46.4124H28.0914L32.0305 67.8483H32.5801L36.6108 46.4124H45.3135V73.7111H40.0003V50.443H39.5422L34.8703 73.7111H29.5571L24.7936 50.443H24.2439V73.7111H19.4804Z" fill="currentColor" />
-          <path d="M48.7945 64.0008V46.4124H58.0468V65.0085C58.0468 66.9322 59.6452 67.872 61.3446 67.8483C63.0171 67.8249 64.5508 66.749 64.5508 65.0085V46.4124H73.8031V64.0008C73.8031 66.1078 73.6565 74.2412 61.3446 74.3523C49.0327 74.4635 48.7945 66.0161 48.7945 64.0008Z" fill="currentColor" />
+        #{logo}
 
       <span .asidenav__logo-uni2work>UNI2WORK
 

From 09467c21f3213d12eda2e0309b44a5608fd039bd Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 2 May 2019 09:51:09 +0200
Subject: [PATCH 198/238] Refactor Sheet Show: unnecessary join removed

---
 src/Handler/Material.hs | 26 +++++++++++++++++++++++---
 src/Handler/Sheet.hs    | 15 +++++++--------
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index b989e45e0..5dd8ce020 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -12,7 +12,7 @@ import qualified Database.Esqueleto as E
 import Utils.Lens
 import Utils.Form
 import Handler.Utils
-import Handler.Utils.Delete
+-- import Handler.Utils.Delete
 
 import Control.Monad.Writer (MonadWriter(..), execWriterT)
 
@@ -72,12 +72,32 @@ fetchMaterial tid ssh csh mnm = do
   return (cid, matEnt)
 
 
+
+
 getMaterialListR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getMaterialListR = error "unimplemented" -- TODO
 
 
 getMShowR :: TermId -> SchoolId -> CourseShorthand -> MaterialName -> Handler Html
-getMShowR = error "unimplemented" -- TODO
+getMShowR = do -- tid ssh csh mnm = do
+  -- <- runDB $ do
+  --   (cid, matEnt) <- fetchMaterial tid ssh csh mnm
+  --   dbTable psValidator DBTable
+  --     { dbtSQLQuery
+
+
+  --     }
+
+
+
+  -- (cid, Entity mid Material{..}, files) <- runDB $ do
+  --   (cid, matEnt) <- fetchMaterial tid ssh csh mnm
+  --   fileIds <- E.select . E.from $ \(matFile `E.InnerJoin` file) -> do
+  --     E.on     $ matFile  E.^. MaterialFileFile     E.==. file E.^. FileId
+  --     E.where_ $ matFile  E.^. MaterialFileMaterial E.==. E.val (entityKey matEnt)
+  --     return $ file E.^. FileId
+  --   return (cid, matEnt, (Left . E.unValue) <$> fileIds)
+  error "unimplemented" -- TODO
 
 getMEditR, postMEditR :: TermId -> SchoolId -> CourseShorthand -> MaterialName -> Handler Html
 getMEditR = postMEditR
@@ -169,7 +189,7 @@ getMDelR, postMDelR :: TermId -> SchoolId -> CourseShorthand ->  MaterialName ->
 getMDelR = postMDelR
 postMDelR tid ssh csh mnm = do
   (_cid, _matEnt) <- runDB $ fetchMaterial tid ssh csh mnm
-  error "todo"
+  error "todo" -- CONTINUE HERE
   {-
   deleteR DeleteRoute
     { drRecords = Set.singleton $ entityKey matEnt
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 5f5dfe896..461c23d67 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -305,12 +305,11 @@ getSShowR tid ssh csh shn = do
 --   let fileLinks = map (\(E.Value fName, E.Value modified, E.Value fType) -> (CSheetR tid ssh csh (SheetFileR shn fType fName),modified)) fileNameTypes
   -- with Colonnade
 
-  let fileData (sheet' `E.InnerJoin` sheetFile `E.InnerJoin` file) = do
+  let fileData (sheetFile `E.InnerJoin` file) = do
         -- Restrict to consistent rows that correspond to each other
-        E.on (file      E.^. FileId           E.==. sheetFile E.^. SheetFileFile)
-        E.on (sheetFile E.^. SheetFileSheet   E.==. sheet'    E.^. SheetId)
+        E.on (sheetFile E.^. SheetFileFile  E.==.  file E.^. FileId)
         -- filter to requested file
-        E.where_ $  sheet'    E.^. SheetId      E.==. E.val sid
+        E.where_ $  sheetFile E.^. SheetFileSheet  E.==.  E.val sid
               E.&&. E.not_ (E.isNothing $ file E.^. FileContent)
         -- return desired columns
         return $ (file E.^. FileTitle, file E.^. FileModified, sheetFile E.^. SheetFileType)
@@ -325,7 +324,7 @@ getSShowR tid ssh csh shn = do
         & defaultSorting [SortAscBy "type", SortAscBy "path"]
   (Any hasFiles, fileTable) <- runDB $ dbTable psValidator DBTable
     { dbtSQLQuery = fileData
-    , dbtRowKey = \(_ `E.InnerJoin` _ `E.InnerJoin` file) -> file E.^. FileId
+    , dbtRowKey = \(_ `E.InnerJoin` file) -> file E.^. FileId
     , dbtColonnade = colonnadeFiles
     , dbtProj = \DBRow{ dbrOutput = dbrOutput@(E.Value fName, _, E.Value fType) }
                    -> dbrOutput <$ guardM (lift $ (== Authorized) <$> evalAccessDB (CSheetR tid ssh csh shn $ SFileR fType fName) False)
@@ -335,13 +334,13 @@ getSShowR tid ssh csh shn = do
     , dbtIdent = "files" :: Text
     , dbtSorting = Map.fromList
       [ ( "type"
-        , SortColumn $ \(_sheet `E.InnerJoin` sheetFile `E.InnerJoin` _file) -> sheetFile E.^. SheetFileType
+        , SortColumn $ \(sheetFile `E.InnerJoin` _file) -> sheetFile E.^. SheetFileType
         )
       , ( "path"
-        , SortColumn $ \(_sheet `E.InnerJoin` _sheetFile `E.InnerJoin` file) -> file E.^. FileTitle
+        , SortColumn $ \(_sheetFile `E.InnerJoin` file) -> file E.^. FileTitle
         )
       , ( "time"
-        , SortColumn $ \(_sheet `E.InnerJoin` _sheetFile `E.InnerJoin` file) -> file E.^. FileModified
+        , SortColumn $ \(_sheetFile `E.InnerJoin` file) -> file E.^. FileModified
         )
       ]
     , dbtParams = def

From 88fc32e13ffb93d623111e7159f2feadd6c77feb Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 2 May 2019 17:13:32 +0200
Subject: [PATCH 199/238] Material dbTable almost done, sorting type error

---
 messages/uniworx/de.msg            |  1 +
 routes                             |  4 +-
 src/Handler/Material.hs            | 67 +++++++++++++++++++++++-----
 src/Handler/Sheet.hs               | 71 +++++++++++++-----------------
 src/Handler/Utils.hs               | 29 +++++++++++-
 src/Handler/Utils/Table/Columns.hs | 43 ++++++++++++++++++
 6 files changed, 160 insertions(+), 55 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 746d60dce..ef6ce57ae 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -596,6 +596,7 @@ SheetGroupNoGroups: Keine Gruppenabgabe
 SheetGroupMaxGroupsize: Maximale Gruppengröße
 
 SheetFiles: Übungsblatt-Dateien
+SheetFileTypeHeader: Zugehörigkeit
 
 NotificationTriggerSubmissionRatedGraded: Meine Abgabe in einem gewerteten Übungsblatt wurde korrigiert
 NotificationTriggerSubmissionRated: Meine Abgabe wurde korrigiert
diff --git a/routes b/routes
index a86f39945..135c9baa1 100644
--- a/routes
+++ b/routes
@@ -109,9 +109,11 @@
   /mat                          MaterialListR GET             !materials !registered !corrector
   /mat/new                      MaterialNewR  GET POST
   /mat/#MaterialName MaterialR:
-    /show                       MShowR        GET             !timeANDregistered !timeANDmaterials !corrector
     /edit                       MEditR        GET POST
     /delete                     MDelR         GET POST
+    /show                       MShowR        GET             !timeANDregistered !timeANDmaterials !corrector
+    /file/*FilePath             MFileR        GET             !timeANDregistered !timeANDmaterials !corrector
+
 
 /subs  CorrectionsR GET POST !corrector !lecturer
 /subs/upload CorrectionsUploadR GET POST !corrector !lecturer
diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index 5dd8ce020..528e06d84 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -4,20 +4,25 @@ import Import
 
 import Data.Set (Set)
 import qualified Data.Set as Set
+-- import Data.Map (Map)
+import qualified Data.Map as Map
 import qualified Data.Conduit.List as C
 -- import qualified Data.CaseInsensitive as CI
 
 import qualified Database.Esqueleto as E
+import Database.Esqueleto.Utils.TH
 
 import Utils.Lens
 import Utils.Form
 import Handler.Utils
 -- import Handler.Utils.Delete
+import Handler.Utils.Table.Columns
 
 import Control.Monad.Writer (MonadWriter(..), execWriterT)
 
 
 
+
 data MaterialForm = MaterialForm
       { mfName         :: MaterialName
       , mfType         :: Maybe Text
@@ -72,24 +77,62 @@ fetchMaterial tid ssh csh mnm = do
   return (cid, matEnt)
 
 
-
-
 getMaterialListR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getMaterialListR = error "unimplemented" -- TODO
 
+getMFileR :: TermId -> SchoolId -> CourseShorthand -> MaterialName -> FilePath -> Handler TypedContent
+getMFileR tid ssh csh mnm title = serveOneFile fileQuery
+  where
+    fileQuery = E.select $ E.from $
+      \(course `E.InnerJoin` material `E.InnerJoin` matFile `E.InnerJoin` file) -> do
+        -- Restrict to consistent rows that correspond to each other
+        E.on (file     E.^. FileId               E.==. matFile  E.^. MaterialFileFile)
+        E.on (matFile  E.^. MaterialFileMaterial E.==. material E.^. MaterialId)
+        E.on (material E.^. MaterialCourse       E.==. course   E.^. CourseId)
+        -- filter to requested file
+        E.where_ ((file      E.^. FileTitle       E.==. E.val title)
+          E.&&.   (material  E.^. MaterialName    E.==. E.val mnm  )
+          E.&&.   (course    E.^. CourseShorthand E.==. E.val csh  )
+          E.&&.   (course    E.^. CourseSchool    E.==. E.val ssh  )
+          E.&&.   (course    E.^. CourseTerm      E.==. E.val tid  )
+          )
+        -- return file entity
+        return file
 
 getMShowR :: TermId -> SchoolId -> CourseShorthand -> MaterialName -> Handler Html
-getMShowR = do -- tid ssh csh mnm = do
-  -- <- runDB $ do
-  --   (cid, matEnt) <- fetchMaterial tid ssh csh mnm
-  --   dbTable psValidator DBTable
-  --     { dbtSQLQuery
-
-
-  --     }
-
-
+getMShowR tid ssh csh mnm = do
+  let matLink :: FilePath -> Route UniWorX
+      matLink = CourseR tid ssh csh . MaterialR mnm . MFileR
+  _ <- runDB $ do
+    (cid, matEnt) <- fetchMaterial tid ssh csh mnm
+    let psValidator = def & defaultSortingByFileTitle
+    dbTable psValidator DBTable
+      { dbtSQLQuery = \(matFile `E.InnerJoin` file) -> do
+            E.on     $ matFile E.^. MaterialFileFile     E.==. file E.^. FileId
+            E.where_ $ matFile E.^. MaterialFileMaterial E.==. E.val (entityKey matEnt)
+                E.&&.  E.not_ (E.isNothing $ file E.^. FileContent) -- don't show directories
+            return (file E.^. FileTitle, file E.^. FileModified)
+      , dbtRowKey = \(_ `E.InnerJoin` file) -> file E.^. FileId
+      , dbtColonnade = widgetColonnade $ mconcat
+            [ colFilePathSimple   (view _1) matLink
+            , colFileModification (view _2)
+            ]
+      , dbtProj = \row ->
+            let dbrOutput = row       ^. _dbrOutput
+                fPath     = dbrOutput ^. _1 . _Value
+            in  guardAuthorizedFor (matLink fPath) dbrOutput
+      , dbtStyle    = def
+      , dbtParams   = def
+      , dbtFilter   = mempty
+      , dbtFilterUI = mempty
+      , dbtIdent    = "material-files" :: Text
+      , dbtSorting  = Map.fromList
+            [ sortFilePath         $ $(sqlIJproj 2 2) E.^. FileTitle
+            , sortFileModification $ $(sqlIJproj 2 2) E.^. FileModified
+            ]
+      }
 
+  -- DEAD CODE TO DELETE:
   -- (cid, Entity mid Material{..}, files) <- runDB $ do
   --   (cid, matEnt) <- fetchMaterial tid ssh csh mnm
   --   fileIds <- E.select . E.from $ \(matFile `E.InnerJoin` file) -> do
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 461c23d67..0ca8a2698 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -4,12 +4,12 @@ import Import
 
 import Jobs.Queue
 
-import System.FilePath (takeFileName)
-
+-- import Utils.Lens
 import Utils.Sheet
 import Handler.Utils
 -- import Handler.Utils.Zip
 import Handler.Utils.Table.Cells
+-- import Handler.Utils.Table.Columns
 import Handler.Utils.SheetType
 import Handler.Utils.Delete
 import Handler.Utils.Form.MassInput
@@ -38,8 +38,6 @@ import Control.Monad.Writer (MonadWriter(..), execWriterT)
 
 import Control.Monad.Trans.Except (runExceptT, mapExceptT, throwE)
 
-import Network.Mime
-
 import Data.Set (Set)
 import qualified Data.Set as Set
 import qualified Data.Map as Map
@@ -310,24 +308,25 @@ getSShowR tid ssh csh shn = do
         E.on (sheetFile E.^. SheetFileFile  E.==.  file E.^. FileId)
         -- filter to requested file
         E.where_ $  sheetFile E.^. SheetFileSheet  E.==.  E.val sid
-              E.&&. E.not_ (E.isNothing $ file E.^. FileContent)
+              E.&&. E.not_ (E.isNothing $ file E.^. FileContent) -- don't show directories
         -- return desired columns
         return $ (file E.^. FileTitle, file E.^. FileModified, sheetFile E.^. SheetFileType)
   let colonnadeFiles = widgetColonnade $ mconcat
-        [ sortable (Just "type") "Typ" $ \(_,_, E.Value ftype) -> i18nCell ftype & cellContents %~ (\act -> act <* tell (Any True))
-        , sortable (Just "path") "Dateiname" $ \(E.Value fName,_,E.Value fType) -> anchorCell
-            (CSheetR tid ssh csh shn (SFileR fType fName))
-            (str2widget fName)
-        , sortable (Just "time") "Modifikation" $ \(_,E.Value modified,_) -> cell $ formatTime SelFormatDateTime (modified :: UTCTime) >>= toWidget
+        [ sortable (Just "type") (i18nCell MsgSheetFileTypeHeader) $ \(_,_, E.Value ftype) -> i18nCell ftype & cellContents %~ (\act -> act <* tell (Any True))
+        , sortable (Just "path") (i18nCell MsgFileTitle) $ \(E.Value fName,_,E.Value fType) -> anchorCell
+             (CSheetR tid ssh csh shn (SFileR fType fName))
+             (str2widget fName)
+        -- , colFilePath (view _1) (\row -> let fType = view _3 row in let fName = view _1 row in (CSheetR tid ssh csh shn (SFileR (E.unValue fType) (E.unValue fName))))
+        -- , colFileModification (view _2)
+        , sortable (Just "time") (i18nCell MsgFileModified) $ \(_,E.Value modified,_) -> dateTimeCell modified
         ]
-  let psValidator = def
-        & defaultSorting [SortAscBy "type", SortAscBy "path"]
+  let psValidator = def & defaultSorting [SortAscBy "type", SortAscBy "path"]
   (Any hasFiles, fileTable) <- runDB $ dbTable psValidator DBTable
     { dbtSQLQuery = fileData
     , dbtRowKey = \(_ `E.InnerJoin` file) -> file E.^. FileId
     , dbtColonnade = colonnadeFiles
     , dbtProj = \DBRow{ dbrOutput = dbrOutput@(E.Value fName, _, E.Value fType) }
-                   -> dbrOutput <$ guardM (lift $ (== Authorized) <$> evalAccessDB (CSheetR tid ssh csh shn $ SFileR fType fName) False)
+                   -> guardAuthorizedFor (CSheetR tid ssh csh shn $ SFileR fType fName) dbrOutput
     , dbtStyle = def
     , dbtFilter = mempty
     , dbtFilterUI = mempty
@@ -399,34 +398,24 @@ postSPseudonymR tid ssh csh shn = do
 
 
 getSFileR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> SheetFileType -> FilePath -> Handler TypedContent
-getSFileR tid ssh csh shn typ title = do
-  results <- runDB $ E.select $ E.from $
-    \(course `E.InnerJoin` sheet `E.InnerJoin` sheetFile `E.InnerJoin` file) -> do
-      -- Restrict to consistent rows that correspond to each other
-      E.on (file      E.^. FileId         E.==. sheetFile E.^. SheetFileFile)
-      E.on (sheetFile E.^. SheetFileSheet E.==. sheet     E.^. SheetId)
-      E.on (sheet     E.^. SheetCourse    E.==. course    E.^. CourseId)
-      -- filter to requested file
-      E.where_ ((file      E.^. FileTitle       E.==. E.val title)
-        E.&&.   (sheetFile E.^. SheetFileType   E.==. E.val typ  )
-        E.&&.   (sheet     E.^. SheetName       E.==. E.val shn  )
-        E.&&.   (course    E.^. CourseShorthand E.==. E.val csh  )
-        E.&&.   (course    E.^. CourseSchool    E.==. E.val ssh  )
-        E.&&.   (course    E.^. CourseTerm      E.==. E.val tid  )
-        )
-      -- return desired columns
-      return $ (file E.^. FileTitle, file E.^. FileContent)
-  case results of
-    [(E.Value fileTitle, E.Value fileContent)]
-      | Just fileContent' <- fileContent -> do
-          whenM downloadFiles $
-            addHeader "Content-Disposition" [st|attachment; filename="#{takeFileName fileTitle}"|]
-          return $ TypedContent (defaultMimeLookup (pack fileTitle) <> "; charset=utf-8") (toContent fileContent')
-      | otherwise -> sendResponseStatus noContent204 ()
-    [] -> notFound
-    other -> do
-      $logErrorS "SFileR" $ "Multiple matching files: " <> tshow other
-      error "Multiple matching files found."
+getSFileR tid ssh csh shn typ title = serveOneFile fileQuery
+  where
+    fileQuery = E.select $ E.from $
+       \(course `E.InnerJoin` sheet `E.InnerJoin` sheetFile `E.InnerJoin` file) -> do
+        -- Restrict to consistent rows that correspond to each other
+        E.on (file      E.^. FileId         E.==. sheetFile E.^. SheetFileFile)
+        E.on (sheetFile E.^. SheetFileSheet E.==. sheet     E.^. SheetId)
+        E.on (sheet     E.^. SheetCourse    E.==. course    E.^. CourseId)
+        -- filter to requested file
+        E.where_ ((file      E.^. FileTitle       E.==. E.val title)
+          E.&&.   (sheetFile E.^. SheetFileType   E.==. E.val typ  )
+          E.&&.   (sheet     E.^. SheetName       E.==. E.val shn  )
+          E.&&.   (course    E.^. CourseShorthand E.==. E.val csh  )
+          E.&&.   (course    E.^. CourseSchool    E.==. E.val ssh  )
+          E.&&.   (course    E.^. CourseTerm      E.==. E.val tid  )
+          )
+        -- return file entity
+        return file
 
 getSheetNewR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getSheetNewR tid ssh csh = do
diff --git a/src/Handler/Utils.hs b/src/Handler/Utils.hs
index 46c4e8631..dfca11b4c 100644
--- a/src/Handler/Utils.hs
+++ b/src/Handler/Utils.hs
@@ -30,7 +30,9 @@ import Handler.Utils.Sheet      as Handler.Utils
 import Handler.Utils.Mail       as Handler.Utils
 
 import System.Directory (listDirectory)
-import System.FilePath.Posix (takeBaseName)
+import System.FilePath.Posix (takeBaseName, takeFileName)
+
+import Network.Mime
 
 import qualified Data.List as List
 import qualified Data.List.NonEmpty as NonEmpty
@@ -45,6 +47,22 @@ downloadFiles = do
       UserDefaultConf{..} <- getsYesod $ view _appUserDefaults
       return userDefaultDownloadFiles
 
+-- | Serve a single file, identified through a given DB query
+serveOneFile :: DB [Entity File] -> Handler TypedContent
+serveOneFile query = do
+  results <- runDB query
+  case results of
+    [(Entity _fileId File{fileTitle, fileContent})]
+      | Just fileContent' <- fileContent -> do
+          whenM downloadFiles $
+            addHeader "Content-Disposition" [st|attachment; filename="#{takeFileName fileTitle}"|]
+          return $ TypedContent (defaultMimeLookup (pack fileTitle) <> "; charset=utf-8") (toContent fileContent')
+      | otherwise -> sendResponseStatus noContent204 ()
+    [] -> notFound
+    other -> do
+      $logErrorS "SFileR" $ "Multiple matching files: " <> tshow other
+      error "Multiple matching files found."
+
 tidFromText :: Text -> Maybe TermId
 tidFromText = fmap TermKey . maybeRight . termFromText
 
@@ -171,3 +189,12 @@ i18nWidgetFile basename = do
                 | l <- unpack <$> NonEmpty.toList availableTranslations' -- One function definition for every available language
                 ] ++ [ clause [wildP] (normalB [e| error "selectLanguage returned an invalid translation" |]) [] ] -- Fallback mostly there so compiler does not complain about non-exhaustive pattern match
     ] [e|selectLanguage availableTranslations' >>= $(varE ws)|]
+
+
+
+-- | return a value only if the current user ist authorized for a given route
+guardAuthorizedFor :: ( HandlerSite h ~ UniWorX, MonadHandler h, MonadLogger h
+                      , MonadTrans m, MonadPlus (m (ReaderT SqlBackend h)))
+  => Route UniWorX -> a -> m (ReaderT SqlBackend h) a
+guardAuthorizedFor link val =
+  val <$ guardM (lift $ (== Authorized) <$> evalAccessDB link False)
diff --git a/src/Handler/Utils/Table/Columns.hs b/src/Handler/Utils/Table/Columns.hs
index 25279fb96..f3be69490 100644
--- a/src/Handler/Utils/Table/Columns.hs
+++ b/src/Handler/Utils/Table/Columns.hs
@@ -34,6 +34,49 @@ import Handler.Utils.Table.Cells
 --  * additional helper, such as default sorting
 
 
+
+---------------
+-- Files
+
+-- | Generic column for links to FilePaths, where the link depends on the entire table row
+colFilePath :: (IsDBTable m c) => (t -> E.Value FilePath) -> (t -> Route UniWorX) -> Colonnade Sortable t  (DBCell m c)
+colFilePath row2path row2link = sortable (Just "path") (i18nCell MsgFileTitle) makeCell
+  where
+    makeCell row =
+      let filePath = E.unValue $ row2path row
+          link     = row2link row
+      in  anchorCell link $ str2widget filePath
+
+-- | Generic column for links to FilePaths, where the link only depends on the FilePath itself
+colFilePathSimple :: (IsDBTable m c) => (t -> E.Value FilePath) -> (FilePath -> Route UniWorX) -> Colonnade Sortable t  (DBCell m c)
+colFilePathSimple row2path row2link = sortable (Just "path") (i18nCell MsgFileTitle) makeCell
+  where
+    makeCell row =
+      let filePath = E.unValue $ row2path row
+          link     = row2link filePath
+      in  anchorCell link $ str2widget filePath
+
+-- | Generic column for File Modification
+colFileModification :: (IsDBTable m c) => (t -> E.Value UTCTime) -> Colonnade Sortable t  (DBCell m c)
+colFileModification row2time = sortable (Just "time") (i18nCell MsgFileModified) (timeCell . E.unValue . row2time)
+
+-- sortFilePath :: IsString a => (t -> E.SqlExpr (Entity ???)) -> (a, SortColumn t)
+sortFilePath :: (PersistField a2, IsString a1) =>
+                      (t -> E.SqlExpr (E.Value a2)) -> (a1, SortColumn t)
+sortFilePath queryPath = ("path", SortColumn queryPath)
+
+sortFileModification :: (PersistField a2, IsString a1) =>
+                              (t -> E.SqlExpr (E.Value a2)) -> (a1, SortColumn t)
+sortFileModification queryModification = ("time", SortColumn queryModification)
+
+defaultSortingByFileTitle :: PSValidator m x -> PSValidator m x
+defaultSortingByFileTitle = defaultSorting [SortAscBy "path"]
+
+defaultSortingByFileModification :: PSValidator m x -> PSValidator m x
+defaultSortingByFileModification = defaultSorting [SortAscBy "time"]
+
+
+
 ---------------
 -- User names
 

From 78dbe604aab2f92be94d787d46340b3281d904c8 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Thu, 2 May 2019 23:20:18 +0200
Subject: [PATCH 200/238] disable reactive button js util

---
 static/js/utils/form.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index 54c3a430f..4c77f8621 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -106,11 +106,15 @@
     return init();
   };
 
-  formUtilities.push({
-    name: REACTIVE_SUBMIT_BUTTON_UTIL_NAME,
-    selector: REACTIVE_SUBMIT_BUTTON_UTIL_SELECTOR,
-    setup: reactiveSubmitButtonUtil,
-  });
+  // skipping reactiveButtonUtil (for now)
+  // the button did not properly re-enable after filling out a form for some safari users.
+  // if maybe in the future there is going to be a proper way of (asynchronously) and
+  // meaningfully validating forms this can be re-activated by commenting in the next few lines
+  // formUtilities.push({
+  //   name: REACTIVE_SUBMIT_BUTTON_UTIL_NAME,
+  //   selector: REACTIVE_SUBMIT_BUTTON_UTIL_SELECTOR,
+  //   setup: reactiveSubmitButtonUtil,
+  // });
 
   /**
    *

From 126381a409541503e60ad848a010ff42ab4521be Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Fri, 3 May 2019 08:27:11 +0200
Subject: [PATCH 201/238] fix db columns for files

---
 src/Handler/Material.hs            |  4 ++--
 src/Handler/Utils/Table/Columns.hs | 11 ++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index 528e06d84..cf5c46aca 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -127,8 +127,8 @@ getMShowR tid ssh csh mnm = do
       , dbtFilterUI = mempty
       , dbtIdent    = "material-files" :: Text
       , dbtSorting  = Map.fromList
-            [ sortFilePath         $ $(sqlIJproj 2 2) E.^. FileTitle
-            , sortFileModification $ $(sqlIJproj 2 2) E.^. FileModified
+            [ sortFilePath         $(sqlIJproj 2 2)
+            , sortFileModification $(sqlIJproj 2 2)
             ]
       }
 
diff --git a/src/Handler/Utils/Table/Columns.hs b/src/Handler/Utils/Table/Columns.hs
index f3be69490..30d2e6a4a 100644
--- a/src/Handler/Utils/Table/Columns.hs
+++ b/src/Handler/Utils/Table/Columns.hs
@@ -60,14 +60,11 @@ colFilePathSimple row2path row2link = sortable (Just "path") (i18nCell MsgFileTi
 colFileModification :: (IsDBTable m c) => (t -> E.Value UTCTime) -> Colonnade Sortable t  (DBCell m c)
 colFileModification row2time = sortable (Just "time") (i18nCell MsgFileModified) (timeCell . E.unValue . row2time)
 
--- sortFilePath :: IsString a => (t -> E.SqlExpr (Entity ???)) -> (a, SortColumn t)
-sortFilePath :: (PersistField a2, IsString a1) =>
-                      (t -> E.SqlExpr (E.Value a2)) -> (a1, SortColumn t)
-sortFilePath queryPath = ("path", SortColumn queryPath)
+sortFilePath :: IsString s => (r -> E.SqlExpr (Entity File)) -> (s, SortColumn r)
+sortFilePath queryPath = ("path", SortColumn $ queryPath >>> (E.^. FileTitle))
 
-sortFileModification :: (PersistField a2, IsString a1) =>
-                              (t -> E.SqlExpr (E.Value a2)) -> (a1, SortColumn t)
-sortFileModification queryModification = ("time", SortColumn queryModification)
+sortFileModification :: IsString s => (r -> E.SqlExpr (Entity File)) -> (s, SortColumn r)
+sortFileModification queryModification = ("time", SortColumn $ queryModification >>> (E.^. FileModified))
 
 defaultSortingByFileTitle :: PSValidator m x -> PSValidator m x
 defaultSortingByFileTitle = defaultSorting [SortAscBy "path"]

From af2970735961763354aaf927fdf8c6f9112d578d Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Fri, 3 May 2019 09:02:41 +0200
Subject: [PATCH 202/238] workaround: no get method for course registration

---
 messages/uniworx/de.msg |  2 ++
 routes                  |  2 +-
 src/Handler/Course.hs   | 17 +++++++++++++++--
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 4b8c7f201..75c9609d5 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -24,6 +24,7 @@ RegisteredSince date@Text: Angemeldet seit #{date}
 RegisterFrom: Anmeldungen von
 RegisterTo: Anmeldungen bis
 DeRegUntil: Abmeldungen bis
+RegisterRetry: Sie wurden noch nicht angemeldet. Drücken Sie dazu den Knopf "Anmelden"
 
 GenericKey: Schlüssel
 GenericShort: Kürzel
@@ -454,6 +455,7 @@ LDAPLoginTitle: Campus-Login
 PWHashLoginTitle: Uni2work-Login
 PWHashLoginNote: Dieses Formular ist zu verwenden, wenn Sie vom Uni2work-Team spezielle Logindaten erhalten haben. Normale Nutzer melden sich bitte via Campus-Login an!
 DummyLoginTitle: Development-Login
+LoginNecessary: Bitte melden Sie sich dazu vorher an!
 
 CorrectorNormal: Normal
 CorrectorMissing: Abwesend
diff --git a/routes b/routes
index dd82ed43b..d77ccbf04 100644
--- a/routes
+++ b/routes
@@ -78,7 +78,7 @@
 !/course/new                CourseNewR        GET POST        !lecturer
 /course/#TermId/#SchoolId/#CourseShorthand CourseR          !lecturer:
   /                           CShowR          GET             !free
-  /register                   CRegisterR          POST        !timeANDcapacity
+  /register                   CRegisterR      GET POST        !timeANDcapacity
   /edit                       CEditR          GET POST
   /lecturer-invite/#UserEmail CLecInviteR     GET POST
   /delete                     CDeleteR        GET POST        !lecturerANDempty
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 339349e73..13da90fbf 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -390,7 +390,7 @@ getCShowR tid ssh csh = do
     tutorialDBTableValidator = def
       & defaultSorting [SortAscBy "type", SortAscBy "name"]
   (Any hasTutorials, tutorialTable) <- runDB $ dbTable tutorialDBTableValidator tutorialDBTable
-  
+
   siteLayout (toWgt $ courseName course) $ do
     setTitleI $ prependCourseTitle tid ssh csh (""::Text)
     $(widgetFile "course")
@@ -429,6 +429,19 @@ registerForm loggedin participant defSFid msecret = identifyForm FIDcourseRegist
     isRegistered = isJust participant
 
 
+-- | Workaround for klicking register button without being logged in.
+-- After log in, the user sees a "get request not supported" error.
+getCRegisterR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
+getCRegisterR tid ssh csh = do
+  muid <- maybeAuthId
+  case muid of
+    Nothing -> addMessageI Info MsgLoginNecessary
+    (Just uid) -> runDB $ do
+      cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
+      registration <- getBy (UniqueParticipant uid cid)
+      when (isNothing registration) $ addMessageI Warning MsgRegisterRetry
+  redirect $ CourseR tid ssh csh CShowR
+
 postCRegisterR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 postCRegisterR tid ssh csh = do
   aid <- requireAuthId
@@ -1122,7 +1135,7 @@ postTUsersR tid ssh csh tutn = do
           ]
         addMessageI Success $ MsgTutorialUsersDeregistered nrDel
         redirect $ CTutorialR tid ssh csh tutn TUsersR
-  
+
   let heading = prependCourseTitle tid ssh csh $ CI.original tutorialName
   siteLayoutMsg heading $ do
     setTitleI heading

From e0c9f4987a398e07ee1cfe6ea28844902e7b3ad4 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Fri, 3 May 2019 12:55:46 +0200
Subject: [PATCH 203/238] Showing material implemented, missing overview

---
 messages/uniworx/de.msg        |  4 +++
 src/Foundation.hs              |  1 +
 src/Handler/Material.hs        | 51 ++++++++++++++++++++--------------
 src/Handler/Sheet.hs           |  2 +-
 src/Utils.hs                   | 10 +++++--
 templates/material-show.hamlet | 22 +++++++++++++++
 6 files changed, 66 insertions(+), 24 deletions(-)
 create mode 100644 templates/material-show.hamlet

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index ef6ce57ae..e77dd2055 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -217,7 +217,10 @@ MaterialTypeExample: Beispiel
 MaterialDescription: Beschreibung
 MaterialVisibleFrom: Sichtbar für Teilnehmer ab
 MaterialVisibleFromTip: Ohne Datum nie sichtbar für Teilnehmer; leer lassen ist nur sinnvoll für unfertige Materialien oder zur ausschließlichen Verteilung an Korrektoren
+MaterialInvisible: Dieses Material ist für Teilnehmer momentan unsichtbar!
+MaterialInvisibleUntil date@Text: Dieses Material ist für Teilnehmer momentan unsichtbar bis #{date}!
 MaterialFiles: Dateien
+MaterialHeading materialName@MaterialName: Material #{materialName}
 MaterialNewHeading: Neues Material veröffentlichen
 MaterialNewTitle: Neues Material
 MaterialEditHeading materialName@MaterialName: Material "#{materialName}" editieren
@@ -390,6 +393,7 @@ Pseudonyms: Pseudonyme
 
 FileTitle: Dateiname
 FileModified: Letzte Änderung
+VisibleFrom: Veröffentlicht
 
 
 Corrected: Korrigiert
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 46e176a19..150792300 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -2027,6 +2027,7 @@ pageHeading (CourseR tid ssh csh SheetNewR)
   = Just $ i18nHeading $ MsgSheetNewHeading tid ssh csh
 pageHeading (CSheetR tid ssh csh shn SShowR)
   = Just $ i18nHeading $ MsgSheetTitle tid ssh csh shn
+  -- = Just $ i18nHeading $ prependCourseTitle tid ssh csh $ SomeMessage shn -- TODO: for consistency use prependCourseTitle throughout ERROR: circularity
 pageHeading (CSheetR tid ssh csh shn SEditR)
   = Just $ i18nHeading $ MsgSheetEditHead tid ssh csh shn
 pageHeading (CSheetR tid ssh csh shn SDelR)
diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index cf5c46aca..e7ce5134c 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -2,6 +2,7 @@ module Handler.Material where
 
 import Import
 
+import Data.Monoid (Any(..))
 import Data.Set (Set)
 import qualified Data.Set as Set
 -- import Data.Map (Map)
@@ -64,17 +65,17 @@ makeMaterialForm cid template = identifyForm FIDmaterial $ \html -> do
       <*> aopt (multiFileField oldFileIds)
                               (fslI MsgMaterialFiles)        (mfFiles <$> template)
 
-fetchMaterial :: TermId -> SchoolId -> CourseShorthand -> MaterialName -> DB (CourseId, Entity Material)
+fetchMaterial :: TermId -> SchoolId -> CourseShorthand -> MaterialName -> DB (Entity Material)
 fetchMaterial tid ssh csh mnm = do
-  [(E.Value cid, matEnt)] <- E.select . E.from  $ -- uniqueness guaranteed by DB constraints
+  [matEnt] <- E.select . E.from  $ -- uniqueness guaranteed by DB constraints
     \(course `E.InnerJoin` material) -> do
       E.on     $ course   E.^. CourseId   E.==.   material E.^. MaterialCourse
       E.where_ $ course   E.^. CourseTerm      E.==. E.val tid
           E.&&.  course   E.^. CourseSchool    E.==. E.val ssh
           E.&&.  course   E.^. CourseShorthand E.==. E.val csh
           E.&&.  material E.^. MaterialName    E.==. E.val mnm
-      return (course E.^. CourseId, material)
-  return (cid, matEnt)
+      return material
+  return matEnt
 
 
 getMaterialListR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
@@ -103,10 +104,11 @@ getMShowR :: TermId -> SchoolId -> CourseShorthand -> MaterialName -> Handler Ht
 getMShowR tid ssh csh mnm = do
   let matLink :: FilePath -> Route UniWorX
       matLink = CourseR tid ssh csh . MaterialR mnm . MFileR
-  _ <- runDB $ do
-    (cid, matEnt) <- fetchMaterial tid ssh csh mnm
+  ( (Entity _mid material@Material{materialType, materialDescription})
+    , (Any hasFiles,fileTable)) <- runDB $ do
+    matEnt <- fetchMaterial tid ssh csh mnm
     let psValidator = def & defaultSortingByFileTitle
-    dbTable psValidator DBTable
+    fileTable' <- dbTable psValidator DBTable
       { dbtSQLQuery = \(matFile `E.InnerJoin` file) -> do
             E.on     $ matFile E.^. MaterialFileFile     E.==. file E.^. FileId
             E.where_ $ matFile E.^. MaterialFileMaterial E.==. E.val (entityKey matEnt)
@@ -131,27 +133,34 @@ getMShowR tid ssh csh mnm = do
             , sortFileModification $(sqlIJproj 2 2)
             ]
       }
+    return (matEnt,fileTable')
+
+  now <- liftIO $ getCurrentTime
+  materialLastEdit    <-           formatTime SelFormatDateTime  $ materialLastEdit    material
+  let matVisFro = materialVisibleFrom material
+  materialVisibleFrom <- traverse (formatTime SelFormatDateTime) matVisFro
+  when (NTop matVisFro >= NTop (Just now)) $ addMessageI Warning $
+    maybe MsgMaterialInvisible MsgMaterialInvisibleUntil materialVisibleFrom
+
+  let headingLong  = prependCourseTitle tid ssh csh $ MsgMaterialHeading mnm
+      headingShort = prependCourseTitle tid ssh csh $ SomeMessage mnm
+
+  siteLayoutMsg headingLong $ do
+    setTitleI headingShort
+    $(widgetFile "material-show")
 
-  -- DEAD CODE TO DELETE:
-  -- (cid, Entity mid Material{..}, files) <- runDB $ do
-  --   (cid, matEnt) <- fetchMaterial tid ssh csh mnm
-  --   fileIds <- E.select . E.from $ \(matFile `E.InnerJoin` file) -> do
-  --     E.on     $ matFile  E.^. MaterialFileFile     E.==. file E.^. FileId
-  --     E.where_ $ matFile  E.^. MaterialFileMaterial E.==. E.val (entityKey matEnt)
-  --     return $ file E.^. FileId
-  --   return (cid, matEnt, (Left . E.unValue) <$> fileIds)
-  error "unimplemented" -- TODO
 
 getMEditR, postMEditR :: TermId -> SchoolId -> CourseShorthand -> MaterialName -> Handler Html
 getMEditR = postMEditR
 postMEditR tid ssh csh mnm = do
-  (cid, Entity mid Material{..}, files) <- runDB $ do
-    (cid, matEnt) <- fetchMaterial tid ssh csh mnm
+  (Entity mid Material{..}, files) <- runDB $ do
+    matEnt <- fetchMaterial tid ssh csh mnm
     fileIds <- E.select . E.from $ \(matFile `E.InnerJoin` file) -> do
       E.on     $ matFile  E.^. MaterialFileFile     E.==. file E.^. FileId
       E.where_ $ matFile  E.^. MaterialFileMaterial E.==. E.val (entityKey matEnt)
       return $ file E.^. FileId
-    return (cid, matEnt, (Left . E.unValue) <$> fileIds)
+    return (matEnt, (Left . E.unValue) <$> fileIds)
+  -- let cid = materialCourse
   let template = Just $ MaterialForm
         { mfName         = materialName
         , mfType         = materialType
@@ -159,7 +168,7 @@ postMEditR tid ssh csh mnm = do
         , mfVisibleFrom  = materialVisibleFrom
         , mfFiles        = Just $ yieldMany files
         }
-  editWidget <- handleMaterialEdit tid ssh csh cid template $ uniqueReplace mid
+  editWidget <- handleMaterialEdit tid ssh csh materialCourse template $ uniqueReplace mid
   let headingLong  = prependCourseTitle tid ssh csh $ MsgMaterialEditHeading mnm
       headingShort = prependCourseTitle tid ssh csh $ MsgMaterialEditTitle   mnm
   siteLayoutMsg headingLong $ do
@@ -231,7 +240,7 @@ handleMaterialEdit tid ssh csh cid template dbMaterial = do
 getMDelR, postMDelR :: TermId -> SchoolId -> CourseShorthand ->  MaterialName -> Handler Html
 getMDelR = postMDelR
 postMDelR tid ssh csh mnm = do
-  (_cid, _matEnt) <- runDB $ fetchMaterial tid ssh csh mnm
+  _matEnt <- runDB $ fetchMaterial tid ssh csh mnm
   error "todo" -- CONTINUE HERE
   {-
   deleteR DeleteRoute
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 0ca8a2698..5d8d7c634 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -364,7 +364,7 @@ getSShowR tid ssh csh shn = do
         , formSubmit = FormNoSubmit
         }
   defaultLayout $ do
-    setTitleI $ MsgSheetTitle tid ssh csh shn
+    setTitleI $ prependCourseTitle tid ssh csh $ SomeMessage shn
     sheetFrom    <-           formatTime SelFormatDateTime  $ sheetActiveFrom   sheet
     sheetTo      <-           formatTime SelFormatDateTime  $ sheetActiveTo     sheet
     hintsFrom    <- traverse (formatTime SelFormatDateTime) $ sheetHintFrom     sheet
diff --git a/src/Utils.hs b/src/Utils.hs
index 2db129c24..57f7d2cc2 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -159,12 +159,18 @@ isNew False = mempty
 
 -- DEPRECATED: use hasTickmark instead;
 -- maybe reinstate if needed for @bewertung.txt@ files
-
 -- tickmark :: IsString a => a
 -- tickmark = fromString "✔"
 
+-- | Convert text as it is to Html, may prevent ambiguous types
+-- This function definition is mainly for documentation purposes
 text2Html :: Text -> Html
-text2Html = toHtml -- prevents ambiguous types
+text2Html = toHtml
+
+-- | Convert text as it is to Message, may prevent ambiguous types
+-- This function definition is mainly for documentation purposes
+text2message :: Text -> SomeMessage site
+text2message = SomeMessage
 
 toWgt :: (ToMarkup a, MonadBaseControl IO m, MonadThrow m, MonadIO m)
       => a -> WidgetT site m ()
diff --git a/templates/material-show.hamlet b/templates/material-show.hamlet
new file mode 100644
index 000000000..cd8daa63c
--- /dev/null
+++ b/templates/material-show.hamlet
@@ -0,0 +1,22 @@
+$newline never
+$maybe descr <- materialDescription
+  <section>
+    <h2 #description>_{MsgMaterialDescription}
+    <p>
+      #{descr}
+
+<section>
+  <dl .deflist>
+    $maybe matKind <- materialType
+      <dt .deflist__dt>_{MsgMaterialType}
+      <dd .deflist__dd>#{matKind}
+    $maybe matVisible <- materialVisibleFrom
+      <dt .deflist__dt>_{MsgVisibleFrom}
+      <dd .deflist__dd>#{matVisible}
+    <dt .deflist__dt>_{MsgFileModified}
+    <dd .deflist__dd>#{materialLastEdit}
+
+$if hasFiles
+  <section>
+    <h2>_{MsgMaterialFiles}
+    ^{fileTable}

From d2546745dad6ea7de47de96874ba5397b0a6a8fd Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Fri, 3 May 2019 14:39:16 +0200
Subject: [PATCH 204/238] Workaround: hasFiles material-show not working

---
 messages/uniworx/de.msg               |  1 +
 src/Database/Esqueleto/Utils.hs       | 10 +++++-----
 src/Handler/Material.hs               | 17 +++++++++++++----
 src/Handler/Sheet.hs                  |  2 +-
 src/Handler/Utils/Table/Cells.hs      |  1 +
 src/Handler/Utils/Table/Columns.hs    | 13 +++++++++++--
 src/Handler/Utils/Table/Pagination.hs |  2 +-
 templates/material-list.hamlet        |  2 ++
 templates/material-show.hamlet        |  2 +-
 9 files changed, 36 insertions(+), 14 deletions(-)
 create mode 100644 templates/material-list.hamlet

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index e77dd2055..7873810fe 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -221,6 +221,7 @@ MaterialInvisible: Dieses Material ist für Teilnehmer momentan unsichtbar!
 MaterialInvisibleUntil date@Text: Dieses Material ist für Teilnehmer momentan unsichtbar bis #{date}!
 MaterialFiles: Dateien
 MaterialHeading materialName@MaterialName: Material #{materialName}
+MaterialListHeading: Materialien
 MaterialNewHeading: Neues Material veröffentlichen
 MaterialNewTitle: Neues Material
 MaterialEditHeading materialName@MaterialName: Material "#{materialName}" editieren
diff --git a/src/Database/Esqueleto/Utils.hs b/src/Database/Esqueleto/Utils.hs
index 6c89e6c96..32eed0a58 100644
--- a/src/Database/Esqueleto/Utils.hs
+++ b/src/Database/Esqueleto/Utils.hs
@@ -18,9 +18,9 @@ import Database.Esqueleto.Utils.TH
 
 
 --
--- Description : Convenience for using @Esqueleto@,
+-- Description : Convenience for using `Esqueleto`,
 --               intended to be imported qualified
---               just like Esqueleto
+--               just like @Esqueleto@
 
 
 -- ezero = E.val (0 :: Int64)
@@ -43,13 +43,13 @@ hasInfix :: (E.Esqueleto query expr backend, E.SqlString s2) =>
 hasInfix = flip isInfixOf
 
 -- | Given a test and a set of values, check whether anyone succeeds the test
---   WARNING: SQL leaves it explicitely unspecified whether || is short curcuited (i.e. lazily evaluated)
+--   WARNING: SQL leaves it explicitely unspecified whether `||` is short curcuited (i.e. lazily evaluated)
 any :: Foldable f =>
   (a -> E.SqlExpr (E.Value Bool)) -> f a -> E.SqlExpr (E.Value Bool)
 any test = F.foldr (\needle acc -> acc E.||. test needle) false
 
 -- | Given a test and a set of values, check whether all succeeds the test
---   WARNING: SQL leaves it explicitely unspecified whether && is short curcuited (i.e. lazily evaluated)
+--   WARNING: SQL leaves it explicitely unspecified whether `&&` is short curcuited (i.e. lazily evaluated)
 all :: Foldable f =>
   (a -> E.SqlExpr (E.Value Bool)) -> f a -> E.SqlExpr (E.Value Bool)
 all test = F.foldr (\needle acc -> acc E.&&. test needle) true
@@ -81,7 +81,7 @@ mkExactFilter :: (PersistField a)
   -> E.SqlExpr (E.Value Bool)
 mkExactFilter = mkExactFilterWith id
 
--- | like @mkExactFiler@ but allows for conversion; convenient in conjunction with @anyFilter@ and @allFilter@
+-- | like `mkExactFiler` but allows for conversion; convenient in conjunction with `anyFilter` and `allFilter`
 mkExactFilterWith :: (PersistField b)
   => (a -> b)                      -- ^ type conversion
   -> (t -> E.SqlExpr (E.Value b))  -- ^ getter from query to searched element
diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index e7ce5134c..29b3a0792 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -79,7 +79,16 @@ fetchMaterial tid ssh csh mnm = do
 
 
 getMaterialListR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
-getMaterialListR = error "unimplemented" -- TODO
+getMaterialListR _tid _ssh _csh = do
+  -- muid <- maybeAuthId
+  -- cid  <- runDB . getKeyBy404 $ TermSchoolCourseShort tid ssh csh
+  -- table <- return $ error "unimplemented" -- TODO
+  -- let headingLong  = prependCourseTitle tid ssh csh $ MsgMaterialListHeading
+  --     headingShort = prependCourseTitle tid ssh csh $ MsgMaterialListHeading
+  -- siteLayoutMsg headingLong $ do
+  --   setTitleI headingShort
+  --   $(widgetFile "material-list")
+  error "unimplemented" -- TODO
 
 getMFileR :: TermId -> SchoolId -> CourseShorthand -> MaterialName -> FilePath -> Handler TypedContent
 getMFileR tid ssh csh mnm title = serveOneFile fileQuery
@@ -116,7 +125,8 @@ getMShowR tid ssh csh mnm = do
             return (file E.^. FileTitle, file E.^. FileModified)
       , dbtRowKey = \(_ `E.InnerJoin` file) -> file E.^. FileId
       , dbtColonnade = widgetColonnade $ mconcat
-            [ colFilePathSimple   (view _1) matLink
+            [ -- dbRowIndicator -- important: contains writer to indicate that the tables is not empty
+              colFilePathSimple   (view _1) matLink
             , colFileModification (view _2)
             ]
       , dbtProj = \row ->
@@ -135,16 +145,15 @@ getMShowR tid ssh csh mnm = do
       }
     return (matEnt,fileTable')
 
+  let matVisFro = materialVisibleFrom material
   now <- liftIO $ getCurrentTime
   materialLastEdit    <-           formatTime SelFormatDateTime  $ materialLastEdit    material
-  let matVisFro = materialVisibleFrom material
   materialVisibleFrom <- traverse (formatTime SelFormatDateTime) matVisFro
   when (NTop matVisFro >= NTop (Just now)) $ addMessageI Warning $
     maybe MsgMaterialInvisible MsgMaterialInvisibleUntil materialVisibleFrom
 
   let headingLong  = prependCourseTitle tid ssh csh $ MsgMaterialHeading mnm
       headingShort = prependCourseTitle tid ssh csh $ SomeMessage mnm
-
   siteLayoutMsg headingLong $ do
     setTitleI headingShort
     $(widgetFile "material-show")
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 5d8d7c634..449c906c2 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -154,7 +154,7 @@ getSheetOldUnassigned tid ssh csh = runDB $ do
 getSheetListR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getSheetListR tid ssh csh = do
   muid <- maybeAuthId
-  Entity cid _ <- runDB . getBy404 $ TermSchoolCourseShort tid ssh csh
+  cid <- runDB . getKeyBy404 $ TermSchoolCourseShort tid ssh csh
   let
     lastSheetEdit sheet = E.sub_select . E.from $ \sheetEdit -> do
         E.where_ $ sheetEdit E.^. SheetEditSheet E.==. sheet E.^. SheetId
diff --git a/src/Handler/Utils/Table/Cells.hs b/src/Handler/Utils/Table/Cells.hs
index 28b3df6b2..e01f9115a 100644
--- a/src/Handler/Utils/Table/Cells.hs
+++ b/src/Handler/Utils/Table/Cells.hs
@@ -49,6 +49,7 @@ pathPieceCell = cell . toWidget . toPathPiece
 sqlCell :: (IsDBTable (YesodDB UniWorX) a) => YesodDB UniWorX Widget -> DBCell (YesodDB UniWorX) a
 sqlCell act = mempty & cellContents .~ lift act
 
+-- Recfor line numbers, use dbRow
 
 ---------------------
 -- Icon cells
diff --git a/src/Handler/Utils/Table/Columns.hs b/src/Handler/Utils/Table/Columns.hs
index 30d2e6a4a..d31f6365f 100644
--- a/src/Handler/Utils/Table/Columns.hs
+++ b/src/Handler/Utils/Table/Columns.hs
@@ -11,6 +11,7 @@ import Import
 
 -- import Text.Blaze (ToMarkup(..))
 
+import Data.Monoid (Any(..))
 import qualified Database.Esqueleto as E
 import Database.Esqueleto.Utils as E
 
@@ -34,6 +35,14 @@ import Handler.Utils.Table.Cells
 --  * additional helper, such as default sorting
 
 
+-----------------------
+-- Numbers and Indices
+
+-- | Simple index column, also indicating whether there is a row at all
+-- For a version without indication, use `Handler.Utils.Pagination.dbRow` instead.
+dbRowIndicator :: IsDBTable m Any => Colonnade Sortable (DBRow r) (DBCell m Any)
+dbRowIndicator = sortable Nothing (i18nCell MsgNrColumn) $ \DBRow{ dbrIndex } ->  tellCell (Any True) $ textCell $ tshow dbrIndex
+
 
 ---------------
 -- Files
@@ -48,7 +57,7 @@ colFilePath row2path row2link = sortable (Just "path") (i18nCell MsgFileTitle) m
       in  anchorCell link $ str2widget filePath
 
 -- | Generic column for links to FilePaths, where the link only depends on the FilePath itself
-colFilePathSimple :: (IsDBTable m c) => (t -> E.Value FilePath) -> (FilePath -> Route UniWorX) -> Colonnade Sortable t  (DBCell m c)
+colFilePathSimple :: (IsDBTable m c) => (t -> E.Value FilePath) -> (FilePath -> Route UniWorX) -> Colonnade Sortable t (DBCell m c)
 colFilePathSimple row2path row2link = sortable (Just "path") (i18nCell MsgFileTitle) makeCell
   where
     makeCell row =
@@ -57,7 +66,7 @@ colFilePathSimple row2path row2link = sortable (Just "path") (i18nCell MsgFileTi
       in  anchorCell link $ str2widget filePath
 
 -- | Generic column for File Modification
-colFileModification :: (IsDBTable m c) => (t -> E.Value UTCTime) -> Colonnade Sortable t  (DBCell m c)
+colFileModification :: (IsDBTable m c) => (t -> E.Value UTCTime) -> Colonnade Sortable t (DBCell m c)
 colFileModification row2time = sortable (Just "time") (i18nCell MsgFileModified) (timeCell . E.unValue . row2time)
 
 sortFilePath :: IsString s => (r -> E.SqlExpr (Entity File)) -> (s, SortColumn r)
diff --git a/src/Handler/Utils/Table/Pagination.hs b/src/Handler/Utils/Table/Pagination.hs
index ce39f6300..6caaebca0 100644
--- a/src/Handler/Utils/Table/Pagination.hs
+++ b/src/Handler/Utils/Table/Pagination.hs
@@ -910,7 +910,7 @@ formCell formCellLens genIndex genForm input@(DBRow{dbrKey}) = FormCell
 
 -- Predefined colonnades
 
---Number column?
+-- | Simple number column, also see Handler.Utils.Table.Columns.dbRowIndicator
 dbRow :: forall h r m a. (Headedness h, IsDBTable m a) => Colonnade h (DBRow r) (DBCell m a)
 dbRow = Colonnade.singleton (headednessPure $ i18nCell MsgNrColumn) $ \DBRow{ dbrIndex } -> textCell $ tshow dbrIndex
 
diff --git a/templates/material-list.hamlet b/templates/material-list.hamlet
new file mode 100644
index 000000000..503a88d43
--- /dev/null
+++ b/templates/material-list.hamlet
@@ -0,0 +1,2 @@
+<section>
+  ^{table}
diff --git a/templates/material-show.hamlet b/templates/material-show.hamlet
index cd8daa63c..92dba855e 100644
--- a/templates/material-show.hamlet
+++ b/templates/material-show.hamlet
@@ -16,7 +16,7 @@ $maybe descr <- materialDescription
     <dt .deflist__dt>_{MsgFileModified}
     <dd .deflist__dd>#{materialLastEdit}
 
-$if hasFiles
+$if hasFiles || True
   <section>
     <h2>_{MsgMaterialFiles}
     ^{fileTable}

From dc4ec6148f26accb136a057ef29868f18cf640b7 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Fri, 3 May 2019 17:18:22 +0200
Subject: [PATCH 205/238] Bugfix: MaterialShow empty table indicator working

---
 src/Handler/Material.hs | 60 +++++++++++++++++++++++++++++------------
 1 file changed, 43 insertions(+), 17 deletions(-)

diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index 29b3a0792..483f35671 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -79,16 +79,44 @@ fetchMaterial tid ssh csh mnm = do
 
 
 getMaterialListR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
-getMaterialListR _tid _ssh _csh = do
-  -- muid <- maybeAuthId
-  -- cid  <- runDB . getKeyBy404 $ TermSchoolCourseShort tid ssh csh
-  -- table <- return $ error "unimplemented" -- TODO
-  -- let headingLong  = prependCourseTitle tid ssh csh $ MsgMaterialListHeading
-  --     headingShort = prependCourseTitle tid ssh csh $ MsgMaterialListHeading
-  -- siteLayoutMsg headingLong $ do
-  --   setTitleI headingShort
-  --   $(widgetFile "material-list")
-  error "unimplemented" -- TODO
+getMaterialListR tid ssh csh = do
+  let matLink :: MaterialName -> Route UniWorX
+      matLink = CourseR tid ssh csh . flip MaterialR MShowR
+  _muid <- maybeAuthId
+  table <- runDB $ do
+    cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
+    let psValidator = def & defaultSorting [SortDescBy "last-edit"]
+    table <- dbTableWidget' psValidator DBTable
+      { dbtIdent     = "material-list" :: Text
+      , dbtStyle     = def
+      , dbtParams    = def
+      , dbtSQLQuery  = \material -> do
+            E.where_ $ material E.^. MaterialCourse  E.==.  E.val cid
+            return material
+      , dbtRowKey    = (E.^. MaterialId)
+      , dbtProj      =  \dbr@DBRow{ dbrOutput=(Entity _ Material{..}) } ->
+            let link = matLink materialName
+            in  guardAuthorizedFor link dbr
+      , dbtColonnade = widgetColonnade $ mconcat
+            [ dbRow
+            , sortable (Just "name") (i18nCell MsgMaterialName)
+                $ \DBRow{dbrOutput=(Entity _ Material{..})} -> cell $ toWgt materialName
+            ]
+      , dbtSorting   = const Map.empty -- Map.fromList
+            [
+
+            ]
+      , dbtFilter    = mempty
+      , dbtFilterUI  = mempty
+      }
+    return table
+
+  let headingLong  = prependCourseTitle tid ssh csh $ MsgMaterialListHeading
+      headingShort = prependCourseTitle tid ssh csh $ MsgMaterialListHeading
+  siteLayoutMsg headingLong $ do
+    setTitleI headingShort
+    $(widgetFile "material-list")
+
 
 getMFileR :: TermId -> SchoolId -> CourseShorthand -> MaterialName -> FilePath -> Handler TypedContent
 getMFileR tid ssh csh mnm title = serveOneFile fileQuery
@@ -125,14 +153,12 @@ getMShowR tid ssh csh mnm = do
             return (file E.^. FileTitle, file E.^. FileModified)
       , dbtRowKey = \(_ `E.InnerJoin` file) -> file E.^. FileId
       , dbtColonnade = widgetColonnade $ mconcat
-            [ -- dbRowIndicator -- important: contains writer to indicate that the tables is not empty
-              colFilePathSimple   (view _1) matLink
-            , colFileModification (view _2)
+            [ dbRowIndicator -- important: contains writer to indicate that the tables is not empty
+            , colFilePathSimple   (view $ _dbrOutput . _1) matLink
+            , colFileModification (view $ _dbrOutput . _2)
             ]
-      , dbtProj = \row ->
-            let dbrOutput = row       ^. _dbrOutput
-                fPath     = dbrOutput ^. _1 . _Value
-            in  guardAuthorizedFor (matLink fPath) dbrOutput
+      , dbtProj = \dbr@DBRow{ dbrOutput=(E.Value fPath, _) } ->
+            guardAuthorizedFor (matLink fPath) dbr
       , dbtStyle    = def
       , dbtParams   = def
       , dbtFilter   = mempty

From 3021435350af743f77bc7f6a7f5001fe832a11c3 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Fri, 3 May 2019 18:08:15 +0200
Subject: [PATCH 206/238] Material working; just links and right missing

---
 messages/uniworx/de.msg            |  2 +-
 routes                             |  8 ++++----
 src/Handler/Material.hs            | 25 +++++++++++++++----------
 src/Handler/Utils/Table/Columns.hs |  2 +-
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 7873810fe..37a5523e6 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -220,7 +220,7 @@ MaterialVisibleFromTip: Ohne Datum nie sichtbar für Teilnehmer; leer lassen ist
 MaterialInvisible: Dieses Material ist für Teilnehmer momentan unsichtbar!
 MaterialInvisibleUntil date@Text: Dieses Material ist für Teilnehmer momentan unsichtbar bis #{date}!
 MaterialFiles: Dateien
-MaterialHeading materialName@MaterialName: Material #{materialName}
+MaterialHeading materialName@MaterialName: Material "#{materialName}"
 MaterialListHeading: Materialien
 MaterialNewHeading: Neues Material veröffentlichen
 MaterialNewTitle: Neues Material
diff --git a/routes b/routes
index 135c9baa1..70c4b50d0 100644
--- a/routes
+++ b/routes
@@ -106,13 +106,13 @@
     /pseudonym                  SPseudonymR   GET POST        !registeredANDcorrector-submissions
     /corrector-invite/#UserEmail SCorrInviteR     GET POST
     !/#SheetFileType/*FilePath  SFileR        GET             !timeANDregistered !timeANDmaterials !corrector
-  /mat                          MaterialListR GET             !materials !registered !corrector
-  /mat/new                      MaterialNewR  GET POST
-  /mat/#MaterialName MaterialR:
+  /file                          MaterialListR GET             !materials !registered !corrector
+  /file/new                      MaterialNewR  GET POST
+  /file/#MaterialName MaterialR:
     /edit                       MEditR        GET POST
     /delete                     MDelR         GET POST
     /show                       MShowR        GET             !timeANDregistered !timeANDmaterials !corrector
-    /file/*FilePath             MFileR        GET             !timeANDregistered !timeANDmaterials !corrector
+    /part/*FilePath             MFileR        GET             !timeANDregistered !timeANDmaterials !corrector
 
 
 /subs  CorrectionsR GET POST !corrector !lecturer
diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index 483f35671..07a88b731 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -17,6 +17,7 @@ import Utils.Lens
 import Utils.Form
 import Handler.Utils
 -- import Handler.Utils.Delete
+import Handler.Utils.Table.Cells
 import Handler.Utils.Table.Columns
 
 import Control.Monad.Writer (MonadWriter(..), execWriterT)
@@ -85,7 +86,8 @@ getMaterialListR tid ssh csh = do
   _muid <- maybeAuthId
   table <- runDB $ do
     cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
-    let psValidator = def & defaultSorting [SortDescBy "last-edit"]
+    let row2material = entityVal . dbrOutput -- no inner join, just Entity Material
+        psValidator  = def & defaultSorting [SortDescBy "last-edit"]
     table <- dbTableWidget' psValidator DBTable
       { dbtIdent     = "material-list" :: Text
       , dbtStyle     = def
@@ -94,17 +96,21 @@ getMaterialListR tid ssh csh = do
             E.where_ $ material E.^. MaterialCourse  E.==.  E.val cid
             return material
       , dbtRowKey    = (E.^. MaterialId)
-      , dbtProj      =  \dbr@DBRow{ dbrOutput=(Entity _ Material{..}) } ->
-            let link = matLink materialName
-            in  guardAuthorizedFor link dbr
+      -- , dbtProj      = \dbr -> guardAuthorizedFor (matLink . materialName $ dbr ^. _dbrOutput . _entityVal) dbr
+      , dbtProj      = guardAuthorizedFor =<< matLink . materialName . row2material -- Moand: (a ->)
       , dbtColonnade = widgetColonnade $ mconcat
             [ dbRow
+            , sortable (Just "type") (i18nCell MsgMaterialType)
+                $ foldMap textCell . materialType . row2material
             , sortable (Just "name") (i18nCell MsgMaterialName)
-                $ \DBRow{dbrOutput=(Entity _ Material{..})} -> cell $ toWgt materialName
+                $ liftA2 anchorCell matLink toWgt . materialName . row2material
+            , sortable (Just "last-edit") (i18nCell MsgFileModified)
+                $ dateTimeCell . materialLastEdit . row2material
             ]
-      , dbtSorting   = const Map.empty -- Map.fromList
-            [
-
+      , dbtSorting   = Map.fromList
+            [ ( "type"      , SortColumn (E.^. MaterialType)     )
+            , ( "name"      , SortColumn (E.^. MaterialName)     )
+            , ( "last-edit" , SortColumn (E.^. MaterialLastEdit) )
             ]
       , dbtFilter    = mempty
       , dbtFilterUI  = mempty
@@ -157,8 +163,7 @@ getMShowR tid ssh csh mnm = do
             , colFilePathSimple   (view $ _dbrOutput . _1) matLink
             , colFileModification (view $ _dbrOutput . _2)
             ]
-      , dbtProj = \dbr@DBRow{ dbrOutput=(E.Value fPath, _) } ->
-            guardAuthorizedFor (matLink fPath) dbr
+      , dbtProj = \dbr -> guardAuthorizedFor (matLink $ dbr ^. _dbrOutput . _1 . _Value) dbr
       , dbtStyle    = def
       , dbtParams   = def
       , dbtFilter   = mempty
diff --git a/src/Handler/Utils/Table/Columns.hs b/src/Handler/Utils/Table/Columns.hs
index d31f6365f..1c125344b 100644
--- a/src/Handler/Utils/Table/Columns.hs
+++ b/src/Handler/Utils/Table/Columns.hs
@@ -67,7 +67,7 @@ colFilePathSimple row2path row2link = sortable (Just "path") (i18nCell MsgFileTi
 
 -- | Generic column for File Modification
 colFileModification :: (IsDBTable m c) => (t -> E.Value UTCTime) -> Colonnade Sortable t (DBCell m c)
-colFileModification row2time = sortable (Just "time") (i18nCell MsgFileModified) (timeCell . E.unValue . row2time)
+colFileModification row2time = sortable (Just "time") (i18nCell MsgFileModified) (dateTimeCell . E.unValue . row2time)
 
 sortFilePath :: IsString s => (r -> E.SqlExpr (Entity File)) -> (s, SortColumn r)
 sortFilePath queryPath = ("path", SortColumn $ queryPath >>> (E.^. FileTitle))

From 8c62bdb8607ff96cc03dd76c665448176c31d6a8 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 4 May 2019 11:01:01 +0200
Subject: [PATCH 207/238] more prominent navbar icons

---
 templates/widgets/navbar/navbar.lucius | 36 ++++++++++----------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/templates/widgets/navbar/navbar.lucius b/templates/widgets/navbar/navbar.lucius
index 8dde8fbc5..c80900934 100644
--- a/templates/widgets/navbar/navbar.lucius
+++ b/templates/widgets/navbar/navbar.lucius
@@ -58,11 +58,10 @@
 
 /* links */
 .navbar__link-wrapper {
-  position: relative;
   display: flex;
   flex-direction: column;
   justify-content: flex-end;
-  align-items: flex-start;
+  align-items: center;
   height: 80px;
   min-width: 90px;
   color: var(--color-lightwhite);
@@ -71,14 +70,17 @@
 
   &:hover {
     color: var(--color-lightwhite);
+
+    .navbar__link-icon {
+      opacity: 1;
+    }
   }
 }
 
 .navbar__link-icon {
-  position: absolute;
-  right: 4px;
-  top: 4px;
-  opacity: 0.3;
+  opacity: 0.7;
+  transition: opacity 0.2s ease;
+  margin-bottom: 7px;
 }
 
 .navbar__link-label {
@@ -90,7 +92,7 @@
 @media (min-width: 769px) {
 
   .navbar__link-wrapper {
-    border: 1px solid var(--color-lmu-box-border);
+    border: 1px solid rgba(255, 255, 255, 0.7);
   }
 }
 
@@ -106,6 +108,11 @@
   .navbar__link-label {
     padding: 0 7px;
   }
+
+  .navbar__link-icon {
+    transform: scale(0.65);
+    margin-bottom: 0;
+  }
 }
 
 /* navbar list */
@@ -142,21 +149,6 @@
   &:not(.navbar__list-item--favorite) + .navbar__list-item {
     margin-left: 12px;
   }
-
-  .fas {
-    height: 20px;
-    margin-left: 8px;
-  }
-}
-
-@media (max-width: 768px) {
-
-  .navbar__list-item {
-
-    .fas {
-      margin-left: 0;
-    }
-  }
 }
 
 @media (max-width: 500px) {

From 071d22ee569057cd0b4ace00c482649dc69541df Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Sat, 4 May 2019 13:14:07 +0200
Subject: [PATCH 208/238] time predicate for materials

---
 messages/uniworx/de.msg |   3 +-
 routes                  | 148 ++++++++++++++++++++--------------------
 src/Foundation.hs       |  12 +++-
 3 files changed, 86 insertions(+), 77 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 4586461e8..2ccc7c667 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -171,7 +171,7 @@ SheetInvisibleUntil date@Text: Dieses Übungsblatt ist für Teilnehmer momentan
 SheetName: Name
 SheetDescription: Hinweise für Teilnehmer
 SheetGroup: Gruppenabgabe
-SheetVisibleFrom: Sichtbar für Teilnehmer ab
+SheetVisibleFrom: Verfügbar seit
 SheetVisibleFromTip: Ohne Datum nie sichtbar und keine Abgabe möglich; nur für unfertige Blätter leer lassen, deren Bewertung/Fristen sich noch ändern können
 SheetActiveFrom: Beginn Abgabezeitraum
 SheetActiveFromTip: Download der Aufgabenstellung erst ab diesem Datum möglich
@@ -260,6 +260,7 @@ UnauthorizedRegistered: Sie sind nicht als Teilnehmer für diese Veranstaltung r
 UnauthorizedParticipant: Angegebener Benutzer ist nicht als Teilnehmer dieser Veranstaltung registriert.
 UnauthorizedCourseTime: Dieses Kurs erlaubt momentan keine Anmeldungen.
 UnauthorizedSheetTime: Dieses Übungsblatt ist momentan nicht freigegeben.
+UnauthorizedMaterialTime: Dieses Material ist momentan nicht freigegeben.
 UnauthorizedTutorialTime: Dieses Tutorium erlaubt momentan keine Anmeldungen.
 UnauthorizedSubmissionOwner: Sie sind an dieser Abgabe nicht beteiligt.
 UnauthorizedSubmissionRated: Diese Abgabe ist noch nicht korrigiert.
diff --git a/routes b/routes
index 26fe33c4d..c98fd9131 100644
--- a/routes
+++ b/routes
@@ -39,94 +39,94 @@
 /favicon.ico FaviconR GET                                     !free
 /robots.txt RobotsR GET                                       !free
 
-/                             HomeR             GET           !free
-/users                        UsersR            GET           -- no tags, i.e. admins only
-/users/#CryptoUUIDUser        AdminUserR        GET POST
-/users/#CryptoUUIDUser/delete AdminUserDeleteR      POST
-/users/#CryptoUUIDUser/hijack AdminHijackUserR  POST          !adminANDno-escalation
-/users/#CryptoUUIDUser/notifications UserNotificationR GET POST      !self
-/admin                        AdminR            GET
-/admin/features               AdminFeaturesR    GET POST
-/admin/test                   AdminTestR        GET POST
-/admin/errMsg                 AdminErrMsgR      GET POST
+/                             HomeR            GET            !free
+/users                        UsersR           GET            -- no tags, i.e. admins only
+/users/#CryptoUUIDUser        AdminUserR       GET POST
+/users/#CryptoUUIDUser/delete AdminUserDeleteR     POST
+/users/#CryptoUUIDUser/hijack AdminHijackUserR     POST       !adminANDno-escalation
+/users/#CryptoUUIDUser/notifications UserNotificationR GET POST   !self
+/admin                        AdminR           GET
+/admin/features               AdminFeaturesR   GET POST
+/admin/test                   AdminTestR       GET POST
+/admin/errMsg                 AdminErrMsgR     GET POST
 
-/health                       HealthR           GET            !free
-/instance                     InstanceR         GET            !free
-/info                         InfoR             GET            !free
-/info/lecturer                InfoLecturerR     GET            !lecturer
-/info/data                    DataProtR         GET            !free
-/impressum                    ImpressumR        GET            !free
-/version                      VersionR          GET            !free
+/health                       HealthR          GET             !free
+/instance                     InstanceR        GET             !free
+/info                         InfoR            GET             !free
+/info/lecturer                InfoLecturerR    GET             !lecturer
+/info/data                    DataProtR        GET             !free
+/impressum                    ImpressumR       GET             !free
+/version                      VersionR         GET             !free
 
-/help                         HelpR             GET POST       !free
+/help                         HelpR            GET POST        !free
 
-/user                      ProfileR          GET POST        !free
-/user/profile              ProfileDataR      GET             !free
-/user/authpreds            AuthPredsR        GET POST        !free
+/user                      ProfileR            GET POST        !free
+/user/profile              ProfileDataR        GET             !free
+/user/authpreds            AuthPredsR          GET POST        !free
 
-/term                      TermShowR         GET             !free
-/term/current              TermCurrentR      GET             !free
-/term/edit                 TermEditR         GET POST
-/term/#TermId/edit         TermEditExistR    GET POST
-!/term/#TermId             TermCourseListR   GET             !free
-!/term/#TermId/#SchoolId   TermSchoolCourseListR  GET        !free
+/term                      TermShowR           GET             !free
+/term/current              TermCurrentR        GET             !free
+/term/edit                 TermEditR           GET POST
+/term/#TermId/edit         TermEditExistR      GET POST
+!/term/#TermId             TermCourseListR     GET             !free
+!/term/#TermId/#SchoolId   TermSchoolCourseListR  GET          !free
 
-/school                    SchoolListR       GET             !development
-/school/#SchoolId          SchoolShowR       GET             !development
+/school                    SchoolListR         GET             !development
+/school/#SchoolId          SchoolShowR         GET             !development
 
 
 -- For Pattern Synonyms see Foundation
-/course/                    CourseListR       GET             !free
-!/course/new                CourseNewR        GET POST        !lecturer
-/course/#TermId/#SchoolId/#CourseShorthand CourseR          !lecturer:
-  /                           CShowR          GET             !free
-  /register                   CRegisterR      GET POST        !timeANDcapacity
-  /edit                       CEditR          GET POST
-  /lecturer-invite/#UserEmail CLecInviteR     GET POST
-  /delete                     CDeleteR        GET POST        !lecturerANDempty
-  /users                      CUsersR         GET POST
-  /users/#CryptoUUIDUser      CUserR          GET POST        !lecturerANDparticipant
-  /correctors                 CHiWisR         GET
-  /communication              CCommR          GET POST
-  /notes                      CNotesR         GET POST        !corrector
-  /subs                       CCorrectionsR   GET POST
-  /ex                         SheetListR      GET             !course-registered !materials !corrector
-  /ex/new                     SheetNewR       GET POST
-  /ex/current                 SheetCurrentR   GET             !course-registered !materials !corrector
-  /ex/unassigned              SheetOldUnassigned GET
+/course/                    CourseListR        GET             !free
+!/course/new                CourseNewR         GET POST        !lecturer
+/course/#TermId/#SchoolId/#CourseShorthand CourseR             !lecturer:
+  /                           CShowR           GET             !free
+  /register                   CRegisterR       GET POST        !timeANDcapacity
+  /edit                       CEditR           GET POST
+  /lecturer-invite/#UserEmail CLecInviteR      GET POST
+  /delete                     CDeleteR         GET POST        !lecturerANDempty
+  /users                      CUsersR          GET POST
+  /users/#CryptoUUIDUser      CUserR           GET POST        !lecturerANDparticipant
+  /correctors                 CHiWisR          GET
+  /communication              CCommR           GET POST
+  /notes                      CNotesR          GET POST        !corrector
+  /subs                       CCorrectionsR    GET POST
+  /ex                         SheetListR       GET             !course-registered !materials !corrector
+  /ex/new                     SheetNewR        GET POST
+  /ex/current                 SheetCurrentR    GET             !course-registered !materials !corrector
+  /ex/unassigned              SheetOldUnassigned    GET
   /ex/#SheetName SheetR:
-    /show                       SShowR        GET             !timeANDcourse-registered !timeANDmaterials !corrector
-    /edit                       SEditR        GET POST
-    /delete                     SDelR         GET POST
-    /subs                       SSubsR        GET POST        -- for lecturer only
-    !/subs/new                  SubmissionNewR GET POST       !timeANDcourse-registeredANDuser-submissions
-    !/subs/own                  SubmissionOwnR GET            !free -- just redirect
+    /show                       SShowR         GET             !timeANDcourse-registered !timeANDmaterials !corrector
+    /edit                       SEditR         GET POST
+    /delete                     SDelR          GET POST
+    /subs                       SSubsR         GET POST        -- for lecturer only
+    !/subs/new                  SubmissionNewR GET POST        !timeANDcourse-registeredANDuser-submissions
+    !/subs/own                  SubmissionOwnR GET             !free -- just redirect
     /subs/#CryptoFileNameSubmission SubmissionR:
-      /                         SubShowR      GET POST        !ownerANDtime !ownerANDread !correctorANDread
-      /archive/#{ZIPArchiveName SubmissionFileType} SubArchiveR                GET      !owner !corrector
-      /delete                   SubDelR       GET POST        !ownerANDtime
-      /assign                   SAssignR      GET POST	      !lecturerANDtime
-      /correction               CorrectionR   GET POST        !corrector !ownerANDreadANDrated
-      !/#SubmissionFileType/*FilePath SubDownloadR           GET      !owner !corrector
-    /correctors                 SCorrR        GET POST
-    /pseudonym                  SPseudonymR   GET POST        !course-registeredANDcorrector-submissions
-    /corrector-invite/#UserEmail SCorrInviteR     GET POST
-    !/#SheetFileType/*FilePath  SFileR        GET             !timeANDcourse-registered !timeANDmaterials !corrector
-  /file                          MaterialListR GET            !timeANDcourse-registered !timeANDmaterials !corrector
+      /                         SubShowR       GET POST        !ownerANDtime !ownerANDread !correctorANDread
+      /archive/#{ZIPArchiveName SubmissionFileType} SubArchiveR     GET      !owner !corrector
+      /delete                   SubDelR        GET POST        !ownerANDtime
+      /assign                   SAssignR       GET POST        !lecturerANDtime
+      /correction               CorrectionR    GET POST        !corrector !ownerANDreadANDrated
+      !/#SubmissionFileType/*FilePath SubDownloadR  GET        !owner !corrector
+    /correctors                 SCorrR         GET POST
+    /pseudonym                  SPseudonymR    GET POST        !course-registeredANDcorrector-submissions
+    /corrector-invite/#UserEmail SCorrInviteR  GET POST
+    !/#SheetFileType/*FilePath  SFileR         GET             !timeANDcourse-registered !timeANDmaterials !corrector
+  /file                          MaterialListR GET             !course-registered !materials !corrector !tutor
   /file/new                      MaterialNewR  GET POST
   /file/#MaterialName MaterialR:
-    /edit                       MEditR        GET POST
-    /delete                     MDelR         GET POST
-    /show                       MShowR        GET             !timeANDcourse-registered !timeANDmaterials !corrector
-    /part/*FilePath             MFileR        GET             !timeANDcourse-registered !timeANDmaterials !corrector
-  /tuts                         CTutorialListR GET            !tutor
+    /edit                       MEditR         GET POST
+    /delete                     MDelR          GET POST
+    /show                       MShowR         GET             !timeANDcourse-registered !timeANDmaterials !corrector !tutor
+    /load/*FilePath             MFileR         GET             !timeANDcourse-registered !timeANDmaterials !corrector !tutor
+  /tuts                         CTutorialListR GET             !tutor
   /tuts/new                     CTutorialNewR  GET POST
   /tuts/#TutorialName TutorialR:
-    /edit                     TEditR          GET POST
-    /delete                   TDeleteR        GET POST
-    /participants             TUsersR         GET POST        !tutor
-    /register                 TRegisterR          POST        !timeANDcapacityANDcourse-registeredANDregister-group !timeANDtutorial-registered
-    /communication            TCommR          GET POST        !tutor
+    /edit                     TEditR           GET POST
+    /delete                   TDeleteR         GET POST
+    /participants             TUsersR          GET POST        !tutor
+    /register                 TRegisterR           POST        !timeANDcapacityANDcourse-registeredANDregister-group !timeANDtutorial-registered
+    /communication            TCommR           GET POST        !tutor
 
 
 /subs  CorrectionsR GET POST !corrector !lecturer
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 71eb9835a..3376ef527 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -638,9 +638,9 @@ tagAccessPredicate AuthTime = APDB $ \mAuthId route _ -> case route of
         -> return Authorized
       | otherwise
         -> mzero
-     
+
   CSheetR tid ssh csh shn subRoute -> maybeT (unauthorizedI MsgUnauthorizedSheetTime) $ do
-    Entity cid _ <- MaybeT . getBy $ TermSchoolCourseShort tid ssh csh
+    cid <- MaybeT . getKeyBy $ TermSchoolCourseShort tid ssh csh
     Entity _sid Sheet{..} <- MaybeT . getBy $ CourseSheet cid shn
     cTime <- liftIO getCurrentTime
     let
@@ -662,6 +662,14 @@ tagAccessPredicate AuthTime = APDB $ \mAuthId route _ -> case route of
 
     return Authorized
 
+  CourseR tid ssh csh (MaterialR mnm _) -> maybeT (unauthorizedI MsgUnauthorizedMaterialTime) $ do
+    cid <- MaybeT . getKeyBy $ TermSchoolCourseShort tid ssh csh
+    Entity _mid Material{materialVisibleFrom} <- MaybeT . getBy $ UniqueMaterial cid mnm
+    cTime <- liftIO getCurrentTime
+    let visible = NTop materialVisibleFrom <= NTop (Just cTime)
+    guard visible
+    reutrn Authorized
+
   CourseR tid ssh csh CRegisterR -> do
     now <- liftIO getCurrentTime
     mbc <- getBy $ TermSchoolCourseShort tid ssh csh

From 780c99259fb351579d09f38196dae8c9efe32b0b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 4 May 2019 14:53:37 +0200
Subject: [PATCH 209/238] Working but incomplete

---
 static/js/utils/massInput.js | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/static/js/utils/massInput.js b/static/js/utils/massInput.js
index 302afd995..f048e2c93 100644
--- a/static/js/utils/massInput.js
+++ b/static/js/utils/massInput.js
@@ -30,6 +30,8 @@
     var massInputFormSubmitHandler;
     var massInputForm;
 
+    var massInputEnctype;
+
     function init() {
       if (!element) {
         throw new Error('Mass Input utility cannot be setup without an element!');
@@ -62,7 +64,7 @@
 
       var method = massInputForm.getAttribute('method') || 'POST';
       var url = massInputForm.getAttribute('action') || window.location.href;
-      var enctype = massInputForm.getAttribute('enctype') || 'application/json';
+      massInputEnctype = massInputForm.getAttribute('enctype') || 'application/json';
 
       var requestFn;
       if (HttpClient[method.toLowerCase()]) {
@@ -84,7 +86,7 @@
           requestFn(
             url,
             {
-              'Content-Type': enctype,
+              'Content-Type': massInputEnctype,
               'Mass-Input-Shortcircuit': massInputId,
             },
             requestBody,
@@ -109,15 +111,23 @@
 
     function serializeForm() {
       var formData = new FormData(massInputForm);
-      var formBody = [];
 
-      for(var formField of formData) {
-        var encodedKey = encodeURIComponent(formField[0]);
-        var encodedValue = encodeURIComponent(formField[1]);
-        formBody.push(encodedKey + "=" + encodedValue);
+      Array.from(element.querySelectorAll('button:focus, button:active')).forEach(function (el) {
+        if (!el.name || !el.value)
+          return;
+
+        console.log(el);
+
+        formData.append(el.name, el.value);
+      });
+
+      if (massInputEnctype === 'application/x-www-form-urlencoded') {
+        return new URLSearchParams(formData);
+      } else if (massInputEnctype === 'multipart/form-data') {
+        return formData;
+      } else {
+        throw new Error('Unsupported form enctype: ' + massInputEnctype);
       }
-
-      return formBody.join("&");
     }
 
     function reset() {

From f4b93644a817c79a6e12a0719ede8d5aabf09ddd Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Sat, 4 May 2019 15:13:03 +0200
Subject: [PATCH 210/238] PageActions done, all tested

---
 messages/uniworx/de.msg          |  7 ++++-
 src/Foundation.hs                | 54 ++++++++++++++++++++++++++++++--
 src/Handler/Material.hs          | 13 +++++---
 src/Handler/Sheet.hs             |  7 +++--
 src/Handler/Utils/Table/Cells.hs | 17 +++++++++-
 5 files changed, 86 insertions(+), 12 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 2ccc7c667..91eb63eeb 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -171,7 +171,7 @@ SheetInvisibleUntil date@Text: Dieses Übungsblatt ist für Teilnehmer momentan
 SheetName: Name
 SheetDescription: Hinweise für Teilnehmer
 SheetGroup: Gruppenabgabe
-SheetVisibleFrom: Verfügbar seit
+SheetVisibleFrom: Sichtbar für Teilnehmer ab
 SheetVisibleFromTip: Ohne Datum nie sichtbar und keine Abgabe möglich; nur für unfertige Blätter leer lassen, deren Bewertung/Fristen sich noch ändern können
 SheetActiveFrom: Beginn Abgabezeitraum
 SheetActiveFromTip: Download der Aufgabenstellung erst ab diesem Datum möglich
@@ -407,6 +407,7 @@ Pseudonyms: Pseudonyme
 FileTitle: Dateiname
 FileModified: Letzte Änderung
 VisibleFrom: Veröffentlicht
+AccessibleSince: Verfügbar seit
 
 
 Corrected: Korrigiert
@@ -753,6 +754,10 @@ MenuCorrections: Korrekturen
 MenuCorrectionsOwn: Meine Korrekturen
 MenuSubmissions: Abgaben
 MenuSheetList: Übungsblätter
+MenuMaterialList: Material
+MenuMaterialNew: Neues Material veröffentlichen
+MenuMaterialEdit: Material bearbeiten
+MenuMaterialDelete: Material löschen
 MenuTutorialList: Tutorien
 MenuTutorialNew: Neues Tutorium anlegen
 MenuSheetNew: Neues Übungsblatt anlegen
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 3376ef527..d6aa98f7d 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -163,9 +163,13 @@ pattern CSheetR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> SheetR
 pattern CSheetR tid ssh csh shn ptn
   = CourseR tid ssh csh (SheetR shn ptn)
 
+pattern CMaterialR :: TermId -> SchoolId -> CourseShorthand -> MaterialName -> MaterialR -> Route UniWorX
+pattern CMaterialR tid ssh csh mnm ptn
+  = CourseR tid ssh csh (MaterialR mnm ptn)
+
 pattern CTutorialR :: TermId -> SchoolId -> CourseShorthand -> TutorialName -> TutorialR -> Route UniWorX
-pattern CTutorialR tid ssh csh shn ptn
-  = CourseR tid ssh csh (TutorialR shn ptn)
+pattern CTutorialR tid ssh csh tnm ptn
+  = CourseR tid ssh csh (TutorialR tnm ptn)
 
 pattern CSubmissionR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> CryptoFileNameSubmission -> SubmissionR -> Route UniWorX
 pattern CSubmissionR tid ssh csh shn cid ptn
@@ -668,7 +672,7 @@ tagAccessPredicate AuthTime = APDB $ \mAuthId route _ -> case route of
     cTime <- liftIO getCurrentTime
     let visible = NTop materialVisibleFrom <= NTop (Just cTime)
     guard visible
-    reutrn Authorized
+    return Authorized
 
   CourseR tid ssh csh CRegisterR -> do
     now <- liftIO getCurrentTime
@@ -1405,6 +1409,14 @@ instance YesodBreadcrumbs UniWorX where
 --           (CSubmissionR tid ssh csh shn _ SubDownloadR) -- just for Download
   breadcrumb (CSheetR tid ssh csh shn SCorrR) = return ("Korrektoren", Just $ CSheetR tid ssh csh shn SShowR)
   --         (CSheetR tid ssh csh shn SFileR) -- just for Downloads
+
+  breadcrumb (CourseR tid ssh csh MaterialListR) = return ("Material"     , Just $ CourseR tid ssh csh CShowR)
+  breadcrumb (CourseR tid ssh csh MaterialNewR ) = return ("Neu"          , Just $ CourseR tid ssh csh MaterialListR)
+  breadcrumb (CMaterialR tid ssh csh mnm MShowR) = return (CI.original mnm, Just $ CourseR tid ssh csh MaterialListR)
+  breadcrumb (CMaterialR tid ssh csh mnm MEditR) = return ("Bearbeiten"   , Just $ CMaterialR tid ssh csh mnm MShowR)
+  breadcrumb (CMaterialR tid ssh csh mnm MDelR)  = return ("Löschen"      , Just $ CMaterialR tid ssh csh mnm MShowR)
+  --         (CMaterialR tid ssh csh mnm MFileR) -- just for Downloads
+
   -- Others
   breadcrumb (CorrectionsR)       = return ("Korrekturen", Just HomeR)
   breadcrumb (CorrectionsUploadR) = return ("Hochladen", Just CorrectionsR)
@@ -1763,6 +1775,14 @@ pageActions (CourseNewR) = [
   ]
 pageActions (CourseR tid ssh csh CShowR) =
   [ MenuItem
+      { menuItemType  = PageActionPrime
+      , menuItemLabel = MsgMenuMaterialList
+      , menuItemIcon  = Nothing
+      , menuItemRoute = SomeRoute $ CourseR tid ssh csh MaterialListR
+      , menuItemModal = False
+      , menuItemAccessCallback' = return True
+      }
+  , MenuItem
       { menuItemType = PageActionPrime
       , menuItemLabel = MsgMenuSheetList
       , menuItemIcon  = Nothing
@@ -1891,6 +1911,34 @@ pageActions (CourseR tid ssh csh SheetListR) =
       , menuItemAccessCallback' = return True
       }
   ]
+pageActions (CourseR tid ssh csh MaterialListR) =
+  [ MenuItem
+      { menuItemType  = PageActionPrime
+      , menuItemLabel = MsgMenuMaterialNew
+      , menuItemIcon  = Nothing
+      , menuItemRoute = SomeRoute $ CourseR tid ssh csh MaterialNewR
+      , menuItemModal = False
+      , menuItemAccessCallback' = return True
+      }
+  ]
+pageActions (CMaterialR tid ssh csh mnm MShowR) =
+  [ MenuItem
+      { menuItemType  = PageActionPrime
+      , menuItemLabel = MsgMenuMaterialEdit
+      , menuItemIcon  = Nothing
+      , menuItemRoute = SomeRoute $ CMaterialR tid ssh csh mnm MEditR
+      , menuItemModal = False
+      , menuItemAccessCallback' = return True
+      }
+  , MenuItem
+      { menuItemType  = PageActionPrime
+      , menuItemLabel = MsgMenuMaterialDelete
+      , menuItemIcon  = Nothing
+      , menuItemRoute = SomeRoute $ CMaterialR tid ssh csh mnm MDelR
+      , menuItemModal = False
+      , menuItemAccessCallback' = return True
+      }
+  ]
 pageActions (CourseR tid ssh csh CTutorialListR) =
   [ MenuItem
       { menuItemType  = PageActionPrime
diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index 07a88b731..56e696daf 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -83,7 +83,7 @@ getMaterialListR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getMaterialListR tid ssh csh = do
   let matLink :: MaterialName -> Route UniWorX
       matLink = CourseR tid ssh csh . flip MaterialR MShowR
-  _muid <- maybeAuthId
+  now <- liftIO getCurrentTime
   table <- runDB $ do
     cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
     let row2material = entityVal . dbrOutput -- no inner join, just Entity Material
@@ -104,13 +104,18 @@ getMaterialListR tid ssh csh = do
                 $ foldMap textCell . materialType . row2material
             , sortable (Just "name") (i18nCell MsgMaterialName)
                 $ liftA2 anchorCell matLink toWgt . materialName . row2material
+            , sortable (toNothingS "description") mempty
+                $ foldMap modalCell . materialDescription . row2material
+            , sortable (Just "visble-from") (i18nCell MsgAccessibleSince)
+                $ foldMap (dateTimeCellVisible now) . materialVisibleFrom . row2material
             , sortable (Just "last-edit") (i18nCell MsgFileModified)
                 $ dateTimeCell . materialLastEdit . row2material
             ]
       , dbtSorting   = Map.fromList
-            [ ( "type"      , SortColumn (E.^. MaterialType)     )
-            , ( "name"      , SortColumn (E.^. MaterialName)     )
-            , ( "last-edit" , SortColumn (E.^. MaterialLastEdit) )
+            [ ( "type"         , SortColumn (E.^. MaterialType)        )
+            , ( "name"         , SortColumn (E.^. MaterialName)        )
+            , ( "visible-from" , SortColumn (E.^. MaterialVisibleFrom) )
+            , ( "last-edit"    , SortColumn (E.^. MaterialLastEdit)    )
             ]
       , dbtFilter    = mempty
       , dbtFilterUI  = mempty
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index d12e2723e..e5c86ed26 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -154,6 +154,7 @@ getSheetOldUnassigned tid ssh csh = runDB $ do
 getSheetListR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getSheetListR tid ssh csh = do
   muid <- maybeAuthId
+  now <- liftIO getCurrentTime
   cid <- runDB . getKeyBy404 $ TermSchoolCourseShort tid ssh csh
   let
     lastSheetEdit sheet = E.sub_select . E.from $ \sheetEdit -> do
@@ -175,9 +176,9 @@ getSheetListR tid ssh csh = do
       , sortable (Just "name") (i18nCell MsgSheet)
           $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _)} -> anchorCell (CSheetR tid ssh csh sheetName SShowR) (toWidget sheetName)
       , sortable (Just "last-edit") (i18nCell MsgLastEdit)
-          $ \DBRow{dbrOutput=(_, E.Value mEditTime, _)} -> maybe mempty dateTimeCell mEditTime
-      , sortable (Just "visible-from") (i18nCell MsgSheetVisibleFrom)
-          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _)} -> maybe mempty dateTimeCell sheetVisibleFrom
+          $ \DBRow{dbrOutput=(_, E.Value mEditTime, _)} -> foldMap dateTimeCell mEditTime
+      , sortable (Just "visible-from") (i18nCell MsgAccessibleSince)
+          $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _)} -> foldMap (dateTimeCellVisible now) sheetVisibleFrom
       , sortable (Just "submission-since") (i18nCell MsgSheetActiveFrom)
           $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _)} -> dateTimeCell sheetActiveFrom
       , sortable (Just "submission-until") (i18nCell MsgSheetActiveTo)
diff --git a/src/Handler/Utils/Table/Cells.hs b/src/Handler/Utils/Table/Cells.hs
index 307336e70..5f7a29e52 100644
--- a/src/Handler/Utils/Table/Cells.hs
+++ b/src/Handler/Utils/Table/Cells.hs
@@ -53,7 +53,13 @@ pathPieceCell = cell . toWidget . toPathPiece
 sqlCell :: (IsDBTable (YesodDB UniWorX) a) => YesodDB UniWorX Widget -> DBCell (YesodDB UniWorX) a
 sqlCell act = mempty & cellContents .~ lift act
 
--- Recfor line numbers, use dbRow
+markCell :: (IsDBTable m a) => (a -> Bool) -> (a -> DBCell m a) -> a -> DBCell m a
+markCell condition normal x
+  | condition x = (normal x) <> (cell $ isVisibleWidget False)
+  | otherwise   = normal x
+
+
+-- Recall: for line numbers, use dbRow
 
 ---------------------
 -- Icon cells
@@ -76,6 +82,9 @@ commentCell Nothing     = mempty
 commentCell (Just link) = anchorCell link icon
   where icon = toWidget $ hasComment True
 
+-- | Display an icon that opens a modal upon clicking
+modalCell :: (IsDBTable m a, ToWidget UniWorX w) => w -> DBCell m a
+modalCell content = cell $ modal (toWidget $ hasComment True) (Right $ toWidget content)
 
 -----------------
 -- Datatype cells
@@ -88,6 +97,12 @@ dateCell t = cell $ formatTime SelFormatDate t >>= toWidget
 dateTimeCell :: IsDBTable m a => UTCTime -> DBCell m a
 dateTimeCell t = cell $ formatTime SelFormatDateTime t >>= toWidget
 
+dateTimeCellVisible :: IsDBTable m a => UTCTime -> UTCTime -> DBCell m a
+dateTimeCellVisible watershed t = cell $ do
+    tfw <- formatTime SelFormatDateTime t >>= toWidget
+    icn <- bool mempty (toWidget $ isVisible False) $ watershed < t
+    return $ tfw <> icn
+
 userCell :: IsDBTable m a => Text -> Text -> DBCell m a
 userCell displayName surname = cell $ nameWidget displayName surname
 

From 50b040dc41c85813bf67f47cf5efc4744eb20e3c Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 4 May 2019 16:44:33 +0200
Subject: [PATCH 211/238] more BEM like css classes for various mass inputs

---
 templates/course/lecturerMassInput/layout.hamlet | 4 ++--
 templates/sheetCorrectors/layout.hamlet          | 4 ++--
 templates/widgets/massinput/list/layout.hamlet   | 6 +++---
 templates/widgets/massinput/row.hamlet           | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/templates/course/lecturerMassInput/layout.hamlet b/templates/course/lecturerMassInput/layout.hamlet
index 8dc00bc90..223ed386e 100644
--- a/templates/course/lecturerMassInput/layout.hamlet
+++ b/templates/course/lecturerMassInput/layout.hamlet
@@ -2,10 +2,10 @@ $newline never
 <table>
   <tbody>
     $forall coord <- review liveCoords lLength
-      <tr .massinput--cell>
+      <tr .massinput__cell>
         ^{cellWdgts ! coord}
         <td>
           ^{fvInput (delButtons ! coord)}
   <tfoot>
-    <tr .massinput--add>
+    <tr .massinput__cell>
       ^{addWdgts ! (0, 0)}
diff --git a/templates/sheetCorrectors/layout.hamlet b/templates/sheetCorrectors/layout.hamlet
index 3f6bb4f87..bd28b651d 100644
--- a/templates/sheetCorrectors/layout.hamlet
+++ b/templates/sheetCorrectors/layout.hamlet
@@ -9,10 +9,10 @@ $newline never
       <td>
   <tbody>
     $forall coord <- review liveCoords lLength
-      <tr .massinput--cell .table__row>
+      <tr .massinput__cell .table__row>
         ^{cellWdgts ! coord}
         <td>
           ^{fvInput (delButtons ! coord)}
   <tfoot>
-    <tr .massinput--add>
+    <tr .massinput__cell>
       ^{addWdgts ! (0, 0)}
diff --git a/templates/widgets/massinput/list/layout.hamlet b/templates/widgets/massinput/list/layout.hamlet
index 5f5676bb6..5c747e041 100644
--- a/templates/widgets/massinput/list/layout.hamlet
+++ b/templates/widgets/massinput/list/layout.hamlet
@@ -1,14 +1,14 @@
 $newline never
 <table>
   <tbody>
-    <tr .massinput--cell>
+    <tr .massinput__cell>
       $forall coord <- review liveCoords lLength
         <td>
           ^{cellWdgts ! coord}
         <td>
           ^{fvInput (delButtons ! coord)}
   <tfoot>
-    <tr>
+    <tr .massinput__cell>
+      <td>
       <td>
-      <td .massinput--add>
         ^{addWdgts ! (0, 0)}
diff --git a/templates/widgets/massinput/row.hamlet b/templates/widgets/massinput/row.hamlet
index 8c43c9896..17d909baa 100644
--- a/templates/widgets/massinput/row.hamlet
+++ b/templates/widgets/massinput/row.hamlet
@@ -1,7 +1,7 @@
-<ul .massinput--row .#{"massinput--dim" <> toPathPiece dimIx}>
+<ul .massinput__row .#{"massinput--dim" <> toPathPiece dimIx}>
   $forall (cellCoord, cell) <- cells
-    <li .massinput--cell data-massinput-coord=#{toPathPiece cellCoord}>
+    <li .massinput__cell data-massinput-coord=#{toPathPiece cellCoord}>
       ^{cell}
   $maybe add <- addWidget
-    <li .massinput--add>
+    <li .massinput__cell>
       ^{add}

From e77df3063223613ee58a6aacef4501f0de4e7945 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 4 May 2019 16:46:16 +0200
Subject: [PATCH 212/238] more robust mass input form data handling

---
 static/js/utils/massInput.js | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/static/js/utils/massInput.js b/static/js/utils/massInput.js
index f048e2c93..a861c1c75 100644
--- a/static/js/utils/massInput.js
+++ b/static/js/utils/massInput.js
@@ -23,6 +23,7 @@
   var MASS_INPUT_UTIL_NAME = 'massInput';
   var MASS_INPUT_UTIL_SELECTOR = '[uw-mass-input]';
 
+  var MASS_INPUT_CELL_SELECTOR = '.massinput__cell';
   var MASS_INPUT_INITIALIZED_CLASS = 'mass-input--initialized';
 
   var massInputUtil = function(element) {
@@ -30,8 +31,6 @@
     var massInputFormSubmitHandler;
     var massInputForm;
 
-    var massInputEnctype;
-
     function init() {
       if (!element) {
         throw new Error('Mass Input utility cannot be setup without an element!');
@@ -64,7 +63,7 @@
 
       var method = massInputForm.getAttribute('method') || 'POST';
       var url = massInputForm.getAttribute('action') || window.location.href;
-      massInputEnctype = massInputForm.getAttribute('enctype') || 'application/json';
+      var enctype = massInputForm.getAttribute('enctype') || 'application/json';
 
       var requestFn;
       if (HttpClient[method.toLowerCase()]) {
@@ -79,14 +78,17 @@
           return false;
         }
 
+        // find the according massinput cell thats hosts the element that triggered the submit
+        var massInputCell = activeElement.closest(MASS_INPUT_CELL_SELECTOR);
+
         event.preventDefault();
-        var requestBody = serializeForm();
+        var requestBody = serializeForm(massInputCell, enctype);
 
         if (requestFn) {
           requestFn(
             url,
             {
-              'Content-Type': massInputEnctype,
+              'Content-Type': enctype,
               'Mass-Input-Shortcircuit': massInputId,
             },
             requestBody,
@@ -109,24 +111,23 @@
       }
     }
 
-    function serializeForm() {
+    function serializeForm(massInputCell, enctype) {
       var formData = new FormData(massInputForm);
 
-      Array.from(element.querySelectorAll('button:focus, button:active')).forEach(function (el) {
-        if (!el.name || !el.value)
-          return;
+      // manually add name and value of submit button to formData
+      if (massInputCell) {
+        var submitButton = massInputCell.querySelector('button[type="submit"][name][value]');
+        if (submitButton) {
+          formData.append(submitButton.name, submitButton.value);
+        }
+      }
 
-        console.log(el);
-
-        formData.append(el.name, el.value);
-      });
-
-      if (massInputEnctype === 'application/x-www-form-urlencoded') {
+      if (enctype === 'application/x-www-form-urlencoded') {
         return new URLSearchParams(formData);
-      } else if (massInputEnctype === 'multipart/form-data') {
+      } else if (enctype === 'multipart/form-data') {
         return formData;
       } else {
-        throw new Error('Unsupported form enctype: ' + massInputEnctype);
+        throw new Error('Unsupported form enctype: ' + enctype);
       }
     }
 

From c0b2991c16d37a328c3f5ae3500a7eb13d3e6646 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 4 May 2019 17:20:53 +0200
Subject: [PATCH 213/238] Fix haddock

---
 src/Utils/DB.hs | 50 +++++++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/Utils/DB.hs b/src/Utils/DB.hs
index fbfcd7e8c..b6e7b9950 100644
--- a/src/Utils/DB.hs
+++ b/src/Utils/DB.hs
@@ -20,8 +20,8 @@ flipMaybe _ (Just _) = Nothing
 
 
 
-emptyOrIn :: PersistField typ =>
-  E.SqlExpr (E.Value typ) -> Set typ -> E.SqlExpr (E.Value Bool)
+emptyOrIn :: PersistField typ
+          => E.SqlExpr (E.Value typ) -> Set typ -> E.SqlExpr (E.Value Bool)
 emptyOrIn criterion testSet
   | Set.null testSet = E.val True
   | otherwise        = criterion `E.in_` E.valList (Set.toList testSet)
@@ -30,42 +30,44 @@ entities2map :: PersistEntity record => [Entity record] -> Map (Key record) reco
 entities2map = foldl' (\m entity -> Map.insert (entityKey entity) (entityVal entity) m) Map.empty
 
 getKeyBy :: (PersistEntityBackend record ~ BaseBackend backend, PersistEntity record, PersistUniqueRead backend, MonadIO m)
-  => Unique record -> ReaderT backend m (Maybe (Key record))
+         => Unique record -> ReaderT backend m (Maybe (Key record))
 getKeyBy u = fmap entityKey <$> getBy u -- TODO optimize this, so that DB does not deliver entire record!
 
 getKeyBy404 :: (PersistEntityBackend record ~ BaseBackend backend, PersistEntity record, PersistUniqueRead backend, MonadIO m)
-  => Unique record -> ReaderT backend m (Key record)
+            => Unique record -> ReaderT backend m (Key record)
 getKeyBy404 = fmap entityKey . getBy404 -- TODO optimize this, so that DB does not deliver entire record!
 
 existsBy :: (PersistEntityBackend record ~ BaseBackend backend, PersistEntity record, PersistUniqueRead backend, MonadIO m)
-  => Unique record -> ReaderT backend m Bool
+         => Unique record -> ReaderT backend m Bool
 existsBy = fmap isJust . getBy -- TODO optimize, so that DB does not deliver entire record
 
 existsKey :: (PersistEntityBackend record ~ BaseBackend backend, PersistEntity record, PersistStoreRead backend, MonadIO m)
-  => Key record -> ReaderT backend m Bool
+          => Key record -> ReaderT backend m Bool
 existsKey = fmap isJust . get -- TODO optimize, so that DB does not deliver entire record
 
 updateBy :: (PersistUniqueRead backend, PersistStoreWrite backend, MonadIO m, PersistRecordBackend record backend )
-  => Unique record -> [Update record] -> ReaderT backend m ()
+         => Unique record -> [Update record] -> ReaderT backend m ()
 updateBy uniq updates = do
   key <- getKeyBy uniq
   for_ key $ flip update updates
 
 -- | Like 'myReplaceUnique' or 'replaceUnique' but with reversed result: returns 'Nothing' if the replacement was not possible,
 --   and 'Just key' for the successfully replaced record
-uniqueReplace :: (MonadIO m
-       ,Eq (Unique record)
-       ,PersistRecordBackend record backend
-       ,PersistUniqueWrite backend)
-    => Key record -> record -> ReaderT backend m (Maybe (Key record))
+uniqueReplace :: ( MonadIO m
+                 , Eq (Unique record)
+                 , PersistRecordBackend record backend
+                 , PersistUniqueWrite backend
+                 )
+              => Key record -> record -> ReaderT backend m (Maybe (Key record))
 uniqueReplace key datumNew = flipMaybe key <$> myReplaceUnique key datumNew
 
-myReplaceUnique -- | Identical to 'Database.Persist.Class', except for the better type signature (original requires Eq  record which is not needed anyway)
-    :: (MonadIO m
-       ,Eq (Unique record)
-       ,PersistRecordBackend record backend
-       ,PersistUniqueWrite backend)
-    => Key record -> record -> ReaderT backend m (Maybe (Unique record))
+-- | Identical to 'Database.Persist.Class', except for the better type signature (original requires Eq  record which is not needed anyway)
+myReplaceUnique :: ( MonadIO m
+                   , Eq (Unique record)
+                   , PersistRecordBackend record backend
+                   , PersistUniqueWrite backend
+                   )
+                => Key record -> record -> ReaderT backend m (Maybe (Unique record))
 myReplaceUnique key datumNew = getJust key >>= replaceOriginal
   where
     uniqueKeysNew = persistUniqueKeys datumNew
@@ -78,12 +80,12 @@ myReplaceUnique key datumNew = getJust key >>= replaceOriginal
         changedKeys = uniqueKeysNew List.\\ uniqueKeysOriginal
         uniqueKeysOriginal = persistUniqueKeys original
 
-checkUniqueKeys
-    :: (MonadIO m
-       ,PersistEntity record
-       ,PersistUniqueRead backend
-       ,PersistRecordBackend record backend)
-    => [Unique record] -> ReaderT backend m (Maybe (Unique record))
+checkUniqueKeys :: ( MonadIO m
+                   , PersistEntity record
+                   , PersistUniqueRead backend
+                   , PersistRecordBackend record backend
+                   )
+                => [Unique record] -> ReaderT backend m (Maybe (Unique record))
 checkUniqueKeys [] = return Nothing
 checkUniqueKeys (x:xs) = do
     y <- getBy x

From 7933877bed9545b3bccac6f6f7b9097292d75a05 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 4 May 2019 17:52:02 +0200
Subject: [PATCH 214/238] Enable job-handling explicitly where needed

---
 src/Application.hs | 28 +++++++++++++---------------
 src/Foundation.hs  |  2 +-
 test/Database.hs   |  2 --
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/Application.hs b/src/Application.hs
index 503386d64..11eb60210 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module Application
-    ( getApplicationDev, getAppDevSettings
+    ( getAppDevSettings
     , appMain
     , develMain
     , makeFoundation
@@ -202,9 +202,6 @@ makeFoundation appSettings'@AppSettings{..} = do
 
       let foundation = mkFoundation sqlPool smtpPool ldapPool appCryptoIDKey appSessionKey appSecretBoxKey appWidgetMemcached appJSONWebKeySet appClusterID
 
-      $logDebugS "setup" "Job-Handling"
-      handleJobs foundation
-
       -- Return the foundation
       $logDebugS "setup" "Done"
       return foundation
@@ -343,15 +340,6 @@ warpSettings foundation = defaultSettings
             LevelError
             (toLogStr $ "Exception from Warp: " ++ show e))
 
--- | For yesod devel, return the Warp settings and WAI Application.
-getApplicationDev :: (MonadResource m, MonadBaseControl IO m) => m (Settings, Application)
-getApplicationDev = do
-    settings <- getAppDevSettings
-    foundation <- makeFoundation settings
-    wsettings <- liftIO . getDevSettings $ warpSettings foundation
-    app <- makeApplication foundation
-    return (wsettings, app)
-
 getAppDevSettings, getAppSettings :: MonadIO m => m AppSettings
 getAppDevSettings = liftIO $ adjustSettings =<< loadYamlSettings [configSettingsYml] [configSettingsYmlValue] useEnv
 getAppSettings = liftIO $ adjustSettings =<< loadYamlSettingsArgs [configSettingsYmlValue] useEnv
@@ -369,8 +357,14 @@ adjustSettings = execStateT $ do
 
 -- | main function for use by yesod devel
 develMain :: IO ()
-develMain = runResourceT $
-  liftIO . develMainHelper . return =<< getApplicationDev
+develMain = runResourceT $ do
+  settings <- getAppDevSettings
+  foundation <- makeFoundation settings
+  wsettings <- liftIO . getDevSettings $ warpSettings foundation
+  app <- makeApplication foundation
+
+  handleJobs foundation
+  liftIO . develMainHelper $ return (wsettings, app)
 
 -- | The @main@ function for an executable running this site.
 appMain :: MonadResourceBase m => m ()
@@ -381,6 +375,9 @@ appMain = runResourceT $ do
     foundation <- makeFoundation settings
   
     runAppLoggingT foundation $ do
+      $logDebugS "setup" "Job-Handling"
+      handleJobs foundation
+
       -- Generate a WAI Application from the foundation
       app <- makeApplication foundation
 
@@ -414,6 +411,7 @@ getApplicationRepl :: (MonadResource m, MonadBaseControl IO m) => m (Int, UniWor
 getApplicationRepl = do
     settings <- getAppDevSettings
     foundation <- makeFoundation settings
+    handleJobs foundation
     wsettings <- liftIO . getDevSettings $ warpSettings foundation
     app1 <- makeApplication foundation
 
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 05b086ed0..8ce8987de 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -113,7 +113,7 @@ data UniWorX = UniWorX
     , appConnPool        :: ConnectionPool -- ^ Database connection pool.
     , appSmtpPool        :: Maybe SMTPPool
     , appLdapPool        :: Maybe LdapPool
-    , appWidgetMemcached :: Maybe Memcached.Connection
+    , appWidgetMemcached :: Maybe Memcached.Connection -- ^ Actually a proper pool
     , appHttpManager     :: Manager
     , appLogger          :: (ReleaseKey, TVar Logger)
     , appLogSettings     :: TVar LogSettings
diff --git a/test/Database.hs b/test/Database.hs
index 3774e09ea..257edf9bd 100755
--- a/test/Database.hs
+++ b/test/Database.hs
@@ -53,8 +53,6 @@ main = do
           rawExecute "drop owned by current_user;" []
       DBTruncate -> db $ do
         foundation <- getYesod
-        stopJobCtl foundation
-        release . fst $ appLogger foundation
         liftIO . destroyAllResources $ appConnPool foundation
         truncateDb
       DBMigrate -> db $ return ()

From 17b9b552b74f46d7c09ea4728ad3f4f00f261b3f Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 4 May 2019 17:53:53 +0200
Subject: [PATCH 215/238] Remove unnecessary imports

---
 test/Database.hs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/Database.hs b/test/Database.hs
index 257edf9bd..fe8e9842c 100755
--- a/test/Database.hs
+++ b/test/Database.hs
@@ -6,13 +6,11 @@ module Database
 
 import "uniworx" Import hiding (Option(..))
 import "uniworx" Application (db, getAppDevSettings)
-import "uniworx" Jobs (stopJobCtl)
 
 import Data.Pool (destroyAllResources)
 
 import Database.Persist.Postgresql
 import Control.Monad.Logger
-import Control.Monad.Trans.Resource
 
 import System.Console.GetOpt
 import System.Exit (exitWith, ExitCode(..))

From 95298f856e47715106fbf744e2f363bc39584329 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 4 May 2019 18:25:06 +0200
Subject: [PATCH 216/238] Fix hlint

---
 src/Handler/Material.hs          | 23 +++++++++++------------
 src/Handler/Utils.hs             |  2 +-
 src/Handler/Utils/DateTime.hs    |  4 ++--
 src/Handler/Utils/Table/Cells.hs |  2 +-
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index 56e696daf..7268f0f09 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -48,10 +48,10 @@ makeMaterialForm cid template = identifyForm FIDmaterial $ \html -> do
         previouslyUsed <- liftHandlerT . runDB $
           E.select $ E.from $ \material ->
             E.distinctOnOrderBy [E.asc $ material E.^. MaterialType] $ do
-              E.where_ $ (material E.^. MaterialCourse E.==. E.val cid)
-                  E.&&.  (E.not_ $ E.isNothing $ material E.^. MaterialType)
+              E.where_ $ material E.^. MaterialCourse E.==. E.val cid
+                   E.&&. E.not_ (E.isNothing $ material E.^. MaterialType)
               return $ material E.^. MaterialType
-        return $ defaults <> (Set.fromList $ mapMaybe E.unValue previouslyUsed)
+        return $ defaults <> Set.fromList (mapMaybe E.unValue previouslyUsed)
 
   ctime <- ceilingQuarterHour <$> liftIO getCurrentTime
   flip (renderAForm FormStandard) html $ MaterialForm
@@ -88,7 +88,7 @@ getMaterialListR tid ssh csh = do
     cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
     let row2material = entityVal . dbrOutput -- no inner join, just Entity Material
         psValidator  = def & defaultSorting [SortDescBy "last-edit"]
-    table <- dbTableWidget' psValidator DBTable
+    dbTableWidget' psValidator DBTable
       { dbtIdent     = "material-list" :: Text
       , dbtStyle     = def
       , dbtParams    = def
@@ -120,10 +120,9 @@ getMaterialListR tid ssh csh = do
       , dbtFilter    = mempty
       , dbtFilterUI  = mempty
       }
-    return table
 
-  let headingLong  = prependCourseTitle tid ssh csh $ MsgMaterialListHeading
-      headingShort = prependCourseTitle tid ssh csh $ MsgMaterialListHeading
+  let headingLong  = prependCourseTitle tid ssh csh MsgMaterialListHeading
+      headingShort = prependCourseTitle tid ssh csh MsgMaterialListHeading
   siteLayoutMsg headingLong $ do
     setTitleI headingShort
     $(widgetFile "material-list")
@@ -152,7 +151,7 @@ getMShowR :: TermId -> SchoolId -> CourseShorthand -> MaterialName -> Handler Ht
 getMShowR tid ssh csh mnm = do
   let matLink :: FilePath -> Route UniWorX
       matLink = CourseR tid ssh csh . MaterialR mnm . MFileR
-  ( (Entity _mid material@Material{materialType, materialDescription})
+  ( Entity _mid material@Material{materialType, materialDescription}
     , (Any hasFiles,fileTable)) <- runDB $ do
     matEnt <- fetchMaterial tid ssh csh mnm
     let psValidator = def & defaultSortingByFileTitle
@@ -182,7 +181,7 @@ getMShowR tid ssh csh mnm = do
     return (matEnt,fileTable')
 
   let matVisFro = materialVisibleFrom material
-  now <- liftIO $ getCurrentTime
+  now <- liftIO getCurrentTime
   materialLastEdit    <-           formatTime SelFormatDateTime  $ materialLastEdit    material
   materialVisibleFrom <- traverse (formatTime SelFormatDateTime) matVisFro
   when (NTop matVisFro >= NTop (Just now)) $ addMessageI Warning $
@@ -206,7 +205,7 @@ postMEditR tid ssh csh mnm = do
       return $ file E.^. FileId
     return (matEnt, (Left . E.unValue) <$> fileIds)
   -- let cid = materialCourse
-  let template = Just $ MaterialForm
+  let template = Just MaterialForm
         { mfName         = materialName
         , mfType         = materialType
         , mfDescription  = materialDescription
@@ -274,7 +273,7 @@ handleMaterialEdit tid ssh csh cid template dbMaterial = do
           return $ file E.^. FileId
         let oldFileIds = setFromList $ map E.unValue oldFileIdVals
         keep <- execWriterT . runConduit $ transPipe (lift . lift) fs =$= C.mapM_ finsert
-        mapM_ deleteCascade $ (oldFileIds \\ keep :: Set FileId)
+        mapM_ deleteCascade (oldFileIds \\ keep :: Set FileId)
       where
         finsert (Left fileId) = tell $ singleton fileId
         finsert (Right file) = lift $ do
@@ -299,4 +298,4 @@ postMDelR tid ssh csh mnm = do
     , drSuccess = SomeRoute $ CourseR tid ssh csh   MaterialListR
     , drAbort   = SomeRoute $ CourseR tid ssh csh $ MaterialR mnm MShowR
     }
-  -}
\ No newline at end of file
+  -}
diff --git a/src/Handler/Utils.hs b/src/Handler/Utils.hs
index dfca11b4c..8e2a595e2 100644
--- a/src/Handler/Utils.hs
+++ b/src/Handler/Utils.hs
@@ -52,7 +52,7 @@ serveOneFile :: DB [Entity File] -> Handler TypedContent
 serveOneFile query = do
   results <- runDB query
   case results of
-    [(Entity _fileId File{fileTitle, fileContent})]
+    [Entity _fileId File{fileTitle, fileContent}]
       | Just fileContent' <- fileContent -> do
           whenM downloadFiles $
             addHeader "Content-Disposition" [st|attachment; filename="#{takeFileName fileTitle}"|]
diff --git a/src/Handler/Utils/DateTime.hs b/src/Handler/Utils/DateTime.hs
index 2b8e5af46..16ab29afa 100644
--- a/src/Handler/Utils/DateTime.hs
+++ b/src/Handler/Utils/DateTime.hs
@@ -203,5 +203,5 @@ ceilingMinuteBy margin roundto utct = addUTCTime bonus utct
     oldTime = localTimeOfDay $ utcToLocalTime utct
     oldMin  = todMin  oldTime
     newMin  = roundToNearestMultiple roundto $ oldMin + margin
-    newTime = oldTime { todMin = newMin, todSec = 0} -- might be invalid, but correctly treated by `timeOfDayToTime`
-    bonus   = realToFrac $ (timeOfDayToTime newTime) - (timeOfDayToTime oldTime)
\ No newline at end of file
+    newTime = oldTime { todMin = newMin, todSec = 0 } -- might be invalid, but correctly treated by `timeOfDayToTime`
+    bonus   = realToFrac $ timeOfDayToTime newTime - timeOfDayToTime oldTime
diff --git a/src/Handler/Utils/Table/Cells.hs b/src/Handler/Utils/Table/Cells.hs
index 5f7a29e52..84580b219 100644
--- a/src/Handler/Utils/Table/Cells.hs
+++ b/src/Handler/Utils/Table/Cells.hs
@@ -55,7 +55,7 @@ sqlCell act = mempty & cellContents .~ lift act
 
 markCell :: (IsDBTable m a) => (a -> Bool) -> (a -> DBCell m a) -> a -> DBCell m a
 markCell condition normal x
-  | condition x = (normal x) <> (cell $ isVisibleWidget False)
+  | condition x = normal x <> cell (isVisibleWidget False)
   | otherwise   = normal x
 
 

From 02cf16f09b33db80c7efcb4420dfe124dba9501d Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 4 May 2019 18:41:05 +0200
Subject: [PATCH 217/238] ChangeLog

---
 ChangeLog.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ChangeLog.md b/ChangeLog.md
index 8fe2401e2..c50e244b7 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,7 @@
+  * Version 04.05.2019
+  
+    Kursmaterial
+
   * Version 29.04.2019
   
     Tutorien

From 4a653128165cf649536293cebf6ee0ec1e215656 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Sat, 4 May 2019 18:56:25 +0200
Subject: [PATCH 218/238] Bugfix: sorting materials visible from; updated info
 pages

---
 src/Handler/Material.hs           |  2 +-
 templates/featureList.hamlet      |  1 -
 templates/info-lecturer/de.hamlet | 14 +++++++-------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index 7268f0f09..86b1789e6 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -106,7 +106,7 @@ getMaterialListR tid ssh csh = do
                 $ liftA2 anchorCell matLink toWgt . materialName . row2material
             , sortable (toNothingS "description") mempty
                 $ foldMap modalCell . materialDescription . row2material
-            , sortable (Just "visble-from") (i18nCell MsgAccessibleSince)
+            , sortable (Just "visible-from") (i18nCell MsgAccessibleSince)
                 $ foldMap (dateTimeCellVisible now) . materialVisibleFrom . row2material
             , sortable (Just "last-edit") (i18nCell MsgFileModified)
                 $ dateTimeCell . materialLastEdit . row2material
diff --git a/templates/featureList.hamlet b/templates/featureList.hamlet
index e700604e3..ecd29bf3d 100644
--- a/templates/featureList.hamlet
+++ b/templates/featureList.hamlet
@@ -6,7 +6,6 @@
       <h4>
         aus UniWorX bekannt:
       <ul>
-        <li> Übungsgruppen
         <li> Klausuren
         <li> Zentralanmeldungen
     <li>
diff --git a/templates/info-lecturer/de.hamlet b/templates/info-lecturer/de.hamlet
index 74bf737ca..5ad4a1192 100644
--- a/templates/info-lecturer/de.hamlet
+++ b/templates/info-lecturer/de.hamlet
@@ -42,6 +42,11 @@ $newline text
       Der Zugriff auf Übungsblätter, Folien und andere Materialien
       kann von der Anmeldung zum Kurs abhängig gemacht werden.
 
+    <dt .deflist__dt> Materialien veröffentlichen
+    <dd .deflist__dd>
+      Folien, Code-Bündel, usw. können nun bequem
+      per Uni2work an die Teilnehmer verteilt werden, ggf.\ auch geschützt.
+
     <dt .deflist__dt> Kurs Passwort
     <dd .deflist__dd> Die Anmeldung zum Kurs kann durch ein Passwort geschützt werden.
 
@@ -151,11 +156,6 @@ $newline text
         und entsprechende Benachrichtigungen sind geplant,
         aber noch nicht verfügbar.
 
-    <dt .deflist__dt> Übungsgruppen
-    <dd .deflist__dd>
-      Eine Anmeldung zu Übungsgruppen wie bisher
-      ist leider noch nicht fertig implementiert.
-
     <dt .deflist__dt> Papierabgaben
     <dd .deflist__dd>
       Externe Abgaben Form (z.B. Papierabgaben)
@@ -184,7 +184,7 @@ $newline text
 
 <section>
   <h2>Tutorien
-  
+
   <dl .deflist>
     <dt .deflist__dt> Termine
     <dd .deflist__dd>
@@ -197,7 +197,7 @@ $newline text
       Eine Ausnahme, dass ein Termin außerplanmäßig stattfindet, überschreibt wiederrum Ausnahmen, die Termine ausfallen lassen.
       <br />
       Dieses Verhalten kann genutzt werden um einzelne Termine zeitlich zu verschieben, indem der reguläre Termin ausfällt und stattdessen ein außerplanmäßiger mit versetzter Zeit stattfindet.
-  
+
     <dt .deflist__dt> Tutoren
     <dd .deflist__dd>
       <p>

From 8381a065b6db85ffc7f03011a6289e0a3a157800 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 4 May 2019 21:09:13 +0200
Subject: [PATCH 219/238] mark mass input add cells via css class

---
 templates/course/lecturerMassInput/layout.hamlet | 2 +-
 templates/sheetCorrectors/layout.hamlet          | 2 +-
 templates/widgets/massinput/list/layout.hamlet   | 2 +-
 templates/widgets/massinput/row.hamlet           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/course/lecturerMassInput/layout.hamlet b/templates/course/lecturerMassInput/layout.hamlet
index 223ed386e..65352dd95 100644
--- a/templates/course/lecturerMassInput/layout.hamlet
+++ b/templates/course/lecturerMassInput/layout.hamlet
@@ -7,5 +7,5 @@ $newline never
         <td>
           ^{fvInput (delButtons ! coord)}
   <tfoot>
-    <tr .massinput__cell>
+    <tr .massinput__cell.massinput__cell--add>
       ^{addWdgts ! (0, 0)}
diff --git a/templates/sheetCorrectors/layout.hamlet b/templates/sheetCorrectors/layout.hamlet
index bd28b651d..172f813f8 100644
--- a/templates/sheetCorrectors/layout.hamlet
+++ b/templates/sheetCorrectors/layout.hamlet
@@ -14,5 +14,5 @@ $newline never
         <td>
           ^{fvInput (delButtons ! coord)}
   <tfoot>
-    <tr .massinput__cell>
+    <tr .massinput__cell.massinput__cell--add>
       ^{addWdgts ! (0, 0)}
diff --git a/templates/widgets/massinput/list/layout.hamlet b/templates/widgets/massinput/list/layout.hamlet
index 5c747e041..0af005b4e 100644
--- a/templates/widgets/massinput/list/layout.hamlet
+++ b/templates/widgets/massinput/list/layout.hamlet
@@ -8,7 +8,7 @@ $newline never
         <td>
           ^{fvInput (delButtons ! coord)}
   <tfoot>
-    <tr .massinput__cell>
+    <tr .massinput__cell.massinput__cell--add>
       <td>
       <td>
         ^{addWdgts ! (0, 0)}
diff --git a/templates/widgets/massinput/row.hamlet b/templates/widgets/massinput/row.hamlet
index 17d909baa..f26de8b05 100644
--- a/templates/widgets/massinput/row.hamlet
+++ b/templates/widgets/massinput/row.hamlet
@@ -3,5 +3,5 @@
     <li .massinput__cell data-massinput-coord=#{toPathPiece cellCoord}>
       ^{cell}
   $maybe add <- addWidget
-    <li .massinput__cell>
+    <li .massinput__cell.massinput__cell--add>
       ^{add}

From 34c5134d97ec07af8dd91c423397623f772adf04 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 4 May 2019 21:13:09 +0200
Subject: [PATCH 220/238] make mass input more accessible with more checks on
 form submit events

---
 static/js/utils/massInput.js | 52 +++++++++++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 10 deletions(-)

diff --git a/static/js/utils/massInput.js b/static/js/utils/massInput.js
index a861c1c75..bf17cedc9 100644
--- a/static/js/utils/massInput.js
+++ b/static/js/utils/massInput.js
@@ -24,6 +24,7 @@
   var MASS_INPUT_UTIL_SELECTOR = '[uw-mass-input]';
 
   var MASS_INPUT_CELL_SELECTOR = '.massinput__cell';
+  var MASS_INPUT_ADD_CELL_SELECTOR = '.massinput__cell--add';
   var MASS_INPUT_INITIALIZED_CLASS = 'mass-input--initialized';
 
   var massInputUtil = function(element) {
@@ -52,7 +53,9 @@
       return {
         name: MASS_INPUT_UTIL_NAME,
         element: element,
-        destroy: function() {},
+        destroy: function() {
+          reset();
+        },
       };
     }
 
@@ -80,11 +83,26 @@
 
         // find the according massinput cell thats hosts the element that triggered the submit
         var massInputCell = activeElement.closest(MASS_INPUT_CELL_SELECTOR);
+        if (!massInputCell) {
+          return false;
+        }
+
+        var submitButton = massInputCell.querySelector('button[type="submit"][name][value]');
+        if (!submitButton) {
+          return false;
+        }
+
+        var isAddCell = massInputCell.matches(MASS_INPUT_ADD_CELL_SELECTOR);
+        var submitButtonIsActive = submitButton.matches(':focus, :active');
+        // if the cell is not an add cell the active element must at least be the cells submit button
+        if (!isAddCell && !submitButtonIsActive) {
+          return false;
+        }
 
         event.preventDefault();
-        var requestBody = serializeForm(massInputCell, enctype);
+        var requestBody = serializeForm(submitButton, enctype);
 
-        if (requestFn) {
+        if (requestFn && requestBody) {
           requestFn(
             url,
             {
@@ -96,6 +114,9 @@
             return response.text();
           }).then(function(response) {
             processResponse(response);
+            if (isAddCell) {
+              reFocusAddCell();
+            }
           });
         }
       };
@@ -111,16 +132,11 @@
       }
     }
 
-    function serializeForm(massInputCell, enctype) {
+    function serializeForm(submitButton, enctype) {
       var formData = new FormData(massInputForm);
 
       // manually add name and value of submit button to formData
-      if (massInputCell) {
-        var submitButton = massInputCell.querySelector('button[type="submit"][name][value]');
-        if (submitButton) {
-          formData.append(submitButton.name, submitButton.value);
-        }
-      }
+      formData.append(submitButton.name, submitButton.value);
 
       if (enctype === 'application/x-www-form-urlencoded') {
         return new URLSearchParams(formData);
@@ -131,6 +147,22 @@
       }
     }
 
+    function reFocusAddCell() {
+      var addCell = element.querySelector(MASS_INPUT_ADD_CELL_SELECTOR);
+      if (!addCell) {
+        return false;
+      }
+
+      var addCellInput = addCell.querySelector('input:not([type="hidden"])');
+      if (addCellInput) {
+        // clear the inputs value
+        // TBD: make this work for checkboxes and radioboxes
+        // where the value should not be cleared
+        addCellInput.value = '';
+        addCellInput.focus();
+      }
+    }
+
     function reset() {
       element.classList.remove(MASS_INPUT_INITIALIZED_CLASS);
       massInputForm.removeEventListener('submit', massInputFormSubmitHandler)

From f37cecf8c2de5f4ab85e604b9e0142da6089d921 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 4 May 2019 21:44:59 +0200
Subject: [PATCH 221/238] adjust communiation templates for massinput
 requirements

---
 templates/widgets/communication/recipientAdd.hamlet   | 2 +-
 templates/widgets/communication/recipientEmail.hamlet | 2 +-
 templates/widgets/communication/recipientName.hamlet  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/widgets/communication/recipientAdd.hamlet b/templates/widgets/communication/recipientAdd.hamlet
index 3c99d2964..086224486 100644
--- a/templates/widgets/communication/recipientAdd.hamlet
+++ b/templates/widgets/communication/recipientAdd.hamlet
@@ -1,5 +1,5 @@
 $newline never
-<div .recipient-category__option-add>
+<div .recipient-category__option-add.massinput__cell.massinput__cell--add>
   #{csrf}
   ^{fvInput addView}
   ^{fvInput submitView}
diff --git a/templates/widgets/communication/recipientEmail.hamlet b/templates/widgets/communication/recipientEmail.hamlet
index 5290fcef2..a3c4f711b 100644
--- a/templates/widgets/communication/recipientEmail.hamlet
+++ b/templates/widgets/communication/recipientEmail.hamlet
@@ -1,5 +1,5 @@
 $newline never
-<div .recipient-category__option>
+<div .recipient-category__option.massinput__cell>
   #{csrf}
   ^{fvInput tickView}
   <label .recipient-category__option-label for=#{fvId tickView}>
diff --git a/templates/widgets/communication/recipientName.hamlet b/templates/widgets/communication/recipientName.hamlet
index 96b650b0d..4dd5ee014 100644
--- a/templates/widgets/communication/recipientName.hamlet
+++ b/templates/widgets/communication/recipientName.hamlet
@@ -1,5 +1,5 @@
 $newline never
-<div .recipient-category__option>
+<div .recipient-category__option.massinput__cell>
   #{csrf}
   ^{fvInput tickView}
   <label .recipient-category__option-label for=#{fvId tickView}>

From d06bfe07d09bfdc973d520e1b9eba9ccae8e58cb Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sat, 4 May 2019 22:00:19 +0200
Subject: [PATCH 222/238] prefix input ids in massinput response

---
 static/js/utils/massInput.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/static/js/utils/massInput.js b/static/js/utils/massInput.js
index bf17cedc9..fa8e075bf 100644
--- a/static/js/utils/massInput.js
+++ b/static/js/utils/massInput.js
@@ -125,6 +125,7 @@
     function processResponse(response) {
       element.innerHTML = response;
 
+      prefixInputIds();
       reset()
 
       if (UtilRegistry) {
@@ -132,6 +133,16 @@
       }
     }
 
+    function prefixInputIds() {
+      var idAttrs = ['id', 'for', 'data-conditional-input'];
+      idAttrs.forEach(function(attr) {
+        Array.from(element.querySelectorAll('[' + attr + ']')).forEach(function(input) {
+          var value = element.id + '__' + input.getAttribute(attr);
+          input.setAttribute(attr, value);
+        });
+      });
+    }
+
     function serializeForm(submitButton, enctype) {
       var formData = new FormData(massInputForm);
 

From 84e73f649aa820a8c09440421f166c3dc7e5ba53 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Sat, 4 May 2019 22:10:08 +0200
Subject: [PATCH 223/238] Only show material prime action if it makes sense

---
 messages/uniworx/de.msg |  2 +-
 src/Foundation.hs       | 29 ++++++++++++++++++++++++++++-
 src/Utils.hs            |  7 ++++---
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 91eb63eeb..adfdd8eaf 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -303,7 +303,7 @@ CorByProportionOnly proportion@Rational: #{display proportion} Anteile
 CorByProportionIncludingTutorial proportion@Rational: #{display proportion} Anteile - Tutorium
 CorByProportionExcludingTutorial proportion@Rational: #{display proportion} Anteile + Tutorium
 
-RowCount count@Int64: #{display count} #{pluralDE count "Eintrag" "Einträge"} nach Filter
+RowCount count@Int64: #{display count} #{pluralDE count "passender Eintrag" "passende Einträge"} innsgesamt
 DeleteRow: Entfernen
 ProportionNegative: Anteile dürfen nicht negativ sein
 CorrectorUpdated: Korrektor erfolgreich aktualisiert
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 0e99aba6b..9f11f90bd 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -988,6 +988,22 @@ evalAccess route isWrite = do
 evalAccessDB :: (MonadLogger m, MonadHandler m, HandlerSite m ~ UniWorX) => Route UniWorX -> Bool -> ReaderT (YesodPersistBackend UniWorX) m AuthResult
 evalAccessDB = evalAccess
 
+-- | Check whether the current user is authorized by `evalAccess` for the given route
+--   Convenience function for a commonly used code fragment
+hasAccessTo :: (MonadLogger m, MonadHandler m, HandlerSite m ~ UniWorX) => Route UniWorX -> Bool -> m Bool
+hasAccessTo route isWrite = (== Authorized) <$> evalAccess route isWrite
+
+-- | Check whether the current user is authorized by `evalAccess` to read from the given route
+--   Convenience function for a commonly used code fragment
+hasReadAccessTo :: (MonadLogger m, MonadHandler m, HandlerSite m ~ UniWorX) => Route UniWorX -> m Bool
+hasReadAccessTo = flip hasAccessTo False
+
+-- | Check whether the current user is authorized by `evalAccess` to rwrite to the given route
+--   Convenience function for a commonly used code fragment
+hasWriteAccessTo :: (MonadLogger m, MonadHandler m, HandlerSite m ~ UniWorX) => Route UniWorX -> m Bool
+hasWriteAccessTo = flip hasAccessTo True
+
+-- | Conditional redirect that hides the URL if the user is not authorized for the route
 redirectAccess :: (MonadLogger m, MonadHandler m, HandlerSite m ~ UniWorX) => Route UniWorX -> m a
 redirectAccess url = do
   -- must hide URL if not authorized
@@ -1780,7 +1796,18 @@ pageActions (CourseR tid ssh csh CShowR) =
       , menuItemIcon  = Nothing
       , menuItemRoute = SomeRoute $ CourseR tid ssh csh MaterialListR
       , menuItemModal = False
-      , menuItemAccessCallback' = return True
+      , menuItemAccessCallback' =
+          let lecturerAccess     = hasWriteAccessTo $ CourseR tid ssh csh MaterialNewR  -- Always show for lecturers that can create new material
+              materialAccess mnm = hasReadAccessTo  $ CMaterialR tid ssh csh mnm MShowR -- or show if user can see at least one of the contents
+              existsVisible  = do
+                  matNames <- E.select . E.from $ \(course `E.InnerJoin` material) -> do
+                    E.on     $ course   E.^. CourseId   E.==.   material E.^. MaterialCourse
+                    E.where_ $ course   E.^. CourseTerm      E.==. E.val tid
+                        E.&&.  course   E.^. CourseSchool    E.==. E.val ssh
+                        E.&&.  course   E.^. CourseShorthand E.==. E.val csh
+                    return $ material E.^. MaterialName
+                  anyM matNames (materialAccess . E.unValue)
+          in runDB $ lecturerAccess `or2M` existsVisible
       }
   , MenuItem
       { menuItemType = PageActionPrime
diff --git a/src/Utils.hs b/src/Utils.hs
index b96684358..5f31dfec5 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -588,7 +588,7 @@ ifM c m m' =
 ifNotM :: Monad m => m Bool -> m a -> m a -> m a
 ifNotM c = flip $ ifM c
 
--- | Monadic boolean function, copied from Andreas Abel's utility function
+-- | Short-circuiting monadic boolean function, copied from Andreas Abel's utility function
 and2M, or2M :: Monad m => m Bool -> m Bool -> m Bool
 and2M ma mb = ifM ma mb (return False)
 or2M ma = ifM ma (return True)
@@ -597,6 +597,7 @@ andM, orM :: (Foldable f, Monad m) => f (m Bool) -> m Bool
 andM = Fold.foldr and2M (return True)
 orM = Fold.foldr or2M (return False)
 
+-- | Short-circuiting monady any
 allM, anyM :: (Functor f, Foldable f, Monad m) => f a -> (a -> m Bool) -> m Bool
 allM xs f = andM $ fmap f xs
 anyM xs f = orM $ fmap f xs
@@ -801,10 +802,10 @@ setLastModified lastModified = do
     $logDebugS "LastModified" $ tshow (lastModified, ifModifiedSince)
     when (maybe False ((lastModified <=) . addUTCTime precision) ifModifiedSince)
       notModified
-  
+
   addHeader "Last-Modified" $ formatRFC1123 lastModified
   where
     precision :: NominalDiffTime
     precision = 1
-    
+
     safeMethods = [ methodGet, methodHead, methodOptions ]

From cc54609f1fab7fa68b526ee8b99f3d48b8bbed0f Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sat, 4 May 2019 22:43:56 +0200
Subject: [PATCH 224/238] Typo

---
 messages/uniworx/de.msg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index adfdd8eaf..49822549e 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -303,7 +303,7 @@ CorByProportionOnly proportion@Rational: #{display proportion} Anteile
 CorByProportionIncludingTutorial proportion@Rational: #{display proportion} Anteile - Tutorium
 CorByProportionExcludingTutorial proportion@Rational: #{display proportion} Anteile + Tutorium
 
-RowCount count@Int64: #{display count} #{pluralDE count "passender Eintrag" "passende Einträge"} innsgesamt
+RowCount count@Int64: #{display count} #{pluralDE count "passender Eintrag" "passende Einträge"} insgesamt
 DeleteRow: Entfernen
 ProportionNegative: Anteile dürfen nicht negativ sein
 CorrectorUpdated: Korrektor erfolgreich aktualisiert

From 7f9071ec96c18479b097d461dc12d40c47651e45 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 5 May 2019 00:28:50 +0200
Subject: [PATCH 225/238] unarm submit buttons in mass inputs on regular form
 submits

---
 static/js/utils/massInput.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/static/js/utils/massInput.js b/static/js/utils/massInput.js
index fa8e075bf..00713fbd8 100644
--- a/static/js/utils/massInput.js
+++ b/static/js/utils/massInput.js
@@ -25,6 +25,7 @@
 
   var MASS_INPUT_CELL_SELECTOR = '.massinput__cell';
   var MASS_INPUT_ADD_CELL_SELECTOR = '.massinput__cell--add';
+  var MASS_INPUT_SUBMIT_BUTTON_CLASS = 'massinput__submit-button';
   var MASS_INPUT_INITIALIZED_CLASS = 'mass-input--initialized';
 
   var massInputUtil = function(element) {
@@ -74,6 +75,12 @@
       }
 
       return function(event) {
+        // "unarm" submit buttons inside this massinput so browser
+        // uses correct submit button for form submission.
+        // contents of the massinput will be replaced either way,
+        // so unarming is no problem
+        unarmSubmitButtons();
+
         // check if event occured from either a mass input add/delete button or
         // from inside one of massinput's inputs (i.e. they are focused/active)
         var activeElement = element.querySelector(':focus, :active');
@@ -87,7 +94,7 @@
           return false;
         }
 
-        var submitButton = massInputCell.querySelector('button[type="submit"][name][value]');
+        var submitButton = massInputCell.querySelector('.' + MASS_INPUT_SUBMIT_BUTTON_CLASS);
         if (!submitButton) {
           return false;
         }
@@ -122,6 +129,14 @@
       };
     }
 
+    function unarmSubmitButtons() {
+      var buttons = Array.from(element.querySelectorAll('button[type="submit"][name][value]'));
+      buttons.forEach(function(button) {
+        button.setAttribute('type', 'button');
+        button.classList.add(MASS_INPUT_SUBMIT_BUTTON_CLASS);
+      });
+    }
+
     function processResponse(response) {
       element.innerHTML = response;
 

From 2f8588da966ffa60d26ad98efe6588e41fdfd678 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 5 May 2019 12:38:59 +0200
Subject: [PATCH 226/238] unarm massinput-buttons earlier

---
 static/js/utils/massInput.js | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/static/js/utils/massInput.js b/static/js/utils/massInput.js
index 00713fbd8..a7b7b5a23 100644
--- a/static/js/utils/massInput.js
+++ b/static/js/utils/massInput.js
@@ -46,6 +46,13 @@
       }
 
       massInputFormSubmitHandler = makeSubmitHandler();
+
+      // "unarm" submit buttons inside this massinput so browser
+      // uses correct submit button for form submission.
+      // contents of the massinput will be replaced either way,
+      // so unarming is no problem
+      unarmSubmitButtons(massInputFormSubmitHandler);
+
       massInputForm.addEventListener('submit', massInputFormSubmitHandler);
 
       // mark initialized
@@ -75,12 +82,6 @@
       }
 
       return function(event) {
-        // "unarm" submit buttons inside this massinput so browser
-        // uses correct submit button for form submission.
-        // contents of the massinput will be replaced either way,
-        // so unarming is no problem
-        unarmSubmitButtons();
-
         // check if event occured from either a mass input add/delete button or
         // from inside one of massinput's inputs (i.e. they are focused/active)
         var activeElement = element.querySelector(':focus, :active');
@@ -129,11 +130,13 @@
       };
     }
 
-    function unarmSubmitButtons() {
+    function unarmSubmitButtons(submitHandler) {
       var buttons = Array.from(element.querySelectorAll('button[type="submit"][name][value]'));
       buttons.forEach(function(button) {
         button.setAttribute('type', 'button');
         button.classList.add(MASS_INPUT_SUBMIT_BUTTON_CLASS);
+
+        button.addEventListener('click', submitHandler);
       });
     }
 
@@ -192,6 +195,12 @@
     function reset() {
       element.classList.remove(MASS_INPUT_INITIALIZED_CLASS);
       massInputForm.removeEventListener('submit', massInputFormSubmitHandler)
+
+      Array.from(element.querySelectorAll('.' + MASS_INPUT_SUBMIT_BUTTON_CLASS)).forEach(function(button) {
+        button.removeEventListener('click', submitHandler);
+        button.classList.remove(MASS_INPUT_SUBMIT_BUTTON_CLASS);
+        button.setAttribute('type', 'submit');
+      });
     }
 
     return init();

From 83eb22896ed0529c538f6de3ea365a9a5afe510d Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 5 May 2019 12:49:28 +0200
Subject: [PATCH 227/238] Fix typo

---
 static/js/utils/massInput.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/js/utils/massInput.js b/static/js/utils/massInput.js
index a7b7b5a23..1b5cf10ac 100644
--- a/static/js/utils/massInput.js
+++ b/static/js/utils/massInput.js
@@ -197,7 +197,7 @@
       massInputForm.removeEventListener('submit', massInputFormSubmitHandler)
 
       Array.from(element.querySelectorAll('.' + MASS_INPUT_SUBMIT_BUTTON_CLASS)).forEach(function(button) {
-        button.removeEventListener('click', submitHandler);
+        button.removeEventListener('click', massInputFormSubmitHandler);
         button.classList.remove(MASS_INPUT_SUBMIT_BUTTON_CLASS);
         button.setAttribute('type', 'submit');
       });

From 70d3ebcd2c62111ec67dce9afd2aa8a2152566e4 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 5 May 2019 13:21:00 +0200
Subject: [PATCH 228/238] Handle potentially multiple async massinputs per page

---
 src/Handler/Utils/Form/MassInput.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Handler/Utils/Form/MassInput.hs b/src/Handler/Utils/Form/MassInput.hs
index f6a383e7c..31696d224 100644
--- a/src/Handler/Utils/Form/MassInput.hs
+++ b/src/Handler/Utils/Form/MassInput.hs
@@ -415,7 +415,7 @@ massInput MassInput{..} FieldSettings{..} fvRequired initialResult csrf = do
 
   MsgRenderer mr <- getMsgRenderer
 
-  whenM (hasCustomHeader HeaderMassInputShortcircuit) . liftHandlerT $ do
+  whenM ((== Just fvId) <$> lookupCustomHeader HeaderMassInputShortcircuit) . liftHandlerT $ do
     PageContent{..} <- widgetToPageContent $(widgetFile "widgets/massinput/massinput-standalone")
     ur <- getUrlRenderParams
 

From 7c2201da8b06b87f82433482ece25b3dfc8f4190 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 5 May 2019 15:02:30 +0200
Subject: [PATCH 229/238] fix massinput click handling

---
 static/js/utils/massInput.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/static/js/utils/massInput.js b/static/js/utils/massInput.js
index 1b5cf10ac..85e7049cb 100644
--- a/static/js/utils/massInput.js
+++ b/static/js/utils/massInput.js
@@ -82,9 +82,16 @@
       }
 
       return function(event) {
+        var activeElement;
+        
         // check if event occured from either a mass input add/delete button or
         // from inside one of massinput's inputs (i.e. they are focused/active)
-        var activeElement = element.querySelector(':focus, :active');
+        if (event.type === 'click') {
+          activeElement = event.target;
+        } else {
+          activeElement = element.querySelector(':focus, :active');
+        }
+        
         if (!activeElement) {
           return false;
         }

From ab2b187b637a6458d4b016bebdaf4ac893b2074e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 5 May 2019 15:02:36 +0200
Subject: [PATCH 230/238] Add missing massinput-classes

---
 templates/tutorial/tutorMassInput/layout.hamlet          | 4 ++--
 templates/widgets/occurence/form/except-layout.hamlet    | 4 ++--
 templates/widgets/occurence/form/scheduled-layout.hamlet | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/tutorial/tutorMassInput/layout.hamlet b/templates/tutorial/tutorMassInput/layout.hamlet
index 8dc00bc90..65352dd95 100644
--- a/templates/tutorial/tutorMassInput/layout.hamlet
+++ b/templates/tutorial/tutorMassInput/layout.hamlet
@@ -2,10 +2,10 @@ $newline never
 <table>
   <tbody>
     $forall coord <- review liveCoords lLength
-      <tr .massinput--cell>
+      <tr .massinput__cell>
         ^{cellWdgts ! coord}
         <td>
           ^{fvInput (delButtons ! coord)}
   <tfoot>
-    <tr .massinput--add>
+    <tr .massinput__cell.massinput__cell--add>
       ^{addWdgts ! (0, 0)}
diff --git a/templates/widgets/occurence/form/except-layout.hamlet b/templates/widgets/occurence/form/except-layout.hamlet
index 8dc00bc90..65352dd95 100644
--- a/templates/widgets/occurence/form/except-layout.hamlet
+++ b/templates/widgets/occurence/form/except-layout.hamlet
@@ -2,10 +2,10 @@ $newline never
 <table>
   <tbody>
     $forall coord <- review liveCoords lLength
-      <tr .massinput--cell>
+      <tr .massinput__cell>
         ^{cellWdgts ! coord}
         <td>
           ^{fvInput (delButtons ! coord)}
   <tfoot>
-    <tr .massinput--add>
+    <tr .massinput__cell.massinput__cell--add>
       ^{addWdgts ! (0, 0)}
diff --git a/templates/widgets/occurence/form/scheduled-layout.hamlet b/templates/widgets/occurence/form/scheduled-layout.hamlet
index 8dc00bc90..65352dd95 100644
--- a/templates/widgets/occurence/form/scheduled-layout.hamlet
+++ b/templates/widgets/occurence/form/scheduled-layout.hamlet
@@ -2,10 +2,10 @@ $newline never
 <table>
   <tbody>
     $forall coord <- review liveCoords lLength
-      <tr .massinput--cell>
+      <tr .massinput__cell>
         ^{cellWdgts ! coord}
         <td>
           ^{fvInput (delButtons ! coord)}
   <tfoot>
-    <tr .massinput--add>
+    <tr .massinput__cell.massinput__cell--add>
       ^{addWdgts ! (0, 0)}

From aa36bd88b7a63789da1aac24d6b3400e8763a21c Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 5 May 2019 15:21:47 +0200
Subject: [PATCH 231/238] Dispatch async-massinput by custom ident

---
 src/Handler/Admin.hs                         |  2 +-
 src/Handler/Course.hs                        |  3 +++
 src/Handler/Sheet.hs                         |  3 +++
 src/Handler/Term.hs                          |  2 +-
 src/Handler/Tutorial.hs                      |  4 +--
 src/Handler/Utils/Communication.hs           |  2 ++
 src/Handler/Utils/Form/MassInput.hs          | 28 +++++++++++++-------
 src/Handler/Utils/Form/Occurences.hs         |  6 +++--
 static/js/utils/massInput.js                 |  2 +-
 templates/widgets/massinput/massinput.hamlet |  2 +-
 10 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs
index 2180e28e8..943e34e9a 100644
--- a/src/Handler/Admin.hs
+++ b/src/Handler/Admin.hs
@@ -205,7 +205,7 @@ postAdminTestR = do
 
   -- The actual call to @massInput@ is comparatively simple:
 
-  ((miResult, fvInput -> miForm), miEnc) <- runFormPost . identifyForm ("massinput" :: Text) $ massInput (MassInput mkAddForm mkCellForm deleteCell allowAdd (\_ _ _ -> Set.empty) buttonAction defaultMiLayout) "" True Nothing
+  ((miResult, fvInput -> miForm), miEnc) <- runFormPost . identifyForm ("massinput" :: Text) $ massInput (MassInput mkAddForm mkCellForm deleteCell allowAdd (\_ _ _ -> Set.empty) buttonAction defaultMiLayout ("massinput" :: Text)) "" True Nothing
 
 
   let locallyDefinedPageHeading = [whamlet|Admin TestPage for Uni2work|]
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 13da90fbf..55ad19245 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -763,6 +763,9 @@ makeCourseForm miButtonAction template = identifyForm FIDcourse $ \html -> do
                  -> Widget
         miLayout lLength _ cellWdgts delButtons addWdgts = $(widgetFile "course/lecturerMassInput/layout")
 
+        miIdent :: Text
+        miIdent = "lecturers"
+
 
         lecturerForm :: AForm Handler [Either (UserEmail, Maybe LecturerType) (UserId, LecturerType)]
         lecturerForm = formToAForm . over (mapped._2) pure . over (mapped._1.mapped) (map liftEither . Map.elems) $ massInput
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index e5c86ed26..b0e11604f 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -730,6 +730,9 @@ correctorForm shid = wFormToAForm $ do
              -> Widget
     miLayout lLength _ cellWdgts delButtons addWdgts = $(widgetFile "sheetCorrectors/layout")
 
+    miIdent :: Text
+    miIdent = "correctors"
+
     postProcess :: Map ListPosition (Either UserEmail UserId, (CorrectorState, Load)) -> Set (Either SheetCorrectorInvitation SheetCorrector)
     postProcess = Set.fromList . map postProcess' . Map.elems
       where
diff --git a/src/Handler/Term.hs b/src/Handler/Term.hs
index abf1421bd..08e960581 100644
--- a/src/Handler/Term.hs
+++ b/src/Handler/Term.hs
@@ -256,7 +256,7 @@ newTermForm template html = do
         = aforced termNewField (fslpI MsgTerm (mr MsgTermPlaceholder)) tid
         | otherwise
         = areq termNewField (fslpI MsgTerm (mr MsgTermPlaceholder)) Nothing
-      holidayForm = formToAForm . over (mapped._2) pure $ massInputList dayField (const $ "" & addPlaceholder (mr MsgTermHolidayPlaceholder)) (const Nothing) (fslI MsgTermHolidays & setTooltip MsgMassInputTip) True (tftHolidays template) mempty
+      holidayForm = formToAForm . over (mapped._2) pure $ massInputList dayField (const $ "" & addPlaceholder (mr MsgTermHolidayPlaceholder)) (const Nothing) ("holidays" :: Text) (fslI MsgTermHolidays & setTooltip MsgMassInputTip) True (tftHolidays template) mempty
     (result, widget) <- flip (renderAForm FormStandard) html $ Term
       <$> tidForm
       <*> areq dayField  (fslI MsgTermStartDay & setTooltip MsgTermStartDayTooltip) (tftStart template)
diff --git a/src/Handler/Tutorial.hs b/src/Handler/Tutorial.hs
index 93b09166c..7a07c6a55 100644
--- a/src/Handler/Tutorial.hs
+++ b/src/Handler/Tutorial.hs
@@ -213,7 +213,7 @@ tutorialForm cid template html = do
   uid <- liftHandlerT requireAuthId
 
   let 
-    tutorForm = Set.fromList <$> massInputAccumA miAdd' miCell' (\p -> Just . SomeRoute $ cRoute :#: p) miLayout' (fslI MsgTutorialTutors & setTooltip MsgMassInputTip) True (Set.toList . tfTutors <$> template)
+    tutorForm = Set.fromList <$> massInputAccumA miAdd' miCell' (\p -> Just . SomeRoute $ cRoute :#: p) miLayout' ("tutors" :: Text) (fslI MsgTutorialTutors & setTooltip MsgMassInputTip) True (Set.toList . tfTutors <$> template)
       where
         miAdd' :: (Text -> Text) -> FieldView UniWorX -> Form ([UserId] -> FormResult [UserId])
         miAdd' nudge submitView csrf = do
@@ -245,7 +245,7 @@ tutorialForm cid template html = do
     <*> areq (ciField & addDatalist tutTypeDatalist) (fslpI MsgTutorialType $ mr MsgTutorialType) (tfType <$> template)
     <*> aopt (natFieldI MsgTutorialCapacityNonPositive) (fslpI MsgTutorialCapacity (mr MsgTutorialCapacity) & setTooltip MsgTutorialCapacityTip) (tfCapacity <$> template)
     <*> areq textField (fslpI MsgTutorialRoom $ mr MsgTutorialRoomPlaceholder) (tfRoom <$> template)
-    <*> occurencesAForm (tfTime <$> template)
+    <*> occurencesAForm ("occurences" :: Text) (tfTime <$> template)
     <*> fmap (assertM (not . Text.null . CI.original) . fmap (CI.map Text.strip)) (aopt ciField (fslI MsgTutorialRegGroup & setTooltip MsgTutorialRegGroupTip) ((tfRegGroup <$> template) <|> Just (Just "tutorial")))
     <*> aopt utcTimeField   (fslpI MsgRegisterFrom (mr MsgDate)
                                & setTooltip MsgCourseRegisterFromTip
diff --git a/src/Handler/Utils/Communication.hs b/src/Handler/Utils/Communication.hs
index 9ca46ae15..c82c574ee 100644
--- a/src/Handler/Utils/Communication.hs
+++ b/src/Handler/Utils/Communication.hs
@@ -165,6 +165,8 @@ commR CommunicationRoute{..} =  do
           miDelete :: MapLiveliness (EnumLiveliness RecipientCategory) ListLength -> (EnumPosition RecipientCategory, ListPosition) -> MaybeT (MForm Handler) (Map (EnumPosition RecipientCategory, ListPosition) (EnumPosition RecipientCategory, ListPosition))
           -- miDelete liveliness@(MapLiveliness lMap) (EnumPosition RecipientCustom, delPos) = mappend (Map.fromSet id . Set.filter (\(EnumPosition c, _) -> c /= RecipientCustom) $ review liveCoords liveliness) . fmap (EnumPosition RecipientCustom, ) . Map.mapKeysMonotonic (EnumPosition RecipientCustom, ) <$> miDeleteList (lMap ! EnumPosition RecipientCustom) delPos
           miDelete _ _ = mzero
+          miIdent :: Text
+          miIdent = "recipients"
           postProcess :: Map (EnumPosition RecipientCategory, ListPosition) (Either UserEmail UserId, Bool) -> Set (Either UserEmail UserId)
           postProcess = Set.fromList . map fst . filter snd . Map.elems
 
diff --git a/src/Handler/Utils/Form/MassInput.hs b/src/Handler/Utils/Form/MassInput.hs
index 31696d224..664b0f3c7 100644
--- a/src/Handler/Utils/Form/MassInput.hs
+++ b/src/Handler/Utils/Form/MassInput.hs
@@ -234,7 +234,7 @@ data MassInputException = MassInputInvalidShape
 
 instance Exception MassInputException
 
-data MassInput handler liveliness cellData cellResult = MassInput
+data MassInput handler liveliness cellData cellResult = forall i. PathPiece i => MassInput
   { miAdd :: BoxCoord liveliness -- Position (dimensions after @dimIx@ are zero)
           -> Natural -- Zero-based dimension index @dimIx@
           -> (Text -> Text) -- Nudge deterministic field ids
@@ -258,6 +258,7 @@ data MassInput handler liveliness cellData cellResult = MassInput
                -> Set (BoxCoord liveliness) -- ^ Usually addition widgets are only provided for dimension 0 and all _lines_ that have at least one live coordinate. `miAddEmpty` allows specifying when to provide additional widgets
   , miButtonAction :: forall p. PathPiece p => p -> Maybe (SomeRoute UniWorX) -- ^ Override form-tag route for `massInput`-Buttons to keep the user closer to the Widget, the `PathPiece` Argument is to be used for constructiong a `Fragment`
   , miLayout :: MassInputLayout liveliness cellData cellResult
+  , miIdent :: i
   }
 
 type MassInputLayout liveliness cellData cellResult
@@ -279,7 +280,7 @@ massInput :: forall handler cellData cellResult liveliness.
           -> Bool -- ^ Required?
           -> Maybe (Map (BoxCoord liveliness) (cellData, cellResult))
           -> (Markup -> MForm handler (FormResult (Map (BoxCoord liveliness) (cellData, cellResult)), FieldView UniWorX))
-massInput MassInput{..} FieldSettings{..} fvRequired initialResult csrf = do
+massInput MassInput{ miIdent = toPathPiece -> miIdent, ..} FieldSettings{..} fvRequired initialResult csrf = do
   let initialShape = fmap fst <$> initialResult
 
   miName <- maybe newFormIdent return fsName
@@ -415,7 +416,7 @@ massInput MassInput{..} FieldSettings{..} fvRequired initialResult csrf = do
 
   MsgRenderer mr <- getMsgRenderer
 
-  whenM ((== Just fvId) <$> lookupCustomHeader HeaderMassInputShortcircuit) . liftHandlerT $ do
+  whenM ((== Just miIdent) <$> lookupCustomHeader HeaderMassInputShortcircuit) . liftHandlerT $ do
     PageContent{..} <- widgetToPageContent $(widgetFile "widgets/massinput/massinput-standalone")
     ur <- getUrlRenderParams
 
@@ -454,18 +455,20 @@ listMiLayout lLength _ cellWdgts delButtons addWdgts = $(widgetFile "widgets/mas
 
 
 -- | Wrapper around `massInput` for the common case, that we just want an arbitrary list of single fields without any constraints
-massInputList :: forall handler cellResult.
+massInputList :: forall handler cellResult ident.
                  ( MonadHandler handler, HandlerSite handler ~ UniWorX
                  , MonadLogger handler
+                 , PathPiece ident
                  )
               => Field handler cellResult
               -> (ListPosition -> FieldSettings UniWorX)
               -> (forall p. PathPiece p => p -> Maybe (SomeRoute UniWorX))
+              -> ident
               -> FieldSettings UniWorX
               -> Bool
               -> Maybe [cellResult]
               -> (Markup -> MForm handler (FormResult [cellResult], FieldView UniWorX))
-massInputList field fieldSettings miButtonAction miSettings miRequired miPrevResult = over (mapped . _1 . mapped) (map snd . Map.elems) . massInput
+massInputList field fieldSettings miButtonAction miIdent miSettings miRequired miPrevResult = over (mapped . _1 . mapped) (map snd . Map.elems) . massInput
   MassInput { miAdd = \_ _ _ submitBtn -> Just $ \csrf ->
                 return (FormSuccess $ \pRes -> FormSuccess $ Map.singleton (maybe 0 succ . fmap fst $ Map.lookupMax pRes) (), toWidget csrf >> fvInput submitBtn)
             , miCell = \pos () iRes nudge csrf ->
@@ -475,26 +478,29 @@ massInputList field fieldSettings miButtonAction miSettings miRequired miPrevRes
             , miAddEmpty = \_ _ _ -> Set.empty
             , miButtonAction
             , miLayout = listMiLayout
+            , miIdent
             }
   miSettings
   miRequired
   (Map.fromList . zip [0..] . map ((), ) <$> miPrevResult)
 
 -- | Wrapper around `massInput` for the common case, that we just want a list of data with no option to modify it except deletion and addition
-massInputAccum :: forall handler cellData.
+massInputAccum :: forall handler cellData ident.
                   ( MonadHandler handler, HandlerSite handler ~ UniWorX
                   , MonadLogger handler
                   , ToJSON cellData, FromJSON cellData
+                  , PathPiece ident
                   )
                => ((Text -> Text) -> FieldView UniWorX -> (Markup -> MForm handler (FormResult ([cellData] -> FormResult [cellData]), Widget)))
                -> (cellData -> Widget)
                -> (forall p. PathPiece p => p -> Maybe (SomeRoute UniWorX))
                -> MassInputLayout ListLength cellData ()
+               -> ident
                -> FieldSettings UniWorX
                -> Bool
                -> Maybe [cellData]
                -> (Markup -> MForm handler (FormResult [cellData], FieldView UniWorX))
-massInputAccum miAdd' miCell' miButtonAction miLayout fSettings fRequired mPrev csrf
+massInputAccum miAdd' miCell' miButtonAction miLayout miIdent fSettings fRequired mPrev csrf
   = over (_1 . mapped) (map fst . Map.elems) <$> massInput MassInput{..} fSettings fRequired (Map.fromList . zip [0..] . map (, ()) <$> mPrev) csrf
   where
     miAdd :: ListPosition -> Natural
@@ -518,21 +524,23 @@ massInputAccum miAdd' miCell' miButtonAction miLayout fSettings fRequired mPrev
 
     miAddEmpty _ _ _ = Set.empty
 
-massInputAccumA :: forall handler cellData.
+massInputAccumA :: forall handler cellData ident.
                   ( MonadHandler handler, HandlerSite handler ~ UniWorX
                   , MonadLogger handler
                   , ToJSON cellData, FromJSON cellData
+                  , PathPiece ident
                   )
                => ((Text -> Text) -> FieldView UniWorX -> (Markup -> MForm handler (FormResult ([cellData] -> FormResult [cellData]), Widget)))
                -> (cellData -> Widget)
                -> (forall p. PathPiece p => p -> Maybe (SomeRoute UniWorX))
                -> MassInputLayout ListLength cellData ()
+               -> ident
                -> FieldSettings UniWorX
                -> Bool
                -> Maybe [cellData]
                -> AForm handler [cellData]
-massInputAccumA miAdd' miCell' miButtonAction' miLayout' fSettings fRequired mPrev
-  = formToAForm $ over _2 pure <$> massInputAccum miAdd' miCell' miButtonAction' miLayout' fSettings fRequired mPrev mempty
+massInputAccumA miAdd' miCell' miButtonAction' miLayout' miIdent' fSettings fRequired mPrev
+  = formToAForm $ over _2 pure <$> massInputAccum miAdd' miCell' miButtonAction' miLayout' miIdent' fSettings fRequired mPrev mempty
 
 
 massInputA :: forall handler cellData cellResult liveliness.
diff --git a/src/Handler/Utils/Form/Occurences.hs b/src/Handler/Utils/Form/Occurences.hs
index 4c5905b6b..d010c6a5e 100644
--- a/src/Handler/Utils/Form/Occurences.hs
+++ b/src/Handler/Utils/Form/Occurences.hs
@@ -34,8 +34,8 @@ nullaryPathPiece ''OccurenceExceptionKind $ camelToPathPiece' 2
 embedRenderMessage ''UniWorX ''OccurenceExceptionKind id
 
 
-occurencesAForm :: Maybe Occurences -> AForm Handler Occurences
-occurencesAForm mPrev = wFormToAForm $ do
+occurencesAForm :: PathPiece ident => ident -> Maybe Occurences -> AForm Handler Occurences
+occurencesAForm (toPathPiece -> miIdent') mPrev = wFormToAForm $ do
   Just cRoute <- getCurrentRoute
   
   let
@@ -45,6 +45,7 @@ occurencesAForm mPrev = wFormToAForm $ do
       miCell'
       (\p -> Just . SomeRoute $ cRoute :#: p)
       miLayout'
+      (miIdent' <> "__scheduled" :: Text)
       (fslI MsgScheduleRegular & setTooltip MsgMassInputTip)
       False
       (Set.toList . occurencesScheduled <$> mPrev)
@@ -80,6 +81,7 @@ occurencesAForm mPrev = wFormToAForm $ do
       miCell'
       (\p -> Just . SomeRoute $ cRoute :#: p)
       miLayout'
+      (miIdent' <> "__exceptions" :: Text)
       (fslI MsgScheduleExceptions & setTooltip (UniWorXMessages [SomeMessage MsgScheduleExceptionsTip, SomeMessage MsgMassInputTip]))
       False
       (Set.toList . occurencesExceptions <$> mPrev)
diff --git a/static/js/utils/massInput.js b/static/js/utils/massInput.js
index 85e7049cb..8e15a4f79 100644
--- a/static/js/utils/massInput.js
+++ b/static/js/utils/massInput.js
@@ -38,7 +38,7 @@
         throw new Error('Mass Input utility cannot be setup without an element!');
       }
 
-      massInputId = element.id;
+      massInputId = element.dataset.massInputIdent || '_';
       massInputForm = element.closest('form');
 
       if (!massInputForm) {
diff --git a/templates/widgets/massinput/massinput.hamlet b/templates/widgets/massinput/massinput.hamlet
index 9a8ef2534..e07aa1f71 100644
--- a/templates/widgets/massinput/massinput.hamlet
+++ b/templates/widgets/massinput/massinput.hamlet
@@ -1,5 +1,5 @@
 $newline never
-<div .massinput uw-mass-input ##{fvId}>
+<div .massinput uw-mass-input data-mass-input-ident=#{miIdent} ##{fvId}>
   #{csrf}
   ^{shapeInput}
   ^{miWidget}

From 22c01d988cdd1d118ace88d5393c75c9e54a947a Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 5 May 2019 16:45:58 +0200
Subject: [PATCH 232/238] Generic invitations for everything

---
 messages/uniworx/de.msg                       |   7 +
 models/courses                                |   6 -
 models/sheets                                 |   7 -
 routes                                        |   3 +-
 src/Handler/Course.hs                         |  10 +-
 src/Handler/Sheet.hs                          | 135 ++++++++++--------
 src/Handler/Tutorial.hs                       | 113 ++++++++++++---
 src/Handler/Utils/Invitations.hs              |  48 +++++--
 src/Jobs.hs                                   |   1 -
 src/Jobs/Handler/CorrectorInvitation.hs       |  42 ------
 src/Jobs/Types.hs                             |   3 -
 src/Model.hs                                  |   3 -
 src/Utils/Lens.hs                             |   2 -
 templates/sheetCorrInvite.hamlet              |   3 -
 templates/tutorial/tutorMassInput/add.hamlet  |   2 +-
 .../tutorMassInput/cellInvitation.hamlet      |   9 ++
 .../tutorial/tutorMassInput/cellKnown.hamlet  |   2 +-
 17 files changed, 233 insertions(+), 163 deletions(-)
 delete mode 100644 src/Jobs/Handler/CorrectorInvitation.hs
 delete mode 100644 templates/sheetCorrInvite.hamlet
 create mode 100644 templates/tutorial/tutorMassInput/cellInvitation.hamlet

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 8ffd3ec53..9079b16da 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -552,6 +552,8 @@ InvitationAcceptDecline: Einladung annehmen/ablehnen
 
 MailSubjectCorrectorInvitation tid@TermId ssh@SchoolId csh@CourseShorthand shn@SheetName: [#{display tid}-#{display ssh}-#{csh}] Einladung zum Korrektor für #{shn}
 
+MailSubjectTutorInvitation tid@TermId ssh@SchoolId csh@CourseShorthand tutn@TutorialName: [#{display tid}-#{display ssh}-#{csh}] Einladung zum Tutor für #{tutn}
+
 SheetGrading: Bewertung
 SheetGradingPoints maxPoints@Points: #{tshow maxPoints} Punkte
 SheetGradingPassPoints maxPoints@Points passingPoints@Points: Bestanden ab #{tshow passingPoints} von #{tshow maxPoints} Punkten
@@ -817,6 +819,11 @@ CorrectorInvitationDeclined shn@SheetName: Sie haben die Einladung, Korrektor f
 SheetCorrInviteHeading shn@SheetName: Einladung zum Korrektor für #{shn}
 SheetCorrInviteExplanation: Sie wurden eingeladen, Korrektor für ein Übungsblatt zu sein.
 
+TutorInvitationAccepted tutn@TutorialName: Sie wurden als Tutor für #{tutn} eingetragen
+TutorInvitationDeclined tutn@TutorialName: Sie haben die Einladung, Tutor für #{tutn} zu werden, abgelehnt
+TutorInviteHeading tutn@TutorialName: Einladung zum Tutor für #{tutn}
+TutorInviteExplanation: Sie wurden eingeladen, Tutor zu sein.
+
 InvitationAction: Aktion
 InvitationActionTip: Abgelehnte Einladungen können nicht mehr angenommen werden
 InvitationMissingRestrictions: Authorisierungs-Token fehlen benötigte Daten
diff --git a/models/courses b/models/courses
index 45166d7d5..4fcf67d65 100644
--- a/models/courses
+++ b/models/courses
@@ -35,12 +35,6 @@ Lecturer                       -- course ownership
     course       CourseId
     type         LecturerType  default='"lecturer"'
     UniqueLecturer user course -- note: multiple lecturers per course are allowed, but no duplicated rows in this table
-LecturerInvitation json        -- preliminary course ownership for when a token to become `Lecturer` is sent to an email
-    email        (CI Text)
-    course       CourseId
-    type         LecturerType Maybe
-    UniqueLecturerInvitation email course
-    deriving Eq Ord Read Show Generic Typeable
 CourseParticipant                      -- course enrolement
     course       CourseId
     user         UserId
diff --git a/models/sheets b/models/sheets
index 293d75b2f..f8d21a6c2 100644
--- a/models/sheets
+++ b/models/sheets
@@ -35,13 +35,6 @@ SheetCorrector                -- grant corrector role to user for a sheet
     state           CorrectorState default='CorrectorNormal' -- whether a corrector is assigned his load this time (e.g. in case of sickness)
     UniqueSheetCorrector user sheet
     deriving Show Eq Ord
-SheetCorrectorInvitation json
-    email           UserEmail
-    sheet           SheetId
-    load            Load
-    state           CorrectorState
-    UniqueSheetCorrectorInvitation email sheet
-    deriving Show Read Eq Ord Generic Typeable
 SheetFile                     -- a file that is part of an exercise sheet
     sheet           SheetId
     file            FileId
diff --git a/routes b/routes
index 0c6712fff..5ab08b660 100644
--- a/routes
+++ b/routes
@@ -108,7 +108,7 @@
       !/#SubmissionFileType/*FilePath SubDownloadR           GET      !owner !corrector
     /correctors                 SCorrR        GET POST
     /pseudonym                  SPseudonymR   GET POST        !course-registeredANDcorrector-submissions
-    /corrector-invite/#UserEmail SCorrInviteR     GET POST
+    /corrector-invite           SCorrInviteR  GET POST
     !/#SheetFileType/*FilePath  SFileR        GET             !timeANDcourse-registered !timeANDmaterials !corrector
   /tuts                         CTutorialListR GET            !tutor
   /tuts/new                     CTutorialNewR  GET POST
@@ -118,6 +118,7 @@
     /participants             TUsersR         GET POST        !tutor
     /register                 TRegisterR          POST        !timeANDcapacityANDcourse-registeredANDregister-group !timeANDtutorial-registered
     /communication            TCommR          GET POST        !tutor
+    /tutor-invite             TInviteR        GET POST
 
 
 /subs  CorrectionsR GET POST !corrector !lecturer
diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index 40e49c343..e05481c8a 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -535,7 +535,7 @@ pgCEditR tid ssh csh = do
   courseData <- runDB $ do
       mbCourse     <- getBy (TermSchoolCourseShort tid ssh csh)
       mbLecs       <- for mbCourse $ \course -> map entityVal <$> selectList [LecturerCourse ==. entityKey course] [Asc LecturerType]
-      mbLecInvites <- for mbCourse $ \course -> map entityVal <$> selectList [LecturerInvitationCourse ==. entityKey course] [Asc LecturerInvitationType]
+      mbLecInvites <- for mbCourse $ sourceInvitationsList . entityKey
       return $ (,,) <$> mbCourse <*> mbLecs <*> mbLecInvites
   -- IMPORTANT: both GET and POST Handler must use the same template,
   --    since an Edit is identified via CourseID, which is not embedded in the received form data for security reasons.
@@ -684,8 +684,8 @@ lecturerInvitationConfig = InvitationConfig{..}
     invitationResolveFor = do
       Just (CourseR tid csh ssh CLecInviteR) <- getCurrentRoute
       getKeyBy404 $ TermSchoolCourseShort tid csh ssh
-    invitationSubject Course{..} _ = SomeMessage $ MsgMailSubjectLecturerInvitation courseTerm courseSchool courseShorthand
-    invitationHeading Course{..} _ = SomeMessage $ MsgCourseLecInviteHeading $ CI.original courseName
+    invitationSubject Course{..} _ = return . SomeMessage $ MsgMailSubjectLecturerInvitation courseTerm courseSchool courseShorthand
+    invitationHeading Course{..} _ = return . SomeMessage $ MsgCourseLecInviteHeading $ CI.original courseName
     invitationExplanation _ _ = [ihamlet|_{SomeMessage MsgCourseLecInviteExplanation}|]
     invitationTokenConfig _ _ = do
       itAuthority <- liftHandlerT requireAuthId
@@ -720,7 +720,7 @@ data CourseForm = CourseForm
         , cfLecturers  :: [Either (UserEmail, Maybe LecturerType) (UserId, LecturerType)]
         }
 
-courseToForm :: Entity Course -> [Lecturer] -> [LecturerInvitation] -> CourseForm
+courseToForm :: Entity Course -> [Lecturer] -> [(UserEmail, InvitationDBData Lecturer)] -> CourseForm
 courseToForm (Entity cid Course{..}) lecs lecInvites = CourseForm
     { cfCourseId   = Just cid
     , cfName       = courseName
@@ -736,7 +736,7 @@ courseToForm (Entity cid Course{..}) lecs lecInvites = CourseForm
     , cfRegTo      = courseRegisterTo
     , cfDeRegUntil = courseDeregisterUntil
     , cfLecturers  = [Right (lecturerUser, lecturerType) | Lecturer{..} <- lecs]
-                  ++ [Left (lecturerInvitationEmail, lecturerInvitationType) | LecturerInvitation{..} <- lecInvites ]
+                  ++ [Left (email, mType) | (email, InvDBDataLecturer mType) <- lecInvites ]
     }
 
 makeCourseForm :: (forall p. PathPiece p => p -> Maybe (SomeRoute UniWorX)) -> Maybe CourseForm -> Form CourseForm
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 8448a5203..478f00a91 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -1,3 +1,5 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
 module Handler.Sheet where
 
 import Import
@@ -13,6 +15,7 @@ import Handler.Utils.Table.Cells
 import Handler.Utils.SheetType
 import Handler.Utils.Delete
 import Handler.Utils.Form.MassInput
+import Handler.Utils.Invitations
 
 -- import Data.Time
 -- import qualified Data.Text as T
@@ -56,6 +59,9 @@ import Utils.Lens
 import Control.Monad.Random.Class (MonadRandom(..))
 import Utils.Sql
 
+import Data.Aeson hiding (Result(..))
+import Text.Hamlet (ihamlet)
+
 
 {-
   * Implement Handlers
@@ -637,7 +643,7 @@ defaultLoads shid = do
     toMap = foldMap $ \(E.Value uid, E.Value load, E.Value state) -> Map.singleton (Right uid) (state, load)
 
 
-correctorForm :: SheetId -> AForm Handler (Set (Either SheetCorrectorInvitation SheetCorrector))
+correctorForm :: SheetId -> AForm Handler (Set (Either (Invitation' SheetCorrector) SheetCorrector))
 correctorForm shid = wFormToAForm $ do
   Just currentRoute <- liftHandlerT getCurrentRoute
   userId <- liftHandlerT requireAuthId
@@ -647,7 +653,7 @@ correctorForm shid = wFormToAForm $ do
     currentLoads :: DB Loads
     currentLoads = Map.union
       <$> fmap (foldMap $ \(Entity _ SheetCorrector{..}) -> Map.singleton (Right sheetCorrectorUser) (sheetCorrectorState, sheetCorrectorLoad)) (selectList [ SheetCorrectorSheet ==. shid ] [])
-      <*> fmap (foldMap $ \(Entity _ SheetCorrectorInvitation{..}) -> Map.singleton (Left sheetCorrectorInvitationEmail) (sheetCorrectorInvitationState, sheetCorrectorInvitationLoad)) (selectList [ SheetCorrectorInvitationSheet ==. shid ] [])
+      <*> fmap (foldMap $ \(email, InvDBDataSheetCorrector load state) -> Map.singleton (Left email) (state, load)) (sourceInvitationsList shid)
   (defaultLoads', currentLoads') <- liftHandlerT . runDB $ (,) <$> defaultLoads shid <*> currentLoads
 
   isWrite <- liftHandlerT $ isWriteRequest currentRoute
@@ -743,22 +749,20 @@ correctorForm shid = wFormToAForm $ do
              -> Widget
     miLayout lLength _ cellWdgts delButtons addWdgts = $(widgetFile "sheetCorrectors/layout")
 
-    postProcess :: Map ListPosition (Either UserEmail UserId, (CorrectorState, Load)) -> Set (Either SheetCorrectorInvitation SheetCorrector)
+    postProcess :: Map ListPosition (Either UserEmail UserId, (CorrectorState, Load)) -> Set (Either (Invitation' SheetCorrector) SheetCorrector)
     postProcess = Set.fromList . map postProcess' . Map.elems
       where
         sheetCorrectorSheet = shid
-        sheetCorrectorInvitationSheet = shid
 
-        postProcess' :: (Either UserEmail UserId, (CorrectorState, Load)) -> Either SheetCorrectorInvitation SheetCorrector
+        postProcess' :: (Either UserEmail UserId, (CorrectorState, Load)) -> Either (Invitation' SheetCorrector) SheetCorrector
         postProcess' (Right sheetCorrectorUser, (sheetCorrectorState, sheetCorrectorLoad)) = Right SheetCorrector{..}
-        postProcess' (Left sheetCorrectorInvitationEmail, (sheetCorrectorInvitationState, sheetCorrectorInvitationLoad)) = Left SheetCorrectorInvitation{..}
+        postProcess' (Left email, (state, load)) = Left (email, shid, (InvDBDataSheetCorrector load state, InvTokenDataSheetCorrector))
 
   fmap postProcess <$> massInputW MassInput{..} (fslI MsgCorrectors & setTooltip MsgMassInputTip) True (Just . Map.fromList . zip [0..] $ Map.toList loads)
 
 getSCorrR, postSCorrR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html
 postSCorrR = getSCorrR
 getSCorrR tid ssh csh shn = do
-  uid <- requireAuthId
   Entity shid Sheet{..} <- runDB $ fetchSheet tid ssh csh shn
 
   ((res,formWidget), formEnctype) <- runFormPost . identifyForm FIDcorrectors . renderAForm FormStandard $
@@ -769,17 +773,15 @@ getSCorrR tid ssh csh shn = do
     FormFailure errs -> mapM_ (addMessage Error . toHtml) errs
     FormSuccess (autoDistribute, sheetCorrectors) -> runDBJobs $ do
       update shid [ SheetAutoDistribute =. autoDistribute ]
+      
+      let (invites, adds) = partitionEithers $ Set.toList sheetCorrectors
+
       deleteWhere [ SheetCorrectorSheet ==. shid ]
-      deleteWhere [ SheetCorrectorInvitationSheet ==. shid, SheetCorrectorInvitationEmail /<-. toListOf (folded . _Left . _sheetCorrectorInvitationEmail) sheetCorrectors ]
-      forM_ sheetCorrectors $ \case
-        Right shCor -> insert_ shCor
-        Left shCorInv -> do
-          insertRes <- insertBy shCorInv
-          case insertRes of
-            Right _ ->
-              void . queueDBJob $ JobCorrectorInvitation uid shCorInv
-            Left (Entity old _) ->
-               replace old shCorInv
+      insertMany_ adds
+
+      deleteWhere [InvitationFor ==. invRef @SheetCorrector shid, InvitationEmail /<-. toListOf (folded . _1) invites]
+      sinkInvitationsF correctorInvitationConfig invites
+
       addMessageI Success MsgCorrectorsUpdated
     FormMissing -> return ()
 
@@ -791,48 +793,65 @@ getSCorrR tid ssh csh shn = do
       }
 
 
-data ButtonCorrInvite = BtnCorrInvAccept | BtnCorrInvDecline
-  deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
-instance Universe ButtonCorrInvite
-instance Finite ButtonCorrInvite
+instance IsInvitableJunction SheetCorrector where
+  type InvitationFor SheetCorrector = Sheet
+  data InvitableJunction SheetCorrector = JunctionSheetCorrector
+    { jSheetCorrectorLoad :: Load
+    , jSheetCorrectorState :: CorrectorState
+    } deriving (Eq, Ord, Read, Show, Generic, Typeable)
+  data InvitationDBData SheetCorrector = InvDBDataSheetCorrector
+    { invDBSheetCorrectorLoad :: Load
+    , invDBSheetCorrectorState :: CorrectorState
+    } deriving (Eq, Ord, Read, Show, Generic, Typeable)
+  data InvitationTokenData SheetCorrector = InvTokenDataSheetCorrector
+    deriving (Eq, Ord, Read, Show, Generic, Typeable)
 
-nullaryPathPiece ''ButtonCorrInvite $ camelToPathPiece' 3
-embedRenderMessage ''UniWorX ''ButtonCorrInvite id
+  _InvitableJunction = iso
+    (\SheetCorrector{..} -> (sheetCorrectorUser, sheetCorrectorSheet, JunctionSheetCorrector sheetCorrectorLoad sheetCorrectorState))
+    (\(sheetCorrectorUser, sheetCorrectorSheet, JunctionSheetCorrector sheetCorrectorLoad sheetCorrectorState) -> SheetCorrector{..})
 
-instance Button UniWorX ButtonCorrInvite where
-  btnClasses BtnCorrInvAccept = [BCIsButton, BCPrimary]
-  btnClasses BtnCorrInvDecline = [BCIsButton, BCDanger]
+instance ToJSON (InvitableJunction SheetCorrector) where
+  toJSON = genericToJSON defaultOptions { fieldLabelModifier = camelToPathPiece' 1 }
+  toEncoding = genericToEncoding defaultOptions { fieldLabelModifier = camelToPathPiece' 1 }
+instance FromJSON (InvitableJunction SheetCorrector) where
+  parseJSON = genericParseJSON defaultOptions { fieldLabelModifier = camelToPathPiece' 1 }
 
-getSCorrInviteR, postSCorrInviteR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> UserEmail -> Handler Html
+instance ToJSON (InvitationDBData SheetCorrector) where
+  toJSON = genericToJSON defaultOptions { fieldLabelModifier = camelToPathPiece' 4 }
+  toEncoding = genericToEncoding defaultOptions { fieldLabelModifier = camelToPathPiece' 4 }
+instance FromJSON (InvitationDBData SheetCorrector) where
+  parseJSON = genericParseJSON defaultOptions { fieldLabelModifier = camelToPathPiece' 4 }
+
+instance ToJSON (InvitationTokenData SheetCorrector) where
+  toJSON = genericToJSON defaultOptions { constructorTagModifier = camelToPathPiece' 4 }
+  toEncoding = genericToEncoding defaultOptions { fieldLabelModifier = camelToPathPiece' 4 }
+instance FromJSON (InvitationTokenData SheetCorrector) where
+  parseJSON = genericParseJSON defaultOptions { constructorTagModifier = camelToPathPiece' 4 }
+
+correctorInvitationConfig :: InvitationConfig SheetCorrector
+correctorInvitationConfig = InvitationConfig{..}
+  where
+    invitationRoute Sheet{..} _ = do
+      Course{..} <- get404 sheetCourse
+      return $ CSheetR courseTerm courseSchool courseShorthand sheetName SCorrInviteR
+    invitationResolveFor = do
+      Just (CSheetR tid csh ssh shn SCorrInviteR) <- getCurrentRoute
+      fetchSheetId tid csh ssh shn
+    invitationSubject Sheet{..} _ = do
+      Course{..} <- get404 sheetCourse
+      return . SomeMessage $ MsgMailSubjectCorrectorInvitation courseTerm courseSchool courseShorthand sheetName
+    invitationHeading Sheet{..} _ = return . SomeMessage $ MsgSheetCorrInviteHeading sheetName
+    invitationExplanation _ _ = [ihamlet|_{SomeMessage MsgSheetCorrInviteExplanation}|]
+    invitationTokenConfig _ _ = do
+      itAuthority <- liftHandlerT requireAuthId
+      return $ InvitationTokenConfig itAuthority Nothing Nothing Nothing
+    invitationRestriction _ _ = return Authorized
+    invitationForm _ (InvDBDataSheetCorrector load state, _) = pure $ JunctionSheetCorrector load state
+    invitationSuccessMsg Sheet{..} _ = return . SomeMessage $ MsgCorrectorInvitationAccepted sheetName
+    invitationUltDest Sheet{..} _ = do
+      Course{..} <- get404 sheetCourse
+      return . SomeRoute $ CSheetR courseTerm courseSchool courseShorthand sheetName SShowR
+
+getSCorrInviteR, postSCorrInviteR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html
 getSCorrInviteR = postSCorrInviteR
-postSCorrInviteR tid ssh csh shn email = do
-  uid <- requireAuthId
-  (Entity _ Course{..}, Entity shid Sheet{..}, Entity ciId SheetCorrectorInvitation{..}) <- runDB $ do
-    (sRes@(Entity shid _), cRes) <- fetchSheetCourse tid ssh csh shn
-    iRes <- getBy404 $ UniqueSheetCorrectorInvitation email shid
-    return (cRes, sRes, iRes)
-
-  ((btnResult, btnInnerWidget), btnEncoding) <- runFormPost $ formEmbedJwtPost buttonForm
-
-  let btnWidget = wrapForm btnInnerWidget def
-        { formEncoding = btnEncoding
-        , formAction = Just . SomeRoute . CSheetR tid ssh csh shn $ SCorrInviteR email
-        , formSubmit = FormNoSubmit
-        }
-
-  formResult btnResult $ \case
-    BtnCorrInvAccept -> do
-      runDB $ do
-        delete ciId
-        insert_ $ SheetCorrector uid shid sheetCorrectorInvitationLoad sheetCorrectorInvitationState
-      addMessageI Success $ MsgCorrectorInvitationAccepted shn
-      redirect $ CSheetR tid ssh csh shn SShowR
-    BtnCorrInvDecline -> do
-      runDB $
-        delete ciId
-      addMessageI Info $ MsgCorrectorInvitationDeclined shn
-      redirect HomeR
-
-  siteLayoutMsg (MsgSheetCorrInviteHeading shn) $ do
-    setTitleI $ MsgSheetCorrInviteHeading shn
-    $(widgetFile "sheetCorrInvite")
+postSCorrInviteR = invitationR correctorInvitationConfig
diff --git a/src/Handler/Tutorial.hs b/src/Handler/Tutorial.hs
index 93b09166c..c32de13bb 100644
--- a/src/Handler/Tutorial.hs
+++ b/src/Handler/Tutorial.hs
@@ -1,3 +1,5 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
 module Handler.Tutorial where
 
 import Import
@@ -8,6 +10,8 @@ import Handler.Utils.Delete
 import Handler.Utils.Communication
 import Handler.Utils.Form.MassInput
 import Handler.Utils.Form.Occurences
+import Handler.Utils.Invitations
+import Jobs.Queue
 
 import qualified Database.Esqueleto as E
 import Database.Esqueleto.Utils.TH
@@ -22,6 +26,9 @@ import qualified Data.Text as Text
 
 import Utils.Lens
 
+import Data.Aeson hiding (Result(..))
+import Text.Hamlet (ihamlet)
+
 {-# ANN module ("Hlint: ignore Redundant void" :: String) #-}
 
 
@@ -193,6 +200,66 @@ postTCommR tid ssh csh tutn = do
     }
 
 
+instance IsInvitableJunction Tutor where
+  type InvitationFor Tutor = Tutorial
+  data InvitableJunction Tutor = JunctionTutor
+    deriving (Eq, Ord, Read, Show, Generic, Typeable)
+  data InvitationDBData Tutor = InvDBDataTutor
+    deriving (Eq, Ord, Read, Show, Generic, Typeable)
+  data InvitationTokenData Tutor = InvTokenDataTutor
+    deriving (Eq, Ord, Read, Show, Generic, Typeable)
+
+  _InvitableJunction = iso
+    (\Tutor{..} -> (tutorUser, tutorTutorial, JunctionTutor))
+    (\(tutorUser, tutorTutorial, JunctionTutor) -> Tutor{..})
+
+instance ToJSON (InvitableJunction Tutor) where
+  toJSON = genericToJSON defaultOptions { fieldLabelModifier = camelToPathPiece' 1 }
+  toEncoding = genericToEncoding defaultOptions { fieldLabelModifier = camelToPathPiece' 1 }
+instance FromJSON (InvitableJunction Tutor) where
+  parseJSON = genericParseJSON defaultOptions { fieldLabelModifier = camelToPathPiece' 1 }
+
+instance ToJSON (InvitationDBData Tutor) where
+  toJSON = genericToJSON defaultOptions { fieldLabelModifier = camelToPathPiece' 4 }
+  toEncoding = genericToEncoding defaultOptions { fieldLabelModifier = camelToPathPiece' 4 }
+instance FromJSON (InvitationDBData Tutor) where
+  parseJSON = genericParseJSON defaultOptions { fieldLabelModifier = camelToPathPiece' 4 }
+
+instance ToJSON (InvitationTokenData Tutor) where
+  toJSON = genericToJSON defaultOptions { constructorTagModifier = camelToPathPiece' 4 }
+  toEncoding = genericToEncoding defaultOptions { fieldLabelModifier = camelToPathPiece' 4 }
+instance FromJSON (InvitationTokenData Tutor) where
+  parseJSON = genericParseJSON defaultOptions { constructorTagModifier = camelToPathPiece' 4 }
+
+tutorInvitationConfig :: InvitationConfig Tutor
+tutorInvitationConfig = InvitationConfig{..}
+  where
+    invitationRoute Tutorial{..} _ = do
+      Course{..} <- get404 tutorialCourse
+      return $ CTutorialR courseTerm courseSchool courseShorthand tutorialName TInviteR
+    invitationResolveFor = do
+      Just (CTutorialR tid csh ssh tutn TInviteR) <- getCurrentRoute
+      fetchTutorialId tid csh ssh tutn
+    invitationSubject Tutorial{..} _ = do
+      Course{..} <- get404 tutorialCourse
+      return . SomeMessage $ MsgMailSubjectTutorInvitation courseTerm courseSchool courseShorthand tutorialName
+    invitationHeading Tutorial{..} _ = return . SomeMessage $ MsgTutorInviteHeading tutorialName
+    invitationExplanation _ _ = [ihamlet|_{SomeMessage MsgTutorInviteExplanation}|]
+    invitationTokenConfig _ _ = do
+      itAuthority <- liftHandlerT requireAuthId
+      return $ InvitationTokenConfig itAuthority Nothing Nothing Nothing
+    invitationRestriction _ _ = return Authorized
+    invitationForm _ _ = pure JunctionTutor
+    invitationSuccessMsg Tutorial{..} _ = return . SomeMessage $ MsgCorrectorInvitationAccepted tutorialName
+    invitationUltDest Tutorial{..} _ = do
+      Course{..} <- get404 tutorialCourse
+      return . SomeRoute $ CourseR courseTerm courseSchool courseShorthand CTutorialListR
+
+getTInviteR, postTInviteR :: TermId -> SchoolId -> CourseShorthand -> TutorialName -> Handler Html
+getTInviteR = postTInviteR
+postTInviteR = invitationR tutorInvitationConfig
+
+
 data TutorialForm = TutorialForm
   { tfName            :: TutorialName
   , tfType            :: CI Text
@@ -203,7 +270,7 @@ data TutorialForm = TutorialForm
   , tfRegisterFrom    :: Maybe UTCTime
   , tfRegisterTo      :: Maybe UTCTime
   , tfDeregisterUntil :: Maybe UTCTime
-  , tfTutors          :: Set UserId -- awaiting feat/generic-invitations
+  , tfTutors          :: Set (Either UserEmail UserId)
   }
 
 tutorialForm :: CourseId -> Maybe TutorialForm -> Form TutorialForm
@@ -215,29 +282,29 @@ tutorialForm cid template html = do
   let 
     tutorForm = Set.fromList <$> massInputAccumA miAdd' miCell' (\p -> Just . SomeRoute $ cRoute :#: p) miLayout' (fslI MsgTutorialTutors & setTooltip MsgMassInputTip) True (Set.toList . tfTutors <$> template)
       where
-        miAdd' :: (Text -> Text) -> FieldView UniWorX -> Form ([UserId] -> FormResult [UserId])
+        miAdd' :: (Text -> Text) -> FieldView UniWorX -> Form ([Either UserEmail UserId] -> FormResult [Either UserEmail UserId])
         miAdd' nudge submitView csrf = do
           (addRes, addView) <- mpreq (multiUserField False . Just $ tutUserSuggestions uid) ("" & addName (nudge "email")) Nothing
           let
             addRes'
-              | unresolved <- toListOf (_FormSuccess . folded . _Left) addRes
-              , (fUnresolved : _) <- unresolved
-              = FormFailure [mr $ MsgEMailUnknown fUnresolved]
               | otherwise
               = addRes <&> \newDat oldDat -> if
-                  | (_ : _) <- Set.toList $ setOf (folded . _Right) newDat `Set.intersection` Set.fromList oldDat
+                  | existing <- newDat `Set.intersection` Set.fromList oldDat
+                  , not $ Set.null existing
                     -> FormFailure [mr MsgTutorialTutorAlreadyAdded]
                   | otherwise
-                    -> FormSuccess $ toListOf (folded . _Right) newDat
+                    -> FormSuccess $ Set.toList newDat
           return (addRes', $(widgetFile "tutorial/tutorMassInput/add"))
 
 
-        miCell' :: UserId -> Widget
-        miCell' userId = do
+        miCell' :: Either UserEmail UserId -> Widget
+        miCell' (Left email) =
+          $(widgetFile "tutorial/tutorMassInput/cellInvitation")
+        miCell' (Right userId) = do
           User{..} <- liftHandlerT . runDB $ get404 userId
           $(widgetFile "tutorial/tutorMassInput/cellKnown")
 
-        miLayout' :: MassInputLayout ListLength UserId ()
+        miLayout' :: MassInputLayout ListLength (Either UserEmail UserId) ()
         miLayout' lLength _ cellWdgts delButtons addWdgts = $(widgetFile "tutorial/tutorMassInput/layout")
   
   flip (renderAForm FormStandard) html $ TutorialForm
@@ -282,7 +349,7 @@ postCTutorialNewR tid ssh csh = do
   ((newTutResult, newTutWidget), newTutEnctype) <- runFormPost $ tutorialForm cid Nothing
 
   formResult newTutResult $ \TutorialForm{..} -> do
-    insertRes <- runDB $ do
+    insertRes <- runDBJobs $ do
       now <- liftIO getCurrentTime
       insertRes <- insertUnique Tutorial
         { tutorialName            = tfName
@@ -297,9 +364,10 @@ postCTutorialNewR tid ssh csh = do
         , tutorialDeregisterUntil = tfDeregisterUntil
         , tutorialLastChanged     = now
         }
-      forM_ tfTutors $ \tutor -> case insertRes of
-        Just tutid -> void . insert $ Tutor tutid tutor
-        _other     -> return ()
+      whenIsJust insertRes $ \tutid -> do
+        let (invites, adds) = partitionEithers $ Set.toList tfTutors
+        insertMany_ $ map (Tutor tutid) adds
+        sinkInvitationsF tutorInvitationConfig $ map (, tutid, (InvDBDataTutor, InvTokenDataTutor)) invites
       return insertRes
     case insertRes of
       Nothing -> addMessageI Error $ MsgTutorialNameTaken tfName
@@ -329,6 +397,8 @@ postTEditR tid ssh csh tutn = do
       E.where_ $ tutor E.^. TutorTutorial E.==. E.val tutid
       return $ tutor E.^. TutorUser
 
+    tutorInvites <- sourceInvitationsList tutid
+
     let
       template = TutorialForm
         { tfName            = tutorialName
@@ -340,7 +410,8 @@ postTEditR tid ssh csh tutn = do
         , tfRegisterFrom    = tutorialRegisterFrom
         , tfRegisterTo      = tutorialRegisterTo
         , tfDeregisterUntil = tutorialDeregisterUntil
-        , tfTutors          = Set.fromList tutorIds
+        , tfTutors          = Set.fromList (map Right tutorIds)
+                           <> Set.fromList (map (\(email, InvDBDataTutor) -> Left email) tutorInvites)
         }
 
     return (cid, tutid, template)
@@ -348,7 +419,7 @@ postTEditR tid ssh csh tutn = do
   ((newTutResult, newTutWidget), newTutEnctype) <- runFormPost . tutorialForm cid $ Just template
 
   formResult newTutResult $ \TutorialForm{..} -> do
-    insertRes <- runDB $ do
+    insertRes <- runDBJobs $ do
       now <- liftIO getCurrentTime
       insertRes <- myReplaceUnique tutid Tutorial
         { tutorialName            = tfName
@@ -363,8 +434,14 @@ postTEditR tid ssh csh tutn = do
         , tutorialDeregisterUntil = tfDeregisterUntil
         , tutorialLastChanged     = now
         }
-      deleteWhere [ TutorTutorial ==. tutid ]
-      forM_ tfTutors $ void . insert . Tutor tutid
+      when (is _Nothing insertRes) $ do
+        let (invites, adds) = partitionEithers $ Set.toList tfTutors
+        
+        deleteWhere [ TutorTutorial ==. tutid ]
+        insertMany_ $ map (Tutor tutid) adds
+
+        deleteWhere [ InvitationFor ==. invRef @Tutor tutid, InvitationEmail /<-. invites ]
+        sinkInvitationsF tutorInvitationConfig $ map (, tutid, (InvDBDataTutor, InvTokenDataTutor)) invites
       return insertRes
     case insertRes of
       Just _  -> addMessageI Error $ MsgTutorialNameTaken tfName
diff --git a/src/Handler/Utils/Invitations.hs b/src/Handler/Utils/Invitations.hs
index 0061b730a..a256a7a99 100644
--- a/src/Handler/Utils/Invitations.hs
+++ b/src/Handler/Utils/Invitations.hs
@@ -6,9 +6,11 @@ module Handler.Utils.Invitations
     --
     -- $procedure
     IsInvitableJunction(..)
+  , Invitation'
   , _invitationDBData, _invitationTokenData
   , InvitationReference(..), invRef
   , InvitationConfig(..), InvitationTokenConfig(..)
+  , sourceInvitations, sourceInvitationsList
   , sinkInvitations, sinkInvitationsF
   , invitationR', InvitationR(..)
   ) where
@@ -78,6 +80,9 @@ _invitationTokenData :: IsInvitableJunction junction => Lens' (InvitationData ju
 _invitationTokenData = _InvitationData . _2
 
 
+type Invitation' junction = (UserEmail, Key (InvitationFor junction), InvitationData junction)
+
+
 data InvitationReference junction = IsInvitableJunction junction => InvRef (Key (InvitationFor junction))
 
 deriving instance Eq (InvitationReference junction)
@@ -114,9 +119,9 @@ data InvitationConfig junction = InvitationConfig
     -- ^ Monadically resolve `InvitationFor` during `inviteR`
     --
     -- Usually from `requireBearerToken` or `getCurrentRoute`
-  , invitationSubject     :: InvitationFor junction -> InvitationData junction -> SomeMessage UniWorX
+  , invitationSubject     :: InvitationFor junction -> InvitationData junction -> YesodDB UniWorX (SomeMessage UniWorX)
     -- ^ Subject of the e-mail which sends the token to the user
-  , invitationHeading     :: InvitationFor junction -> InvitationData junction -> SomeMessage UniWorX
+  , invitationHeading     :: InvitationFor junction -> InvitationData junction -> YesodDB UniWorX (SomeMessage UniWorX)
     -- ^ Heading of the page which allows the invitee to accept/decline the invitation (`invitationR`
   , invitationExplanation :: InvitationFor junction -> InvitationData junction -> HtmlUrlI18n (SomeMessage UniWorX) (Route UniWorX)
     -- ^ Explanation of what kind of invitation this is (used both in the e-mail and in `invitationR`)
@@ -161,7 +166,7 @@ instance IsInvitableJunction junction => FromJSON (InvitationTokenRestriction ju
 sinkInvitations :: forall junction.
                    IsInvitableJunction junction
                 => InvitationConfig junction
-                -> Sink (UserEmail, Key (InvitationFor junction), InvitationData junction) (YesodJobDB UniWorX) ()
+                -> Sink (Invitation' junction) (YesodJobDB UniWorX) ()
 -- | Register invitations in the database
 --
 -- When an invitation for a certain junction (i.e. an `UserEmail`, `Key
@@ -171,9 +176,9 @@ sinkInvitations :: forall junction.
 -- For new junctions an invitation is sent by e-mail.
 sinkInvitations InvitationConfig{..} = determineExists .| C.foldMap pure >>= lift . sinkInvitations'
   where
-    determineExists :: Conduit (UserEmail, Key (InvitationFor junction), InvitationData junction)
+    determineExists :: Conduit (Invitation' junction)
                                (YesodJobDB UniWorX)
-                               (Either (InvitationId, InvitationData junction) (UserEmail, Key (InvitationFor junction), InvitationData junction))
+                               (Either (InvitationId, InvitationData junction) (Invitation' junction))
     determineExists
       | is _Just (ephemeralInvitation @junction)
       = C.map Right
@@ -181,7 +186,7 @@ sinkInvitations InvitationConfig{..} = determineExists .| C.foldMap pure >>= lif
       = C.mapM $ \inp@(email, fid, dat) ->
           maybe (Right inp) (Left . (, dat)) <$> getKeyBy (UniqueInvitation email (invRef @junction fid))
 
-    sinkInvitations' :: [Either (InvitationId, InvitationData junction) (UserEmail, Key (InvitationFor junction), InvitationData junction)]
+    sinkInvitations' :: [Either (InvitationId, InvitationData junction) (Invitation' junction)]
                      -> YesodJobDB UniWorX ()
     sinkInvitations' (partitionEithers -> (existing, new)) = do
       when (is _Nothing (ephemeralInvitation @junction)) $ do
@@ -201,15 +206,15 @@ sinkInvitations InvitationConfig{..} = determineExists .| C.foldMap pure >>= lif
         let token = protoToken & tokenRestrict (urlRoute route) (InvitationTokenRestriction jInvitee $ dat ^. _invitationTokenData)
         jwt <- encodeToken token
         jInvitationUrl <- toTextUrl (route, [(toPathPiece GetBearer, toPathPiece jwt)])
-        let jInvitationSubject     = mr $ invitationSubject fRec dat
-            jInvitationExplanation = invitationExplanation fRec dat (toHtml . mr) ur
+        jInvitationSubject <- fmap mr . mapReaderT liftHandlerT $ invitationSubject fRec dat
+        let jInvitationExplanation = invitationExplanation fRec dat (toHtml . mr) ur
 
         queueDBJob JobInvitation{..}
 
 sinkInvitationsF :: forall junction mono.
                     ( IsInvitableJunction junction
                     , MonoFoldable mono
-                    , Element mono ~ (UserEmail, Key (InvitationFor junction), InvitationData junction)
+                    , Element mono ~ Invitation' junction
                     )
                  => InvitationConfig junction
                  -> mono
@@ -218,6 +223,25 @@ sinkInvitationsF :: forall junction mono.
 sinkInvitationsF cfg invs = runConduit $ mapM_ yield invs .| sinkInvitations cfg
 
 
+
+sourceInvitations :: forall junction.
+                     IsInvitableJunction junction
+                  => Key (InvitationFor junction)
+                  -> Source (YesodDB UniWorX) (UserEmail, InvitationDBData junction)
+sourceInvitations forKey = selectSource [InvitationFor ==. invRef @junction forKey] [] .| C.mapM decode
+  where
+    decode (Entity _ (Invitation email _ invitationData))
+      = case fromJSON invitationData of
+          JSON.Success dbData -> return (email, dbData)
+          JSON.Error   str    -> fail $ "Could not decode invitationData: " <> str
+
+sourceInvitationsList :: forall junction.
+                         IsInvitableJunction junction
+                      => Key (InvitationFor junction)
+                      -> YesodDB UniWorX [(UserEmail, InvitationDBData junction)]
+sourceInvitationsList forKey = runConduit $ sourceInvitations forKey .| C.foldMap pure
+
+
 data ButtonInvite = BtnInviteAccept | BtnInviteDecline
   deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
 instance Universe ButtonInvite
@@ -268,9 +292,8 @@ invitationR' InvitationConfig{..} = liftHandlerT $ do
 
     MsgRenderer mr <- getMsgRenderer
     ur <- getUrlRenderParams
-    let
-      heading = invitationHeading fRec iData
-      explanation = invitationExplanation fRec iData (toHtml . mr) ur
+    heading <- invitationHeading fRec iData
+    let explanation = invitationExplanation fRec iData (toHtml . mr) ur
 
     fmap (, (dataWidget, dataEnctype), heading, explanation) . formResultMaybe dataRes $ \case
       Nothing -> do
@@ -282,6 +305,7 @@ invitationR' InvitationConfig{..} = liftHandlerT $ do
         case mResult of
           Nothing -> invalidArgsI [MsgInvitationCollision]
           Just res -> do
+            deleteBy . UniqueInvitation itEmail $ invRef @junction fid
             addMessageI Success =<< invitationSuccessMsg fRec res
             Just <$> invitationUltDest fRec res
 
diff --git a/src/Jobs.hs b/src/Jobs.hs
index 799c1689c..fd0b08c60 100644
--- a/src/Jobs.hs
+++ b/src/Jobs.hs
@@ -59,7 +59,6 @@ import Jobs.Handler.HelpRequest
 import Jobs.Handler.SetLogSettings
 import Jobs.Handler.DistributeCorrections
 import Jobs.Handler.SendCourseCommunication
-import Jobs.Handler.CorrectorInvitation
 import Jobs.Handler.Invitation
 
   
diff --git a/src/Jobs/Handler/CorrectorInvitation.hs b/src/Jobs/Handler/CorrectorInvitation.hs
deleted file mode 100644
index 76e0d26c2..000000000
--- a/src/Jobs/Handler/CorrectorInvitation.hs
+++ /dev/null
@@ -1,42 +0,0 @@
-module Jobs.Handler.CorrectorInvitation
-  ( dispatchJobCorrectorInvitation
-  ) where
-
-import Import
-
-import Text.Hamlet
-
-import qualified Data.HashSet as HashSet
-
-import qualified Data.CaseInsensitive as CI
-
-import Utils.Lens
-
-
-dispatchJobCorrectorInvitation :: UserId -> SheetCorrectorInvitation -> Handler ()
-dispatchJobCorrectorInvitation jInviter jCorrectorInvitation@SheetCorrectorInvitation{..} = do
-  ctx <- runDB . runMaybeT $ do
-    sheet <- MaybeT $ get sheetCorrectorInvitationSheet
-    course <- MaybeT . get $ sheetCourse sheet
-    void . MaybeT $ getByValue jCorrectorInvitation
-    user <- MaybeT $ get jInviter
-    return (sheet, course, user)
-
-  case ctx of
-    Just (Sheet{..}, Course{..}, User{..}) -> do
-      let baseRoute = CSheetR courseTerm courseSchool courseShorthand sheetName $ SCorrInviteR sheetCorrectorInvitationEmail
-      jwt <- encodeToken =<< bearerToken jInviter (Just $ HashSet.singleton baseRoute) Nothing Nothing Nothing
-      let
-        invitationUrl :: SomeRoute UniWorX
-        invitationUrl = SomeRoute (baseRoute, [(toPathPiece GetBearer, toPathPiece jwt)])
-      invitationUrl' <- toTextUrl invitationUrl
-
-      mailT def $ do
-        _mailTo .= [Address Nothing $ CI.original sheetCorrectorInvitationEmail]
-        replaceMailHeader "Reply-To" . Just . renderAddress $ Address (Just userDisplayName) (CI.original userEmail)
-        replaceMailHeader "Auto-Submitted" $ Just "auto-generated"
-        setSubjectI $ MsgMailSubjectCorrectorInvitation courseTerm courseSchool courseShorthand sheetName
-      
-        addPart ($(ihamletFile "templates/mail/correctorInvitation.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX))
-    Nothing -> runDB .
-      deleteBy $ UniqueSheetCorrectorInvitation sheetCorrectorInvitationEmail sheetCorrectorInvitationSheet
diff --git a/src/Jobs/Types.hs b/src/Jobs/Types.hs
index c5a0aa763..01800048e 100644
--- a/src/Jobs/Types.hs
+++ b/src/Jobs/Types.hs
@@ -31,9 +31,6 @@ data Job = JobSendNotification { jRecipient :: UserId, jNotification :: Notifica
                                       , jSubject :: Maybe Text
                                       , jMailContent :: Html
                                       }
-         | JobCorrectorInvitation { jInviter :: UserId
-                                  , jCorrectorInvitation :: SheetCorrectorInvitation
-                                  }
          | JobInvitation { jInviter :: UserId
                          , jInvitee :: UserEmail
                          , jInvitationUrl :: Text
diff --git a/src/Model.hs b/src/Model.hs
index 6ae0a2f0c..703b78d71 100644
--- a/src/Model.hs
+++ b/src/Model.hs
@@ -41,8 +41,5 @@ deriving instance Eq (Unique Tutorial)
 -- Automatically generated (i.e. numeric) ids are already taken care of
 deriving instance Binary (Key Term)
 
-instance Hashable LecturerInvitation
-instance Hashable SheetCorrectorInvitation
-
 submissionRatingDone :: Submission -> Bool
 submissionRatingDone Submission{..} = isJust submissionRatingTime
diff --git a/src/Utils/Lens.hs b/src/Utils/Lens.hs
index 52780e335..7a7c6a4db 100644
--- a/src/Utils/Lens.hs
+++ b/src/Utils/Lens.hs
@@ -98,8 +98,6 @@ makePrisms ''HandlerContents
 
 makePrisms ''ErrorResponse
 
-makeLenses_ ''SheetCorrectorInvitation
-
 makeLenses_ ''SubmissionMode
 
 makePrisms ''E.Value
diff --git a/templates/sheetCorrInvite.hamlet b/templates/sheetCorrInvite.hamlet
deleted file mode 100644
index 8e51c7358..000000000
--- a/templates/sheetCorrInvite.hamlet
+++ /dev/null
@@ -1,3 +0,0 @@
-<p>
-  _{MsgSheetCorrInviteExplanation}
-^{btnWidget}
diff --git a/templates/tutorial/tutorMassInput/add.hamlet b/templates/tutorial/tutorMassInput/add.hamlet
index cf4cc6e72..bdf6da247 100644
--- a/templates/tutorial/tutorMassInput/add.hamlet
+++ b/templates/tutorial/tutorMassInput/add.hamlet
@@ -1,5 +1,5 @@
 $newline never
-<td>
+<td colspan=2>
   #{csrf}
   ^{fvInput addView}
 <td>
diff --git a/templates/tutorial/tutorMassInput/cellInvitation.hamlet b/templates/tutorial/tutorMassInput/cellInvitation.hamlet
new file mode 100644
index 000000000..27c423ad1
--- /dev/null
+++ b/templates/tutorial/tutorMassInput/cellInvitation.hamlet
@@ -0,0 +1,9 @@
+$newline never
+<td>
+  <span style="font-family: monospace">
+    #{email}
+<td>
+  <div .tooltip>
+    <div .tooltip__handle>
+    <div .tooltip__content>
+      _{MsgEmailInvitationWarning}
diff --git a/templates/tutorial/tutorMassInput/cellKnown.hamlet b/templates/tutorial/tutorMassInput/cellKnown.hamlet
index c6c6cc2ad..5ea4cca6f 100644
--- a/templates/tutorial/tutorMassInput/cellKnown.hamlet
+++ b/templates/tutorial/tutorMassInput/cellKnown.hamlet
@@ -1,3 +1,3 @@
 $newline never
-<td>
+<td colspan=2>
   ^{nameEmailWidget userEmail userDisplayName userSurname}

From b430eba9da7d26a258c1baf97a87b652767c2827 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 5 May 2019 18:24:57 +0200
Subject: [PATCH 233/238] Fix tutorial massinputs

---
 src/Handler/Utils/Form/MassInput.hs |  7 +--
 static/js/utils/form.js             | 71 ++++++++++++++++++++++++++++-
 static/js/utils/massInput.js        |  5 +-
 templates/default-layout.julius     | 41 -----------------
 4 files changed, 75 insertions(+), 49 deletions(-)

diff --git a/src/Handler/Utils/Form/MassInput.hs b/src/Handler/Utils/Form/MassInput.hs
index 664b0f3c7..abec6f300 100644
--- a/src/Handler/Utils/Form/MassInput.hs
+++ b/src/Handler/Utils/Form/MassInput.hs
@@ -23,7 +23,7 @@ import Handler.Utils.Form.MassInput.TH
 
 import Data.Aeson
 
-import Algebra.Lattice
+import Algebra.Lattice hiding (join)
 
 import Text.Blaze (Markup)
 
@@ -317,8 +317,9 @@ massInput MassInput{ miIdent = toPathPiece -> miIdent, ..} FieldSettings{..} fvR
                 wBtnRes res = do
                   guard $ isn't _FormMissing btnRes
                   res
-            addRes' <- over (mapped . _Just . _1) wBtnRes . local (bool id (set _1 Nothing) $ is _FormMissing btnRes) . traverse ($ mempty) $
-                  miAdd miCoord dimIx nudgeAddWidgetName btnView
+                miAdd' = traverse ($ mempty) $ miAdd miCoord dimIx nudgeAddWidgetName btnView
+            addRes'' <- miAdd' & mapped . _Just . _1 %~ wBtnRes
+            addRes' <- fmap join . for addRes'' $ bool (return . Just) (\(res, _view) -> set (_Just . _1) res <$> local (set _1 Nothing) miAdd') (is (_Just . _FormSuccess) (fst <$> addRes'') || is _FormMissing btnRes)
             let dimRes' = Map.singleton (dimIx, miCoord) (maybe (Nothing <$ btnRes) (fmap Just) $ fmap fst addRes', fmap snd addRes')
             case remDims of
               [] -> return dimRes'
diff --git a/static/js/utils/form.js b/static/js/utils/form.js
index 4c77f8621..4312b5099 100644
--- a/static/js/utils/form.js
+++ b/static/js/utils/form.js
@@ -221,7 +221,6 @@
       childInputs.forEach(function(el) {
         el.disabled = !active;
         if (el._flatpickr) {
-          console.log("Flatpickr in childInputs", el, el._flatpickr.altInput);
           el._flatpickr.altInput.disabled = !active;
         }
       });
@@ -356,6 +355,76 @@
     setup: formErrorRemoverUtil,
   });
 
+  /**
+   *
+   * Datepicker Utility
+   *  Provides UI for entering dates and times
+   *
+   * Attribute: [none]
+   *  (automatically setup on all relevant input tags)
+   *
+   * Example usage:
+   *  (any form that uses inputs of type date, time, or datetime-local)
+   */
+
+  var DATEPICKER_UTIL_NAME = 'datepicker';
+  var DATEPICKER_UTIL_SELECTOR = 'input[type="date"], input[type="time"], input[type="datetime-local"]';
+
+  var DATEPICKER_CONFIG = {
+    "datetime-local": {
+      enableTime: true,
+      altInput: true,
+      altFormat: "j. F Y, H:i", // maybe interpolate these formats for locale
+      dateFormat: "Y-m-dTH:i",
+      time_24hr: true
+    },
+    "date": {
+      altFormat: "j. F Y",
+      dateFormat: "Y-m-d",
+      altInput: true
+    },
+    "time": {
+      enableTime: true,
+      noCalendar: true,
+      altFormat: "H:i",
+      dateFormat: "H:i",
+      altInput: true,
+      time_24hr: true
+    }
+  };
+
+  var datepickerUtil = function(element) {
+    var flatpickrInstance;
+
+    function init() {
+      if (!element) {
+        throw new Error('Datepicker utility needs to be passed an element!');
+      }
+
+      var flatpickrConfig = DATEPICKER_CONFIG[element.getAttribute("type")];
+
+      if (!flatpickrConfig) {
+        throw new Error('Datepicker utility called on unsupported element!');
+      }
+
+      flatpickrInstance = flatpickr(element, flatpickrConfig);
+
+      return {
+        name: DATEPICKER_UTIL_NAME,
+        element: element,
+        destroy: function() { flatpickrInstance.destroy(); },
+      };
+    }
+
+    return init();   
+  };
+
+  formUtilities.push({
+    name: DATEPICKER_UTIL_NAME,
+    selector: DATEPICKER_UTIL_SELECTOR,
+    setup: datepickerUtil,
+  });
+
   // register the collected form utilities
   if (UtilRegistry) {
     formUtilities.forEach(UtilRegistry.register);
diff --git a/static/js/utils/massInput.js b/static/js/utils/massInput.js
index 8e15a4f79..6e18b118d 100644
--- a/static/js/utils/massInput.js
+++ b/static/js/utils/massInput.js
@@ -191,10 +191,7 @@
 
       var addCellInput = addCell.querySelector('input:not([type="hidden"])');
       if (addCellInput) {
-        // clear the inputs value
-        // TBD: make this work for checkboxes and radioboxes
-        // where the value should not be cleared
-        addCellInput.value = '';
+        // Clearing of add-inputs is done in the backend
         addCellInput.focus();
       }
     }
diff --git a/templates/default-layout.julius b/templates/default-layout.julius
index 8c7295843..a61ccc7e9 100644
--- a/templates/default-layout.julius
+++ b/templates/default-layout.julius
@@ -1,46 +1,5 @@
-function setupDatepicker(wrapper) {
-  "use strict";
-
-  var config = {
-    dtLocal: {
-      enableTime: true,
-      altInput: true,
-      altFormat: "j. F Y, H:i", // maybe interpolate these formats for locale
-      dateFormat: "Y-m-dTH:i",
-      time_24hr: true
-    },
-    d: {
-      altFormat: "j. F Y",
-      dateFormat: "Y-m-d",
-      altInput: true
-    },
-    t: {
-      enableTime: true,
-      noCalendar: true,
-      altFormat: "H:i",
-      dateFormat: "H:i",
-      altInput: true,
-      time_24hr: true
-    }
-  };
-
-  Array.from(wrapper.querySelectorAll('input[type="date"]')).forEach(function(el) {
-    flatpickr(el, config.d);
-  });
-  Array.from(wrapper.querySelectorAll('input[type="time"]')).forEach(function(el) {
-    flatpickr(el, config.t);
-  });
-  Array.from(wrapper.querySelectorAll('input[type="datetime-local"]')).forEach(function(el) {
-    flatpickr(el, config.dtLocal);
-  });
-}
-
 if (I18n) {
   I18n.addMany(#{frontendI18n});
 } else {
   throw new Error('I18n JavaScript service is missing!');
 }
-
-document.addEventListener('DOMContentLoaded', function() {
-  setupDatepicker(document.body);
-});

From b34a8467ed8e5be60e6917cfe8696bf4d13a2217 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 5 May 2019 18:42:29 +0200
Subject: [PATCH 234/238] Fix typo

---
 src/Handler/Utils/Form/Occurences.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Handler/Utils/Form/Occurences.hs b/src/Handler/Utils/Form/Occurences.hs
index d010c6a5e..f39ec3323 100644
--- a/src/Handler/Utils/Form/Occurences.hs
+++ b/src/Handler/Utils/Form/Occurences.hs
@@ -110,7 +110,7 @@ occurencesAForm (toPathPiece -> miIdent') mPrev = wFormToAForm $ do
         miCell' :: OccurenceException -> Widget
         miCell' ExceptOccur{..} = do
           exceptStart' <- formatTime SelFormatDateTime (LocalTime exceptDay exceptStart)
-          exceptEnd'   <- formatTime SelFormatTime     exceptStart
+          exceptEnd'   <- formatTime SelFormatTime     exceptEnd
           $(widgetFile "widgets/occurence/form/except-occur")
         miCell' ExceptNoOccur{..} = do
           exceptTime' <- formatTime SelFormatDateTime exceptTime

From d030ec1b5ff1900c25ddbdc407cec552716565c3 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Sun, 5 May 2019 21:02:43 +0200
Subject: [PATCH 235/238] Submit sheets from homepage

---
 src/Handler/Home.hs                           | 7 +++++--
 src/Handler/Utils/Form.hs                     | 8 ++------
 templates/{ => widgets}/multiFileField.hamlet | 0
 templates/{ => widgets}/multiFileField.lucius | 0
 templates/widgets/zipFileField.hamlet         | 2 ++
 5 files changed, 9 insertions(+), 8 deletions(-)
 rename templates/{ => widgets}/multiFileField.hamlet (100%)
 rename templates/{ => widgets}/multiFileField.lucius (100%)
 create mode 100644 templates/widgets/zipFileField.hamlet

diff --git a/src/Handler/Home.hs b/src/Handler/Home.hs
index 81d9f7066..b907ecf50 100644
--- a/src/Handler/Home.hs
+++ b/src/Handler/Home.hs
@@ -128,7 +128,10 @@ homeUpcomingSheets uid = do
             cell $ formatTime SelFormatDateTime deadline >>= toWidget
         , sortable (Just "done")   (i18nCell MsgDone)   $ \DBRow{ dbrOutput=(E.Value tid, E.Value ssh, E.Value csh, E.Value shn, _, E.Value mbsid) } ->
             case mbsid of
-              Nothing    -> mempty
+              Nothing    -> cell $ do
+                let submitRoute = CSheetR tid ssh csh shn SubmissionNewR
+                whenM (hasWriteAccessTo submitRoute) $
+                  modal [whamlet|_{MsgMenuSubmissionNew}|] . Left $ SomeRoute submitRoute
               (Just sid) -> anchorCellM (CSubmissionR tid ssh csh shn <$> encrypt sid <*> pure SubShowR)
                                         (toWidget $ hasTickmark True)
         ]
@@ -170,4 +173,4 @@ homeUpcomingSheets uid = do
     , dbtParams    = def
     , dbtIdent     = "upcoming-sheets" :: Text
     }
-  $(widgetFile "home/upcomingSheets")
\ No newline at end of file
+  $(widgetFile "home/upcomingSheets")
diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index 94504f1ea..225886a1a 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -366,11 +366,7 @@ zipFileField doUnpack = Field{..}
       | [f] <- files = return . Right . Just $ bool (yieldM . acceptFile) sourceFiles doUnpack f
       | null files   = return $ Right Nothing
       | otherwise    = return . Left $ SomeMessage MsgOnlyUploadOneFile
-    fieldView fieldId fieldName attrs _ req =
-      [whamlet|
-        $newline never
-        <input type=file ##{fieldId} *{attrs} name=#{fieldName} :req:required>
-      |]
+    fieldView fieldId fieldName attrs _ req = $(widgetFile "widgets/zipFileField")
 
 multiFileField :: Handler (Set FileId) -> Field Handler (Source Handler (Either FileId File))
 multiFileField permittedFiles' = Field{..}
@@ -410,7 +406,7 @@ multiFileField permittedFiles' = Field{..}
           E.where_ $ file E.^. FileId `E.in_` E.valList (setToList pVals)
           E.orderBy [E.asc $ file E.^. FileTitle]
           return (file E.^. FileId, file E.^. FileTitle)
-      $(widgetFile "multiFileField")
+      $(widgetFile "widgets/multiFileField")
     unpackZips :: Text
     unpackZips = "unpack-zip"
     takeLefts :: Monad m => ConduitM (Either b a) b m ()
diff --git a/templates/multiFileField.hamlet b/templates/widgets/multiFileField.hamlet
similarity index 100%
rename from templates/multiFileField.hamlet
rename to templates/widgets/multiFileField.hamlet
diff --git a/templates/multiFileField.lucius b/templates/widgets/multiFileField.lucius
similarity index 100%
rename from templates/multiFileField.lucius
rename to templates/widgets/multiFileField.lucius
diff --git a/templates/widgets/zipFileField.hamlet b/templates/widgets/zipFileField.hamlet
new file mode 100644
index 000000000..4c432c524
--- /dev/null
+++ b/templates/widgets/zipFileField.hamlet
@@ -0,0 +1,2 @@
+$newline never
+<input type=file uw-file-input ##{fieldId} *{attrs} name=#{fieldName} :req:required>

From 351f7ace7496a3869f0e09bb8f555601de4f3b09 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 5 May 2019 20:56:37 +0200
Subject: [PATCH 236/238] cleaner submit button setup and teardown in massinput
 js util

---
 static/js/utils/massInput.js | 38 ++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/static/js/utils/massInput.js b/static/js/utils/massInput.js
index 6e18b118d..3c983aee8 100644
--- a/static/js/utils/massInput.js
+++ b/static/js/utils/massInput.js
@@ -47,11 +47,14 @@
 
       massInputFormSubmitHandler = makeSubmitHandler();
 
-      // "unarm" submit buttons inside this massinput so browser
+      // setup submit buttons inside this massinput so browser
       // uses correct submit button for form submission.
       // contents of the massinput will be replaced either way,
       // so unarming is no problem
-      unarmSubmitButtons(massInputFormSubmitHandler);
+      var buttons = getMassInputSubmitButtons();
+      buttons.forEach(function(button) {
+        setupSubmitButton(button);
+      });
 
       massInputForm.addEventListener('submit', massInputFormSubmitHandler);
 
@@ -83,7 +86,7 @@
 
       return function(event) {
         var activeElement;
-        
+
         // check if event occured from either a mass input add/delete button or
         // from inside one of massinput's inputs (i.e. they are focused/active)
         if (event.type === 'click') {
@@ -91,7 +94,7 @@
         } else {
           activeElement = element.querySelector(':focus, :active');
         }
-        
+
         if (!activeElement) {
           return false;
         }
@@ -137,14 +140,20 @@
       };
     }
 
-    function unarmSubmitButtons(submitHandler) {
-      var buttons = Array.from(element.querySelectorAll('button[type="submit"][name][value]'));
-      buttons.forEach(function(button) {
-        button.setAttribute('type', 'button');
-        button.classList.add(MASS_INPUT_SUBMIT_BUTTON_CLASS);
+    function getMassInputSubmitButtons() {
+      return Array.from(element.querySelectorAll('button[type="submit"][name][value], .' + MASS_INPUT_SUBMIT_BUTTON_CLASS));
+    }
 
-        button.addEventListener('click', submitHandler);
-      });
+    function setupSubmitButton(button) {
+      button.setAttribute('type', 'button');
+      button.classList.add(MASS_INPUT_SUBMIT_BUTTON_CLASS);
+      button.addEventListener('click', massInputFormSubmitHandler);
+    }
+
+    function resetSubmitButton(button) {
+      button.setAttribute('type', 'submit');
+      button.classList.remove(MASS_INPUT_SUBMIT_BUTTON_CLASS);
+      button.removeEventListener('click', massInputFormSubmitHandler);
     }
 
     function processResponse(response) {
@@ -200,10 +209,9 @@
       element.classList.remove(MASS_INPUT_INITIALIZED_CLASS);
       massInputForm.removeEventListener('submit', massInputFormSubmitHandler)
 
-      Array.from(element.querySelectorAll('.' + MASS_INPUT_SUBMIT_BUTTON_CLASS)).forEach(function(button) {
-        button.removeEventListener('click', massInputFormSubmitHandler);
-        button.classList.remove(MASS_INPUT_SUBMIT_BUTTON_CLASS);
-        button.setAttribute('type', 'submit');
+      var buttons = getMassInputSubmitButtons();
+      buttons.forEach(function(button) {
+        resetSubmitButton(button);
       });
     }
 

From ea697d16cb75e302914e5f18b249da7b35f22128 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 5 May 2019 21:22:13 +0200
Subject: [PATCH 237/238] add keyboard support for mass inputs

---
 static/js/utils/massInput.js | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/static/js/utils/massInput.js b/static/js/utils/massInput.js
index 3c983aee8..d77a4b942 100644
--- a/static/js/utils/massInput.js
+++ b/static/js/utils/massInput.js
@@ -49,14 +49,13 @@
 
       // setup submit buttons inside this massinput so browser
       // uses correct submit button for form submission.
-      // contents of the massinput will be replaced either way,
-      // so unarming is no problem
       var buttons = getMassInputSubmitButtons();
       buttons.forEach(function(button) {
         setupSubmitButton(button);
       });
 
       massInputForm.addEventListener('submit', massInputFormSubmitHandler);
+      massInputForm.addEventListener('keypress', keypressHandler);
 
       // mark initialized
       element.classList.add(MASS_INPUT_INITIALIZED_CLASS);
@@ -88,12 +87,8 @@
         var activeElement;
 
         // check if event occured from either a mass input add/delete button or
-        // from inside one of massinput's inputs (i.e. they are focused/active)
-        if (event.type === 'click') {
-          activeElement = event.target;
-        } else {
-          activeElement = element.querySelector(':focus, :active');
-        }
+        // from inside one of massinput's inputs (i.e. a child is focused/active)
+        activeElement = element.querySelector(':focus, :active');
 
         if (!activeElement) {
           return false;
@@ -140,6 +135,16 @@
       };
     }
 
+    function keypressHandler(event) {
+      if (event.keyCode !== 13) {
+        return false;
+      }
+
+      if (massInputFormSubmitHandler) {
+        return massInputFormSubmitHandler(event);
+      }
+    }
+
     function getMassInputSubmitButtons() {
       return Array.from(element.querySelectorAll('button[type="submit"][name][value], .' + MASS_INPUT_SUBMIT_BUTTON_CLASS));
     }
@@ -208,6 +213,7 @@
     function reset() {
       element.classList.remove(MASS_INPUT_INITIALIZED_CLASS);
       massInputForm.removeEventListener('submit', massInputFormSubmitHandler)
+      massInputForm.removeEventListener('keypress', keypressHandler);
 
       var buttons = getMassInputSubmitButtons();
       buttons.forEach(function(button) {

From 00a9f74d08f660861d28142de091532b95cd4559 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 5 May 2019 22:53:54 +0200
Subject: [PATCH 238/238] move logo file and add image of seal to asidenav

---
 assets/{ => lmu}/logo.svg                  |  0
 assets/lmu/sigillum.svg                    | 19 +++++++++++++++++++
 src/Foundation.hs                          |  4 ++--
 static/css/utils/asidenav.scss             | 21 +++++++++++++++++++++
 static/img/lmu/sigillum.svg                |  1 +
 templates/widgets/asidenav/asidenav.hamlet |  3 +++
 6 files changed, 46 insertions(+), 2 deletions(-)
 rename assets/{ => lmu}/logo.svg (100%)
 create mode 100644 assets/lmu/sigillum.svg
 create mode 120000 static/img/lmu/sigillum.svg

diff --git a/assets/logo.svg b/assets/lmu/logo.svg
similarity index 100%
rename from assets/logo.svg
rename to assets/lmu/logo.svg
diff --git a/assets/lmu/sigillum.svg b/assets/lmu/sigillum.svg
new file mode 100644
index 000000000..78538233a
--- /dev/null
+++ b/assets/lmu/sigillum.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="567.529" height="576.949" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+  <metadata>
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>
+          image/svg+xml
+        </dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path d="M564.606 273.092c-.62-1.18 1.7-4.845 2.59-5.654.133-3.844.01-18.296-3.06-27.097-.614-2.3-4.967-3.47-3.533-6.83 1.883-9.42-.47-8.82-.47-15.31-3.074-4.82-6.02-11.7-8.477-16.73.614-.84.295-5.21.702-6.26-3.278-7.96-4.184-15.09-10.58-19.98-2.05-2.51-2.933-7.04-1.91-9.55-4.713-7.33-4.016-14.62-10.98-20.7-5.172-1.35-4.5-6.13-4.295-10.11-5.325-6.49-8.754-16.59-15.913-20.38-8.274-4.37-3.42-7.88-9.865-13.93-3.89-6.5-8.195-11.46-16.627-14.09-.345-2.04.193-4.06-.955-5.89-5.65-5.89-12.838-11.15-17.583-15.68-2.534-1.59-4.56.73-7.02-1.16-.463-1.12-.135-2.24-1.294-3.62C449.21 54.84 441.04 48 436.68 45.47c-3.51-3.19-6.12.273-7.32-2.07-6.77-7.727-18.94-12.9-27.14-16.88-5.21-2.136-4.7-.32-7.8-1.356-5.73-7.34-13.15-8.09-21.96-9.554-3.688-2.31-5.51 1.79-8.99-1.353-4.858-4.38-16.87-8.44-23.79-9.313-5.53-1.26-6.317 1.474-10.58 1.35-4.27-.123-6.05-7.272-25.94-5.254-2.665 1.26-5.557 1.64-8.83 1.433L288.86.63c-8.192-.64-19.572-.644-26.572 2.78-1.2.587-3.884-1.644-7.002-1.75-6.623-.23-15.87.913-22.833 1.91l-5.25 3.98c-6.603.716-4.417-2.01-7.08-1.592-9.07 2.07-22.212 5.257-26.73 10.986-1.194 1.513-2.517-2.29-5.65-1.67-5.626 1.108-14.12 5.927-19.252 8.756-1.64 4.817-2.86 5.573-12.57 5.414-1.43-.026-20.66 7.563-23.86 18.47-1.88-.176-4.56-.515-6.36 0-6.68 4.06-12.57 9.657-18.13 14.013-.82 2.722-.26 3.11-2.3 5.412-6.57-2.66-18.94 12.65-20.85 15.92-1.54 2.6-1.88 5.66-2.92 7.8-8.53-.56-9.11 4.51-12.35 8.12-4.16 4.63-7.41 8.85-10.98 13.45 1.02 6.91-1.08 5.81-6.08 7.63-3.48 7.96-15.7 16.57-12.08 27.45-2.25 2.72-5.34 1.33-7.59 4.06-3.89 9.01-12.78 18.11-8.88 29.01-.41 2.3-2.03 4.97-5.95 3.88-.44-.12-5.69 14.94-8.18 22.06-1.84 5.24 6.97 15.32-3.64 16.36-2.1 2.56-2.96 18.99-4.55 25.34-.42 3.77 6.18 8.33-.63 15.15-.6 12.52.01 25.02 3.11 32.63-1.43 1.89-2.74 3.52-3.36 5.61 2.66 8.6-2.33 16.66 7.5 24.78.2 1.88-2.36 1.72-3.79 2.76.87 9.23 0 23.05 6.47 24.69.17 1.97-1.08 1.71-.95 3.97 3.19 11.91 1.73 27.97 13.63 32.55.62 2.31-2.35 1.99-2.76 3.88 1.64 5.24.09 8.2 4.92 13.04 3.11 4.49 7.28 8.5 7.08 14.16-2.76 2.24 1.04 2.85.74 6.36 3.83 5.81 7.58 18.06 15.83 16.52.35 4.92-1.91 4.45-.86 7.68 1.13 3.45 6.91 9.67 11.48 15.8 1.74 1.61 6.21 2.17 7.08 3.45.69 8.98 9.45 14.57 13.55 19.6 2.87 3.12 5.04 7.97 9.75 7.34 3.28.84 3.04.62 3.45 3.97 6.65 6.1 11.27 14.71 18.99 17.44 1.44.51 7.77.61 10.1 1.56 1.73.78-.21 4.6 2.25 6.91 7.17 3.77 13.99 10.2 21.57 13.56 7.38-1.26 9.32-1.38 12.21 5.41 8.81 2.93 16.87 12.55 28.95 8.06 1.24-.46.95 3.62 1.56 3.88 8.2 3.51 15.82 6.76 24.83 8.86 7.44 2.41 16.42 4.29 38.87 6.8 26.89 2.96 54.41 1.79 63.51.5 10.44-.42 50.99-9.71 51.8-11.78 3.3-8.44 3.53-2.83 7.77-2.59 1.81.1 17.66-5.65 29.9-13.9 1.5-1.5 1.77-4.02 2.59-5.66.82-.84 2.83.63 3.45 1.89 3.08 4.13 8.81-1.9 12.48-3.81 4.31-3.46 11.54-4.73 12.56-10.81 1.41-4 6.02-.41 8.48-1.88 6.56-4.25 14.08-9.04 19.42-16.4 1.51-2.08.52-1.56 1.21-3.63 1.07-3.21 7.02-3.13 8.46-3.54 4.3-1.89 6.78-7.34 10.26-9.85 4.1-2.94 2.23-5.72 4.69-9.7 1.84-2.1 4.81-.63 7.06-1.89 4.4-5.76 11.7-14.09 15.31-26.15 1.43-1.89 3.06-1.03 5.65-1.41 4.14-6.7 11.56-14.81 10.62-23.27.69-1.82 6.82-1.47 8.45-8.78 3.11-13.68 10.36-13.67 6.83-22.86 1.64-1.47 2.86-.26 4.71-2.36 2.06-5.2 4.19-10.01 5.38-16.36.59-3.12.78-6.91.99-10.75 5.12-2.73 4.47-5.19 5.89-9.19 3.77-6.84 1.56-15.12.94-19.8 2.59-5.89 4.55-10.97 4.96-14.33-.82-6.92 2.93-10.79-2.6-16.31-1.45-2.95 1.39-5.47 2.83-7.77 0-9.43 1.77-24.62-1.65-29.45zm-5.18-22.62c1.012 2.955 1.882 4.242 2.118 6.598 0 0-.324 3.948-1.03 5.833-.854 2.277-2.33-12.174-3.208-16.908l1.648-.706c1.303.88.47 5.18.47 5.18zm-8.18-41.022s.64 3.726 1.43 6.53c1.123 3.98 1.452 6.342 2.944 9.87 0 0-1.23.232-1.512-1.512 0 0-1.42-4.23-1.352-4.06-2.18-4.064-4.058-8.36-4.058-11.624 0-3.097 2.547.796 2.547.796zm-10.423-26.59c1.51 4.537 2.242 7.033 3.898 11.225 0 0 1.36 2.707.96 2.787-.39.08-1.03-.24-1.03-.24-4.05-6.59-7.4-19.345-6.52-19.743.88-.4 2.71 5.97 2.71 5.97zm-15.118-31.29l2.228 3.982c3.05 4.678 1.913 2.3 3.82 7.165l.715 2.15s-.427.038-1.91-2.548c-1.777-3.1-3.868-5.88-5.49-9.16 0 0-1.51-2.79-1.033-3.03.478-.24 1.67 1.43 1.67 1.43zm-22.753-34.233c1.755.74 2.946 3.57 4.057 5.095 1.26 1.724 4.13 6.926 4.13 6.926 3.15 2.69 3.18 4.06 3.42 4.3l-.48.397c-2.63-1.99-1.02-1.056-3.58-3.9l-1.75-2.47c-2.41-2.804-5.77-5.414-6.1-9.52l.29-.83zm-16.707-21.02c1.273 2.15 4.12 3.488 7.478 7.485 0 0 1.36 2.832-.08 1.433-3.28-3.186-8.432-8.677-12.092-11.862-1.06-.93-.55-1.99.08-1.91.64.08 4.62 4.855 4.62 4.855zM455.217 67.26l6.126 6.45c5.92 4.114 11.767 10.12 9.944 8.756-3.818-2.858-7.754-5.11-10.6-8.564-1.14-.95-2.382-1.455-3.56-2.502 0 0-1.91-1.512-2.626-2.786-.71-1.275.72-1.354.72-1.354zm-27.13-17.117c.08-1.672 5.568 4.14 9.467 5.255 1.057.302 5.25 3.662 5.25 3.662 3.76 2.082 2.228.557 4.615 3.583 0 0-1.66.045-4.3-1.434-3.91-2.19-5.97-4.22-10.53-6.92 0 0-4.6-2.48-4.52-4.15zm-34.052-19.266c.476-1.672 12.252 6.847 17.582 9.474 0 0 4.215 2.23 3.74 2.31-.478.08-5.35-1.62-11.14-4.69l-5.727-2.54s-4.932-2.86-4.455-4.54zm-30.073-12.26c.875-.956 9.375 3.074 10.82 3.9 1.75.877 3.102.797 6.842 2.708 0 0-.125.688-3.42-.16-3.038-.782-4.82-.693-7.664-2.255l-6.42-2.283s-1.033-.954-.158-1.91zm-27.447-7.006C337.23 10.5 349.96 14 349.96 14c-.058-.027.3.896.24.875-.508-.208-1.815.032-3.263-.08-3.38-.266-7.08-1.035-10.103-1.672 0 0-1.035-.398-.32-1.513zM298.01 6.68c4.058-.08 11.787.496 16.866 2.15 1.81.05.116 1.186-1.193.954-6.763-1.193-13.367.24-14.798-1.035-1.432-1.28-.876-2.07-.876-2.07zm-34.368.796c.496-2.2 5.334-1.018 6.637-.935.89.06 6.66.4 7.12-.02 0 0 4.45 1.12 2.86 1.36-1.59.24-15.28.72-15.28.72l-1.35-1.11zm-35.72 4.46c1.762-1.43 6.188-.862 8.91-1.115 2.19-.2 9.705-1.11 9.705-1.11 2.61.86 1.432 0 1.512.64l-2.31.48c-2.07.14-5.65 1.06-8.04 1.6-4.61 1.03-4.54.8-6.96 1.02l-2.36-.22-.48-1.27zm-17.82 3.74s4.295-1.592 5.33-1.592c1.033 0-.876 1.116-.876 1.116-3.968 2.538-4.768 2.172-9.468 3.344l-4.35 2.075s-3.685-.49-1.855-1.76 11.217-3.19 11.217-3.19zM173.108 29.45c.606-1.428.515-.256 2.068-.876 1.024-.404 4.932-1.83 4.932-1.83 1.253-.467 3.053-2.23 4.376-2.23 1.25 0 2.24-.66 3.24-1.03l-1.888 1.668c-3.058 2.09-4.068 2.1-7.24 3.423l-4.773 2.39c-.418-1.065-1.054-.708-.715-1.513zm-30.95 16.003c1.194-2.07 3.117-2.257 4.934-3.265l2.943-1.99c1.387-.3 2.626-1.274 3.42-1.115 0 0-1.437 1.602-5.01 3.5l-4.456 3.186-1.83-.32zM114.156 66.31s4.55-3.534 6.284-5.016c2.76-2.352 3.82-3.66 7.24-5.492l.955-.477-.875 1.51c-2.864 2.07-5.33 2.63-7.797 6.45-1.25 1.938-5.57 4.22-5.57 4.22-.697-.426-.658-.62-.238-1.194zM92.12 85.252c.396-.716 8.352-8.518 10.18-8.916 1.83-.4-2.465 2.468-2.465 2.468-2.873 3.08-4.166 4.204-6.84 6.926 0 0-1.274.24-.876-.477zM67.633 111.58c2.528-4.036 4.153-5.388 7.46-8.733l.478.16s.28.634-1.51 2.786c-1.89 2.284-3.34 4.3-5.23 6.646l-1.19-.86zm-19.708 28.893c1.728-5.973 5.402-9.788 9.06-13.728v1.73c-2.195 5.102-7.162 13.38-7.853 13.38-.69 0-1.207-1.382-1.207-1.382zM28.34 176.997c1.508-1.702 2.676-5.35 3.797-7.34 1.726-3.06 1.984-5.093 4.4-8.374l-.517 2.59c-1.752 5.783-4.832 10.188-7.42 16.146l-1.146-.57.887-2.46zm-7.074 19.685l.432 1.555c-.173 2.59.087 3.62-1.985 8.462l-1.898 3.71c-.192-5.94 3.45-13.73 3.45-13.73zm-9.577 38.854s.73 8.034-1.62 13.244l-.8-.552c-.09-3.022.95-6.993 2.41-12.692zm-5.1 39.458l.17-4.426.08-2.05c3.08 1.302 1.29 8.72 1.29 8.72-.17 4.232.86 7.512.1 10.04l-1.19.357c-1.5-1.33.4-4.813-.47-12.64zm1.46 38.852l-1.04-9.238.43-2.33c.69.862 1.12 2.762 1.12 2.762-.6 2.183.46 4.29.77 6.562.43 3.108 1.12 8.03.25 8.03-.86 0-1.39-3.045-1.55-5.786zm6.73 41.187c-.17-2.494-1.36-5.615-1.9-9.41-.36-2.555-.43-3.8-.6-5.96l.34-.17c.33-.544 1.79 4.372 1.79 4.372l1.74 11.082-1.38.086zm7.68 24.434c-2.29-3.647-2.33-9.238-2.59-9.41h.08c3.24 2.617 2.15 1.726 2.13 1.773l1.32 6.687-.95.95zm12.73 30.78c.29 1.857-.53 1.03-1.01.993l-2.25-4.316c-2.37-4.945-1.97-3.813-3.62-8.375 0 0 2.09 1.32 3.71 5.61.8 2.1 2.12 3.28 3.19 5.27l-.03.81zm14.18 27.847l-1.13.085c-.42-.43-.36-.51-1.64-2.85-.77-1.4-1.56-4.75-1.56-4.75.7 1.37-.17-1.72.51 0 1.38 3.45 1.64 3.11 3.67 5.85l.12 1.66zm13.07 20.65c-3.06-3.574-4.36-5.63-4.27-6.06l.77-.432c2.15 1.382 3.02 4.49 4.83 5.87 0 0 2.76 4.06 2.15 4.32-.61.258-3.5-3.7-3.5-3.7zm27.13 32.364c-3.02-3.195-9.47-10.817-13.03-15.283l1.55-.605c1.4 1.833.43 2.33 3.53 4.058 3.82 2.12 5.61 7.305 8.45 8.635l1.29 3.022-1.81.172zm27.18 22.796c-2.42-2.33-6.31-5.334-8.89-7.518-1.88-1.594-2.88-3.354-4.92-4.397l1.98.08c4.05 3.62 8.88 7.77 13.2 10.7l-.17 1.21-1.21-.09zm35.03 22.016c-2.87.42-9.05-5.44-11.7-7.04-1.68-1.02-5.13-1.33-5.13-1.33l-1.38-3.11h.86c2.4.82 4.41 1.834 6.47 3.11l10.18 6.3zm31.14 13.907c-2.01.296-6.33-2.668-8.54-3.8-3.03.012-1.8-.947-3.2-1.295-1.74-.242-3.44-.712-4.92-1.47-1.31-.67-4.14-2.16-4.14-2.16.44-1.07.13-.564.86-.775 1.15-.326 2.7 1.267 3.36 1.21l13.37 5.784 2.76 1.04.43 1.47zm218.01-7.18c-2.36 3.534-13.31 6.05-15.54 6.833l3.53-2.358c4.06-1.58 4.19-2.075 7.77-4.712l4.23.235zm15.83-7.48c.48-1.168 12.37-8.778 16.89-8.778 0 0-17.53 10.31-16.9 8.77zM459 508.21c-4.573 3.453-15.444 11.656-15.7 11.224-.26-.43 3.063-3.65 3.063-3.65 5.476-2.307 6.355-5.89 10.83-8.48zm13.027-12l3.06-5.165c1.414-1.65 1.007-2.77 4.474-5.42 0 0 1.21-2.463 3.43-2.055 2.22.406-10.96 12.64-10.96 12.64zm30.545-36.783c2.59-1.413-1.66 4.845-4.66 7.858-1.9 1.91-3.71 5.088-5.52 7.34l-.088-1.123c2.93-4.145 7.68-12.66 10.26-14.074zm15.79-20.552c-2.276 3.958-2.878 5.166-4.055 5.873 0 0 4.106-10.957 7.4-10.957 1.89 0-3.35 5.09-3.35 5.09zm19.76-33.76c-1.55 2.245-3.03 5.76-5.178 9.67l-.4 2.512c-1.5 2.583-1.24-.18-1.24-.18 2.03-4.224 5.61-15.455 5.61-15.455l.86-.52.34 3.97zm7.94-19.944c-.6-.6 1.03-7.76 3.97-11.57 0 0 .71.18.52.78-.19.6-3.886 11.4-4.49 10.8zm4.4-38.68l.21 5.07c-1.19 5.86-4.91 11.01-5.39 16.26.01.18 1.727 1.72 1.727 1.9 0 3.73-1.89 4.33-3.71 7.08-.55 1.49-1.59 1.76-2.5 3.2-1.44 2.27-3.88 10.1-4.49 11.92-.81 2.44 2.26.89 3.53 2.25l-.08 1.99c-3.96 2.55-6.84 4.31-8.98 8.29-.76 1.42 1.47 1.3-.43 5.36-.56 1.19-1.74-.16-3.1 1.47-2.23 2.67-5.23 7.98-6.01 10.29.16.39.66 1.02.66 1.02.44.87 3.28-1.3 3.02.78-.04.34-1.12 2.59-1.12 2.59-2.25.91-4.57 2.59-6.82 3.97-2.5 1.54-10.96 14.31-10.96 14.33 0 .57-2.6 3.5-1.5 4.4 0 0 4.87-1.21 4.43 1.04-.2 1.04-2.55 2.03-2.55 2.03-2.51 1.39-5.32 2.42-7.29 3.93-5.18 5.79-9.1 10.1-14.87 17.79-.02.15-1.35 2.07-1.35 2.07-.17 1.55 1.36 2.83-.51 4.01l-5.18 3.3c-5.02 2.13-9.18 7.54-9.18 7.54l-2.82 2.83c-1.56 1.53-2.4 1.58-2.31 1.81l-1.94 2.67c.33.43 4.02 2.3 1.66 4.18-.55.44-1.56.25-3.2.43-2.68 1.56-5.18 1.3-5.18 1.3-3.45.09-4.51 2.81-11.19 8.23-2.53 2.05-9.89 4.71-10.83 6.36-.94 1.65 2.59 3.77 2.59 3.77l-2.83 1.18c-6.06-.13-7.9-.1-12.95 2.83-2.91 1.69-8.27 4.76-11.54 5.89-.62.66-3.82 2.05-3.56 3.6.1.61 3.6.52 4.03 1.12l-1.09 1.74-2.85-.43c-9.65-2.59-15.91 3.05-27.84 8.59l-1.88 3.54s-3.33-2.42-4.72-2.84l-4.01-1.05-.57.6-.23.53c-2.88 6.64-7.9 9.85-13.79 10.87-2.85.49-14.24 3.03-17.89 4.14-6.79 2.05-16.35 4.96-23.29 5.07-5.53 1.59-7.62 1.33-13.44 1.3-5.18-.03-20.12 1.04-20.12 1.04-23.12-1.47-42.98-1.51-71.94-15.88-3.56-1.66-9.67-2.84-13.42-4.95l-2.36-2.59-3.53-3.06c-6.92-5.35-10.22-8.49-16.95-9.95-2.02-.94-4.07-2.72-6.38-3.54-.71-.1-1.88-.22-2.24.78-.33.91 1.34 4.32-.95 3.54l-2.33-1.9s-5-11.05-25.8-20.29c-.24.27-1.47.61-1.47.61-.71.95-1.64 3.88-2.76 3.71-1.12-.17-2.25-2.73-2.25-2.73l-.13-.27c-1.06-2.23-3.68-6.97-5.12-9-5.52-5.18-9.87-9.49-17.77-13.73-.49.02-1.7-.55-2.16-.09l-1.12 1.12-1.38-1.38c-.87-2.07-1.67-3.74-1.84-5.53-.09-.96-.52-1.07-.83-1.8-.26-.32-5.09-5.18-5.09-5.18-4.23-5.5-6.56-8.98-11.73-12.44-.6.39-3.06 1.27-3.63 1.21l-1.13-.1-.77-1.7-.13-.61c-.57-3.23-1-5.29-1.86-8.22-2.28-4.74-6.3-8.7-9.62-13.25l-1.09-1.49s-.09-1.41-1.55-1.41l-2.5 2.33-.78-1.99c.26-6.13-.26-10.53-3.89-14.07-2.28-2.23-2.89-5.89-4.22-8.46-.58-1.05-2.03.07-3.28.17-1.35.09-1.96-.9-2.25-4.41.03-.45-.26-1.82-.26-2.25 0-4.93-1.28-8.47-3.11-12.52-1.13-2.51-3.44-5.47-4.14-8.2-1.43-1.44-.76-.45-2.07-.78l-2.07-1.9c.18-1.38.6-3.66.6-5.01 0-5.69.09-8.38-2.42-13.99l-1.9-8.38s-.55-.91-1.3-1.9l-2.95-1.12c-.77-.3-.52-3.18-.52-3.2.65-2.19 1.12-4.72 1.12-6.9 0-4.32-1.43-8.58-2.42-12.78 0 0-1.17-4.61-1.29-5.18-.25-.19-3.11-.52-3.11-.52-1.04-.74-.63-1.72-.35-2.25.69-1.52 1.9-5.05 1.9-6.65 0-2.23-.17-4.16-.69-6.56-.55-2.59-.77-6.13-1.72-9.07-.17-.53-.91-2.21-.87-2.77-1.33-1.91-1.95-3.66-1.95-5.74 0-3.32 1.63-3.27 2.81-6.44.79-2.1 1.54-15.93 1.54-16.72 0-3.68.96-3.57-.33-5.73l-3.71-3.02c.1-4.14 3.45-7.9 4.83-11.31 1.45-3.6 2.08-8.64 2.09-12.92 0 0 5.75-15.49 2.79-15.94-1.69-.25-2.01.15-2.74.36l-.51-1.9c1.81-2.84 3.05-4.54 5.52-7.94 0 0 1.77-3.55 1.9-3.71.1-.3 2.15-6.13 2.15-6.13 1.34-3.84 2.76-6.62 2.76-10.62 0-1.52-.94-3.54-.87-4.75l.37-1.74c4.88-3.86 8.42-8.79 11.18-18.37l3.02-5.26c.19-.98 2.24-2.88 2.24-4.24 0-1.66-1.26-.58-2.25-1.81l-.95-.77 2.07-2.07c7.88-4.28 11.24-12.73 16.13-20.21l2.93-4.57c.9-.62 2.25-2.09 2.58-2.76.43-.87 1.61-1.6 1.16-2.65-.4-.93-1.91-.64-2.71-.88-.38-.11-.78-1.34-.4-1.51 1.99-.87 3.01-2.78 4.61-3.18 5.87-3.44 8.98-8.13 13.17-13.6 0 0 5.09-5.23 5.41-5.65.48-1.59-1.54-3.18-1.54-3.7 0-.49 3.92-3.3 3.92-3.3 9.86-3.1 12.17-7.88 19.41-15.44.48-2.86.55-3.24 2.46-4.38l3.26-.87c2.78-.63 10.74-7.64 17.65-11.77 0 0 2.72-1.64 3.03-1.91.06-.22.56-1.99.56-1.99-.72-1.75.25-2.61 2.63-3.18 5.27-1.28 29.43-8.67 28.8-14.88l1.15-1.65 8.95-.41c3.26-2.15 5.93-2.81 12.53-5.59 0 0 3.7.1 4.34-4.28 2.53-.93 8.48-.74 10.18-.72 0 0 4.59-.95 4.773-.95 2.12-1.24 4.49-1.89 6.8-2.49 3.48-.91 5.3.1 5.38-3.8l3.66-.79s14.79.4 22.78-1.18c0 0 5.77-.65 6.89-1.37 1.91-1.51.35-3.21 1.35-3.5 1.46-.43 4.72 1.33 7.08 2.55.25.01 10.9-.08 10.9-.08 6.19.47 9.62 1.04 15.19.23-.24-4.22 6.92-1.59 9.54-.16 2.06 1.13 8.91.48 8.91.48l10.58 2.39c3.68.51.88-1.12 2.31-1.44 3.23-.72 3.65-1.37 5.41 0 .83.64 3.56 2.62 4.45 2.95 6.68 1.51 13.56 3.14 19.49 3.66l5.73.4 1.27 1.27c1.8 1.96.45.7 2.78 1.75 1.88.85 10.3 2.56 12.01 3.98 2.1.62 4.32 1.11 6.2 2.31 15.27 9.71 8.45.34 9.62-.08 1.11-.4 8.04 7.48 8.04 7.48 1.43 1.44 6.403 3.14 12.88 7.02 3.282 1.97 8.1 5.86 8.36 4.84 1.75-6.76 7.76 5.02 11.38 7.25 2.07 1.28 3.573 2.45 5.17 3.5-.53-.19 7.92 5.14 8.51 5.98 5.57 7.8 5.97.63 6.765.31s5.81 8.04 5.81 8.04c-.24 2.23 6.79 7.29 10.9 10.43 2.76 2.1 4.31 7.37 5.73 6.61 5.17-2.78 4.38-2.94 7.88 5.89 1.26 3.18 7.48 8.68 7.48 8.68 2.71 3.66 1.75 3.34 3.26 4.86 2.75 2.76 1.44 3.37 5.02 2.39l1.35.48c1.1 1.58 1.99 5.8 2.46 7.57.45 1.71 3.27 4.15 4.213 5.5 0 0 9.63 16.32 10.82 16.4 1.2.08 2.55-2.79 3.27-2.31.71.48.95 5.17.95 5.17l.4 1.99c.62 4.91 3.27 8.88 5.25 13.14 1.81 3.93 3.02 6.05 5.17 10.35 0 4.7 3.7 2.35 4.53 3.11.453-.23.1 2.19.396 2.23l1.04 4.14c.77 5.17 1.43 10.09 4.3 14.25l1.12 4.22c-.35 2.32 2.6.91 4.57 1.82l-.25-.06c.98.09.66 1.58.57 2.36-.06.57-1.38 3.02-.41 7.81.09.42 3.06 9.66 3.06 9.66 1.16 5.71 1.47 7.83 5.89 11.78 0 0-.33 6.07-1.18 8.48-1.26 3.54 1.172 8.06 1.172 9.66 0 1.44-1.24 3.3-.23 4.71 1.74 2.54 1.34 2.84 1.642 5.89.4 4-.99 7.78 2.59 9.89l1.88 1.18c-.4 3.12-4.8 2.55-3.06 24.03.32 3.86-3.32 2.54-.94 5.66l3.77 3.06-1.33 3.43c-1.41 2.79-3.72 4.09-3.85 7.17l-.23 9.66c.05-1.6-.93 2.66-1.35 6.22-.44 3.78 5.78.95.69 9.76-.29.51.37 1.04.17 1.73-.37 1.3-2.66.71-3.02 1.73zm5.09 10.62s-.7 3.69-1.38 3.37c-.68-.32 1.207-15.28 2.416-15.19 1.204.09 0 3.28 0 3.28l-.03 3.24c-.316 1.86-.3 1.07-1.01 5.32zm3.71-30.65l-.345 2.94-.863 4.32c-1.41-1.65-.044-3.53.154-6.65.08-1.21.157-4.31 0-4.95 0 0-.11-4.4.708-5.65l2.12-1.65-.215 2.68c-1.65 3.06-1.1 4.31-1.55 8.98zm3.184-29.32s-2.59-15.31-.705-15.55c1.89-.23 1.42 3.3 1.42 3.3.12 3.88-.7 12.26-.7 12.26z"/>
+  <path d="M183.934 557.13l.224-7.512c-.268 2.433-.545 5.307-.224 7.513zm43.382-435.193c.456 2.97-3.312 1.028-.914 4.914-1.484 2.18-4.002 3.64-6.112 2.37-2.68-2.71-9.99-5.79-2.91-7.05-2.398-2.97-.237-3.51 1.028-4.57 3.167.43 6.28-.68 8.908 4.34zm81.878 1.713c-1.14 2.972-4.01 5.504-4.224 8.457-3.372.845-5.277-1.56-6.966-3.885 0-2.112 7.194-2.97-.172-6.595 1.69-2.744 11.997-2.2 11.362 2.023zm-50.588-1.142c1.112-.544 2.226-2.078 3.312-2.056 1.024.02 1.94 1.6 2.398 3.428.31 1.24 2.007 1.377 1.94 2.628-.113 2.172-1.448 4.053-3.767 4.686-.69-.74-1.38-1.747-2.06-1.714-2.06 1.143-4 2.972-5.71-2.172.12-1.058.94-.955 1.14-1.714-.57-1.143-.36-2.09.11-2.743.67-.41 1.66.13 2.62-.34zm92.828 5.258c.42 4.647-4.64 3.59-5.906 6.97-2.53.21-3.168-2.535-5.488-2.953-1.474-1.484-3.377-2.75-2.53-5.072 1.056-1.68 4.64-.42 4.01-3.37 3.586-5.91 9.494-.42 9.914 4.43zm-126.402 18.512c.454.257 1.257.8.457 3.543 1.14 1.03 1.37-2.97 2.96-2.28 3.99 2.29-4.57 5.94-2.63 8.46-3.88 4.57-7.23.45-8.5-2.08-.35-1.83.15-3.85 2.32-4.2.23-1.37.92-2.41 1.6-3.77 1.84-.79 2.25-.51 3.77.34zm43.454 3.562c0 3.38-2.32 3.8-1.478 7.39-1.478 1.902-4.006.635-6.12 1.055-2.95-1.055-1.685-5.275-4.852-6.543-.21-1.48.21-2.536 1.478-3.377 4.01 2.743 8.44-3.594 10.972 1.475zm67.748 6.77v2.96c-3.164 1.057.21 4.435-2.95 5.49-1.692-4.223-8.87.212-7.6-6.125 4.217-1.897 1.898-6.965 6.543-8.445 3.165.846.63 4.86 4.007 6.12zm-45.986-3.75c-1.053 2.533-2.11 5.486-4.43 6.963-1.9.216-3.586-.21-5.067-1.477-.84-2.953-.2-4.008 1.06-6.543 2.75.422 6.97-2.958 8.44 1.057zm64.822.73c-2.532 1.69-2.532 7.178-6.54 5.486-1.478-2.11-5.27-1.686-4.85-4.85 2.533-.425 4.218-3.17 6.964-3.593 1.894.423 3.796.845 4.425 2.958zm-45.432 2.954c-.21 1.477-1.685 2.957-2.956 3.168-4.637 1.056-5.48-3.378-7.17-6.12 0-1.48.843-2.114 2.11-2.536 4.85-1.265 4.85 4.01 8.016 5.488zm-60.398 9.506c-1.296 1.384-3.117 1.897-4.597 1.473-2.532-1.478-9.037 1.237-8.19-4.674 4.224-1.49 3.34-7.36 8.016-5.37l4.77 8.56zm101.227 4.658c0 2.75-1.056 6.548-4.435 6.548-1.685-2.112-8.262 1.383-6.574-3.894 2.74-2.957 8.477-7.93 11.01-2.654zm-22.315 5.168c-2.322 2.744-6.38-.458-8.068 3.34-1.27.212-2.742 0-2.958-1.48.846-2.74-1.486-4.935 1.89-6.202 2.957 1.477 8.29.54 9.136 4.342zm-99.342 3.95c-2.11 1.896.634 5.91-2.53 7.388-5.067.845-3.59-5.067-6.333-6.548-.63-2.322 2.11-2.742 3.376-4.01 2.532-.42 4.01 1.482 5.487 3.17zm126.52 10.334c1.687.636 1.6 2.785 1.6 4.687-4.222 1.477-6.076 2.873-11.354 2.237-1.685-1.686-2.036-3.896-.98-6.01 1.69-2.32 3.936-4.546 6.47-3.07 1.264 3.38 2.576.26 4.265 2.157zm-15.187 5.03c-.335 3-.05 8.154-2.2 8.8-2.116.214-4.413.854-5.68-1.258 1.686-3.378-2.974-3.81-1.287-6.55 3.586 0 6-4.582 9.167-.992zm-118.298 7.712c1.897 2.96 1.054 5.492-.846 8.024-2.11 1.477-2.53-1.056-2.96-2.532-1.9-1.478-5.7-.636-5.49-4.436.42-1.69 2.11-2.746 3.79-2.533 1.26 2.113 3.8 2.324 5.49 1.477zm133.943 11.728c1.26 1.475 1.685 3.376 1.475 5.49-1.475 2.106-3.797 3.374-5.907 2.106-1.69-2.95-6.328-5.275-4.646-9.08 1.054-1.477 2.535-1.477 4.012-1.477 1.69 1.05 2.53 4.22 5.066 2.96zm-18.04 12.572c1.474 2.743-.217 6.12-2.957 6.543-2.95-1.477-6.75-4.646-7.59-8.025 2.96-3.8 8.44-1.267 10.55 1.482zm-110.972 11.182c.636 1.902-1.896 3.17-2.954 4.014-2.108-.845-4.01 1.687-5.484-.637 1.265-2.95-.846-6.12 1.898-8.44 3.798-.84 7.176.85 6.54 5.07zm126.63-1.34c1.472 2.323-.42 4.857-2.113 6.123-4.223.846-7.383-1.266-10.34-3.588.846-2.12 1.48-5.5 4.432-5.92 3.798-.43 4.854 2.53 8.02 3.38zm-23.872 7.906c-.213 2.113-2.53 2.957-4.01 4.015-1.686.42-3.162-.635-3.586-1.902-1.055-2.534-.42-6.754 2.95-6.543 4.013-1.692 2.956 2.96 4.646 4.43zm8.632 8.08c-1.27 5.067 6.328 2.323 4.642 7.6-2.11.636-3.376 2.747-6.122 1.9-3.798-1.69-2.32-5.7-3.37-8.443.42-2.323 3.79-2.533 4.85-1.056zm22.05 7.936c-.844 2.533-1.057 6.333-4.428 6.964-1.69 0-3.375-.21-4.432-1.898 1.057-3.168.42-7.178 3.37-9.08 1.908-.42 3.802 2.532 5.49 4.014zm-8.516 13.478c1.055 3.8-3.802 3.166-5.487 2.536-1.267-1.48-2.996-1.178-3.59-2.962l.594-3.723c2.315 1.686 7.216.772 8.48 4.15z"/>
+  <path d="M254.837 398.7c0 .845-.35 1.756-1.667 1.492-3.248-3.864-4.74-3.513-6.747-5.85-.21-1.052-.328-1.77.515-2.406 3.796.424 5.53 5.183 7.9 6.763zm.35-7.38c-1.264 2.536-1.403.528-2.895-.087-1.053-2.744-7.834-4.472-5.09-7.64 3.51 1.14 7.372 4.742 7.986 7.728zm-19.282-93.06c1.4.11 1.4.863 1.077 2.05-2.32 1.69-4.417 1.724-6.68-.755 0 0-1.402-1.078 2.263-1.078.646 0 1.94-.325 3.34-.216zm-.647-2.264c-.862-2.48-3.986-.107-3.124.216-.423 1.053 1.508 1.4 2.694 1.078 0 0 .538-.108.43-1.294zm-6.015-7.878c.424 2.112-1.42 2.703-2.065 4.104-1.51.324-3.156-.562-4.634-1.617-.42-2.534 1.724-3.558 3.746-3.963 1.268 0 2.11.42 2.953 1.476zm10.432-.964c.213 2.533-2.303 1.05-3.36 2.737-1.477-.21-2.372-.28-3.427-1.76-.63-1.48.56-2.81 1.615-3.23 2.322.21 4.963-.9 5.172 2.27zm44.607-24.258c-1.057 1.898-1.12 2.406-3.016 3.882-2.532-.42-4.278-.953-6.172-3.067 1.055-3.79 4.88-.7 7.573-2 .88-.42 1.615 1.19 1.615 1.19zm-7.865-10.027l.69.83c1.9.84 5.905-2.72 6.96.24.54 4.42-4.79 3.69-7.11 4.53-4.43-1.27-.548-7.12-5.82-7.12-2.11.21-3.945-1.06-5.635-2.11-.29-4.04 4.344-3.93 3.912-4.69-.43-.76-3.556.43-2.91-2.27 9.05-3.99 7.802 5.71 9.913 10.56zm98.786-142.56s-.828.91-.162-.72c.28-2.06 1.62-3.15 2.12-5.16.4-.14-.53-7.28.27-12.57l.67-4.63c-1.11-3.34-1.51-9.38-2.08-13.72-.66-6.35-1.62-11.3-2.41-17.12-.17-1.25-1.34-2.09-1.32-3.31l1.06-2.52c2.5-2.69 3.44-4.5 4.37-7.28.27-.81.06-4.87-.27-5.69-.22-.27-1.98-1.99-1.98-1.99-2.74-3.38-9.25-1.46-9.25-1.46-2.13 1.55-3.11 1.3-3.43 3.7-.24 4.13 1.04 8.16 2.25 9.26l1.99.13h.27c-2.65 6.75-1.7 11.62-3.17 17.86-2.69 11.32-5.82 27.39-1.43 38.03l.37 1.35-1.72-1.54c-4.08-1.17-9.3-7.2-12.03-10.32-1.4-1.6-2.65-1.14-4.06-2.27l-.91-.73 2.06-.32c.67-.38 1.01-.33 1.98-.27 1.02.06 1.46 2.91 3.44 2.25.28-.1 2.25-.53 1.99-3.31-2.24-1.85-4.49-2.1-4.49-3.84 0-.84.63-1.98.8-2.78.18-.92 0-1.8 0-2.52 0-1.37-3.57.66-2.64-.66 1.59-2.28-2.25-2.25-2.25-2.25l3.3-2.91c1.79-1.63 2.21-1.28 2.21-3.17 0-.66-.14-1.32-.37-1.95-.77-2.03-3.7-4.12-3.94-5.07-.07-.27 3.44-2.38 3.44-2.65 0-1.43 1.1-8.06-.4-10.06-.4-.53 2.29-1.55 5.85-4.4l.42-2.43c.24-.93.43-1.7.43-2.38 0-.75-.89-3.9-1.48-4.52-.82-1.43-1.95-1.87-3.25-2.37-1.1-.43-1.68-.19-2.64-1.24 0 0-.12-3.84-.12-4.76 0-1.83-.26-2.76-1.34-3.98-3.65-2.74-10.6-.87-10.6-.87l-.12.03c-1.56.84-1.1.95-2.09 2.96l-.66 2.12c.05.46.95-.12.92.26-.41 4.62-5.16 4.37-6.13 6.41l-.5 1c-.21.68-.31 1.33-.31 1.95 0 4.29.21 8.51 6.92 10.33l.31.2 1.58.89c-1.08.66-6.23 3.08-4.63 3.44-2.11 4.63.93 8.73 3.05 10.19l1.46.4-3.2 2.57c-.93 2.11-1.43 3.33-1.43 5.49 0 1.22 1.11 1.86 1.59 3.17.92.53 1.63 2.02 1.84 2.69.06.21.09.41.09.61 0 .73-1.67.67-2.05 1.33-.38.68-.53 1.72-.53 1.72l.14.26c-.99.8 1.97 3.23.66 3.44-2.28.37-8.86-.62-8.86 1.19 0 .1-.01 2.68 0 2.78 1.37 1.14 7.79.48 9.52.4 1.7-.08 1.36-.85 3.17.4l-3.31 4.24c-2.8 3.67-8.41 8.6-11.19 11.92l-.45.68-9.22-9.95s-4.91-4.57-7.42-7.43c-.13.12-2.06.1-2.06.1-2.32-1.81-5.46-2.62-6.54-1.28-.25.32 2.78.84 2.33 1.41-1.28 1.57-1.37 1.83-2.86 3.08l-3.89 3.77c-2.73 2.4-5.59 7.09-9.19 9.13l-.44.02-.24-.35c-2.6-3.77-7.09-8.6-10.1-11.88l-3.43-3.42.57-1.26c1.99.98 5.29.3 6.88.43 1.35.12 2.18-.9 2.78-1.45.3-.27-.46-1.98-.39-2.65-1.12-.37-7.44-1.28-9.95-1.52-1.96-.18 1.36-2.18 1.36-2.18 1.38-1.1 1.43-5.22.53-6.49-.56-.69-2.25-2.61-2.25-3.31 0-1.23 2.73-2.4 3.31-3.44.45-.83-.53-3.36-.4-4.13l.02-.13.06-.11c.3-.58-.08-1.2-.08-1.72 0-1.41-.44-2.58-1.41-3.87-.91-1.21-1.97-.07-1.97-1.42 0-.2.02-.4.07-.6.22-1.05 3.72-1.65 2.67-6.28.66-5.24-2.06-5.61-1.46-5.96 2.51-1.46 5.29-.53 7.58-8.74l.46-2.17c.27-.84-2.03-3.04-3.08-3.85-2-1.53-4.74-.85-4.74-3.75 0-.71.83-2.67.19-5.03.08-2.7-1.82-3.33-4.93-4.12l-3-.95c-1.33-.5-2.59-.16-3.41.22-1.74.78-3.84 2.63-4.52 4.43-.13.48-.17.99-.17 1.51 0 .79.1 1.62.21 2.42.09.78 1.06 3.25.45 4.01-.61.77-3 1.37-4.36 1.59-.6 1.38-1.02 2.2-1.02 4.48 0 .93.26 4.27.57 5.2.56 1.46 1.51 1.56 2.83 1.72 1.43.16 2.95.37 3.86 2.71l.17.42s-2.96.95-1.61 7.46c.23 1.11.18 2.3.54 3.4.11.64.82 1.23 1.5 1.8l1.24.47c-.31 1.31-.26.79-1.2 1.08-2.38.73-1.49 4.1-1.89 5.61-1.28 4.81 1.54 5.06 3.1 6.15l.48.34-.18.56c-.76 2.26-2.69.38-2.69 2.92 0 1.06-.63 6.68-.34 7.73l.18.63-.58.29c-1.07.54-4.92.71-6.12.61-3.17-.27-1.6 1.66-2.51 3.44-.79 3.7 4.53 1.37 7.14.92 1.99-.34 5.42 1.06 5.42 1.06s-4.75 5.41-7.14 7.94c-2.25 2.38-4.63 5.69-8.14 9.03l-.23.39-1.3-1.58-13.36-13.26.34-2.17c-.11-.33-1.72-1.67-1.72-1.93 0-.5 7.79 1.72 10.19 1.51 1.3-.12 1.05-3.03 1.23-3.58 0 0 .01-.02.01-.06 0-.21-.22-1-2.21-2.81-1.54 0-3.69.63-4.2-.06-.28-.38-.38-.8-.38-1.25 0-.7 1.59-1.76 1.85-2.51.29-.87.23-1.43.23-2.03 0-.8-4.32-3.02-4.32-3.02l.72-.87c1.454-1.76 4.29-4.38 4.29-6.09 0-1.31-2.79-3.76-3.08-5.18-.29-1.47 2.03-2.63 2.03-4.18 0-1.24-.65-1.31-.12-2.63.02-.15-.32-5.54-.32-5.54l.69-.06c1.01-.08 2.08-.44 2.86-1.56.51-.74 2.15-2.15 2.29-4.33-.02-.16-.05-.33-.05-.51 0-.79-.22-1.74-.09-2.62.14-.88.28-1.78.28-2.64 0-.68-.12-1.32-.37-1.93l-.86-.5c-3.002-1.71-6.452-.24-5.5-4.3-1.78-2.37-2.27-6.45-5.49-7.4h-6.33c-1.71.84-1 2.32-2.33 3.88 0 .11-1.49.91-1.49 1.02 0 8.51-1.55 5.26-2.99 7.29-1.08 1.54-.47 4.33-.47 6.09 0 1.54 1.19 2.16 3.22 3.7l.85.06c.72.32 2.08.9 2.08 2.29 0 .32-.99 1.07-1.15 1.47 0 0-2.03.12-2.03 2.39 0 1.3-.95 3.04-.712 4.42.958 3.34 2.92 4.68 2.92 5.68 0 1.39-1.76 2.31-2.56 3.51-.952 1.43-1.484 2.31-1.484 3.53 0 1.04.44 2.03 1.67 2.99.91.35 3.58 2 3.84 3.14.03.14.04.29.04.42 0 1.06-.67 1.44-1.855 1.79-.65.19-1.25.75-1.25 1.15 0 .02.336 1.7.34 1.71l.1.49-.76.56c-1.08.81-2.89.29-2.92 1.43 0 .01-.56.96-.56.97 0 .15 1.09 1.92 1.59 2.34 2.626.72 3.31.57 5.14 1.03l.8.68-1.26 2.06c-2.28 2.52-4.564 7.2-7.31 7.55-.68 2.97-1.25 4.34-3.88 5.6l-2.104.78.37-1.81c.57-2.81 1.39-8.72 1.39-11.34 0-4.93-.64-6.18-1.48-11.06-.86-5-1.25-10.4-1.91-15.89-.08-.73.02-1.47.05-2.22l-.9-8.28c-.01-.69-.04-1.38-.02-2.06.33-7.64 3.07-4.77 4.23-10.11-.08-3.39-2.83-5.53-5.95-8.54-2.65-.18-4.92.28-6.62 1.28-1.89 1.72-3.54 5.07-3.52 7.25 0 0 0 .54.03.51.59 1.97.59 4.82 3.45 5.66l1.2 1.41-.02.45c-.28 6.74-1.39 10.34-2.73 17.12-1.5 7.59-2.4 13.96-3.38 22.21-1.18 9.83.82 12.6 3.34 17.89l.43 2.23-1.37 2.4c-.714 2.24-2.63 6.72-2.63 8.91 0 1.54.76 3.08 1.72 4.47 0 0 1.146.8 1.83.87 0 0-.09 1.29.23 1.77.62.06 3.31 2.17 3.31 2.17l1.71 2.17c-2.17-.46-4.26-.06-5.02-1.83-.553-1.3-1.42-1.39-2.17-1.03-.52.25-1.88 1.49-2.173 2.76-.07.24-.1.48-.1.71 0 1.55 1.12 2.92 2.16 3.5.33-.08 2.06-.12 2.06-.12 1.47-.47 4.11 0 5.71.69l-.32 1.19-.09 1.99s.11 1.08.97 1.08l.54 6.36s-1.075 9.49-.43 11.43c.65 1.94.11 8.84.11 8.84.46 3.472.34 7.513.324 9.28.76 2.37 0 28.68 0 28.68s-.75 17.36-.43 21.89c.29 3.99.33 16.17.33 16.17s1.19 9.38.65 10.67c-2 4.81-.11 13.91-.11 13.91s.65 5.39.11 6.69c-3.04 7.31-.32 9.28-.32 9.28s.64 2.05.21 2.69c-2.41 3.61-.104 7.44-.104 7.44l.11 6.47s1.83 27.49-1.51 27.71c-3.34.21-1.61-18.76-1.61-18.76s1.84-11.11.54-16.18.11-21.46.22-23.83c.11-2.37-.32-6.688-.32-6.688v-37.3l.54-6.58-.43-16.28v-33.3c-.48-6.39-.81-4.73-.49-7-.15-5.35-.26-8.53-.26-8.53l.43-13.91-.65-1.51c-2.43.19-4.09 2.26-4.63 6.25.74 9.73 1.08 3.34.75 13.69-.21 6.71.47 16.21.32 25.71-.38 25.11-.67 80.19-.87 98.21-.14 13.16.44 16.36.44 38.62 0 3.83.06 15.74.08 19.5v.21l-.11.18c-2.37 4.12-4.87 9.41-4.87 13.74 0 1.62.33 3.21 1.11 4.73 2.29 3.35 3.44 6.49 3.44 9.82 0 4.49-1.93 2.98-2.46 6.08-.44 2.54.03 1.65-2.11 6.67-.69 1.3.47-1.27-1.4 9.49-.69 2.56.7 5.97.7 5.97 4.65 2.99 4.74 9.577 4.74 12.47 0 2-3.07 1.41-5 9.84l-2.28 1.85c-1.85 2.53-1.23 2.36-1.23 5.27 0 .64.05 2.83.26 3.51 1.85 3.51 4.01 2.25 4.92 5.84-.09 3.72-.03 6.8.14 12.13.58 3.7.25 32.3.25 35.81 0 3.53.5 10.34.29 14.15l.29 14.1c-.64 6.46 1.11 16.28.35 20.38.01 4.52-.82 5.7-.23 9.87-.48 4.21.36 4.7.36 4.7-.1 1.45-5.04 11.33 21.07 17.31 7.04 2.56 10.6 2.66 18.5 4.82 20.55 5.73 54.38 4.02 84.7 4.54 10.31-.97 20.53-3.76 30.45-5.88 8.29-1.56 9.61-3.5 17.36-6.93 0 0 5.26-10.35 5.98-14.57.43-2.55.87-2.95.95-4.446.77-14.66-.24-26.31.07-27.6.33-11.78-.3-9.9-.17-26.5 0-27.08-.38-20.64-.6-48.88l1.47-1.84 2.51-.29c.865-.87 5.875-5.3 0-10.22-.44-1.96 1.125-2.27.19-3.96-2.02-3.66-1.2-5.83-.77-8.44.15-.88 1.56-2.38 1.79-3.23.383-1.92 1.93-3.18 3.124-4.58.95-1.11.44-2.69.87-3.9 0 0 1.88-1.307 1.88-4.63 0-3.26.45-6.25-.43-9.697-.87-3.44-1.73-6.51-1.73-9.98 0-3.38-2.03-4.19-.44-7.67.07-.18 2.69-3.46 2.69-3.46.51-1.44 2.03-6.52 2.03-7.88 0-.92-.25-1.8-.89-2.59-2.38-1.11-11.06-6.54-11.06-8.06 0-.35-4.3-9.57-3.32-9.98 1.74-.72 4.34 12.44 10.55 13.89 1.26.3.66-3.73-.31-4.41l-.33-.23-.01-.4c-.01-.7.28-2.13.28-2.84 0-5.89.78-7.41.53-14.23-.02-.6.36-10.93.35-11.54-.11-4.34-.8-2.4 0-10.054.4-3.86-1.94-5.25-.46-9.71l-.69-4.91c.03-2.64-.38-6.34.27-11.78-.43-8.85-.08-9.9-.08-18.94.46-2.39-.13-8.1-.13-10.66 0-2.81-.21-14.09-.39-16.9-.18-2.81 0-11.97 0-14.74 0-1.17-.06-1.38.02-2.5.14-6.59-.28-13.65-.13-18.75-.35-7.66 0-25.13 0-32.8 0-4.6.68-6.63.45-10.51V144.3c-.58-1.64-.91-7.75-.91-9.48 0-.58-1.14-3.08-1.14-3.08.57-1.49 5.18-1.11 6.51-1.14 2.9-.07 2.53-1.12 3.35-3.91.09-.24.14-.45.14-.64 0-.55-.37-1-.94-1.64l-.84-1.18c-.91-.41-1.39-.09-2.22.63-.83.72-1.62 2.18-3.42 1.34l-.39-.18-.06-.42c-.23-1.44.36-2.97.72-4.76.41-2.02.44-3.89.26-5.28s.2 1.44.01 0-.75-3.12-2.31-3.87l-.57-.46v.014zm-14.576 435.14c-3.205 5.95-.635 7.3-6.308 9.04-2.63 1.72-4.02 2.29-9.53 3.56-3.8 1.39-6.39 1.97-10.16 3.08-7 2.07-11.45 3.31-19.09 4.23-6.51 1.43-17 .32-23 .29-5.36-.07-11.89.31-20.17-.29l-14.94-.38c-27.03-4.47-36.92-5.47-59.24-17.2l-.38-.22s.87-14.97-.54-18.48c-.09-15.03-.84-30.86-1.69-45.21-.97-16.46-.21-34.63-1.06-45.86.39-2.84-.56-3.91-.03-5.43.52-1.49 1.31-2.11 4.29-3.11l1.93.48s8.99.7 9.04.7c0 0 11.5-.88 23.79-1.06 13.64-.2 29.21.75 33.35 1.58 1.06.21 2.43-1.05 5-1.06 16.15 1.84 38.09-.5 62.93 1.23 2.46-.04 3.66-.69 6.05-.71 1.45-.01 2.88 1.33 4.3 1.32 2.59-.02 4.06-1.82 6.49-1.85 2.64-.03 6.32 1.8 8.71 1.78l.36-.01.23.26c.47 3.24.63 3.67.63 7.09 0 1.65-.16 3.37-.33 5.17l-.38 6.16.45 27.73c.16 15.51-.29 28.4-.29 43.49 0 6.73.24 9.1.09 19l-.6 4.63h-.01zm-139.59-133.58c-.383 1.49-1.366 1.99-2.105 4.04-.413 1.14-.29 3.95-1.054 4.83-2.28 2.63-3.518 4.78-4.936 5.9-2.875 2.26-2.035-.44-2.035-.44 2.67-3.8 4.464-10.15 6.97-14.43 0 0 3.507-8.06 4.695-8.6 1.187-.54 1.434.66 1.434.66-.844 1.9-2.35 5.63-2.968 8.02zm10.973-16.16c.175 3.16-2.72 9.31-2.81 17.48l-1.755 6.58s-.058 1.99-1.316 1.4c-2.64-1.23-1.94-6.24-1.94-6.24 1.93-5.54 1.93-7.64 2.19-9.05.26-1.41 3.32-7.2 3.13-10.31 0 0 .9-.94 1.6-1.12.7-.18.88 1.23.88 1.23zm-6.76-6.94c.176-3.08 6.557-9.62 7.988-11.95 1.404-2.29 5.003-5.1 6.232-6.59.006-.01 5.354-5.18 4.037-5.62-.823-.28-6.407 4.48-9.2 5.76-2.497 2.34-4.14 5.48-6.686 8.82-6.49 7.38-7.02 12.21-13.51 24.59-.17 3.33-1.01 4.56-1.93 6.76 0 0-1.75 6.14-2.9 6.23-1.14.09-.35-3.43-.35-3.43 2.73-14.55 2.37-9.93 4.13-18.54 2.55-9.23 12.56-21.61 15.45-24.68 2.27-2.41 5.79-4.31 5.88-5.45.09-1.14-2-.47-2.46-.62-.86-.27-2.05 2.31-2.77 2.69 0 0-3.2 3.27-3.72 2.83-.52-.44-.41-1.34-.41-1.34l2.54-3.22c1.34-1.54 6.83-7.23 6.48-8.02-.35-.79-4.12-1.5-4.12-1.5s-1.14-.88.44-1.58c1.58-.7 3.06.49 4.13.35 2.13-.28 3.37-1.09 5.78-.48 3.95 1.02 7.36 3.45 9.13 6.52l.11.18v.22c0 2.43-.49 2.63-1.66 4.02-.92 1.11-1.84 1.84-2.87 2.6 0 0-13.63 15.23-16.61 19.71 0 0-8.34 15.38-8.42 14.14-.35-5.01 5.23-10.25 5.36-12.47zm44.572-182.37c-1.858.91-3.404 2.07-5.48.2l-1.207-.78c2.068-1.49 3.518-2.03 5.177-1.6.692.18 1.8-.97 2.17-1.09.14-.07.292 2.21.216 2.26l-.875.98zm-6.002 5.82c1.887-.72 3.876-1.29 5.884-1.39l8.536-2.83s7.883-1.94 10.452-.33c2.91 1.83-9.18 2.37-9.16 2.37l-9.578 2.34c-1.95.26-3.247 1.39-5.074 1.97-1.43.54-4.365 1.79-5.603 2.37 0 0-.41 0-2.036.05-1.62.06-.66-1.43-.66-1.43.05-.03.16-.08.16-.08 2.3-1.31 4.66-2.29 7.09-3.06zm14.635-10.8l6.833.07s2.218-.83 3.295-.51c1.078.32-.215 2.59-.215 2.59l-2.072.78-3.3-.59s-.662-.85-1.847-.74c-3.02.27-2.7-1.62-2.7-1.62zm36.902 85.97c.145 2.6.145 3.61 2.747 4.92l2.023 1.3s.68-.02 1.59.58c1.275.83 2.185 2.07 2.747 4.34.103.41 1.156 1.44.514 2.1l-1.237 1.8-1.59-2.61c-1.61-2.79-5.31-4.3-7.66-5.79-2.71-1.71-2.02-1.74-3.46-6.08-.55-1.25.29-2.1.29-3.25 0-.36.01-.71.02-1.05.01-.34.02-.67.02-.98 0-1.57-1.62-3.36-3.21-4.41-.52.29-5.53-4.76-5.53-4.76l-2.41-2.91c-.65-3.03-1.44-4.34-1.01-6.65.43-2.32 1.01-1.16 1.01-1.16.57.68.5.72.83 3.18.33 2.46 2.9 7.18 4.96 7.81 3.13.96 8.78 4.73 8.78 8.61 0 .36-.05.75-.1 1.14 1.17 1.17.64 2.35.72 3.84zm-5.06-17.94l8.53 6.8s1.042 2.42 1.046 2.5c.005 0 .02-.01.02-.01l.3 1.27c.223.62 1.236 4.47 2.103 7.65l7.372 5.78 2.457 6.94s.723 3.76 3.614 7.81c3.01 4.22-2.11 1.87-2.75.58-2.46-4.92-5.64-13.89-5.64-13.89l-1.74-.72-1.45-1.88-3.62-2.75c-1.36-.35-2.17-10.27-2.75-12.15-.01-.02-6.36-5.65-6.36-5.65s-1.02-1.3-1.01-1.3c-.02-.06-.15-1.01-.15-1.01zm-1.592-17.79l.768-.26c1.003-.34 1.137.61 1.494 1.05l.49.56s.615 1.65.293 2.19c-.324.54-1.078-.11-1.078-.11l-1.967-3.45zm-46.464 9.89c-1.96-.99-2.74-2.16-3.26-5.11l-.67-6.51.43-3.78c.91 0 2.18 11.6 2.59 12.07l.63 1.33.36.33-.07 1.66zM298 290.63c.518-.672 2.55-.462 6.97-5.206.718-.77 2.91-4.317 4.42-3.02l.918 3.83-.918.59c-.746.25-.88 1.22-1.834 1.94-1.98 1.505-6.25 2.91-9.434 2.952l-.585-.49.465-.6zm5.95 8.92c4.08 2.837 9.54 3.47 9.54 3.47 5.856-.464 10.745 5.42 13.587 8.97 2.577 3.207 10.12 6.365 10.12 6.365l6.938.87c5.605 1.817 5.64 5.93 9.688 12.005 4.137 2.455 4.255 3.56 5.78 7.234 0 0 3.14 8.52 2.748 8.967-2.02 2.32-1.44 1.16-1.44 1.16-2.31-8.1-9.97-15.04-11.42-15.47-1.44-.43-7.66-6.76-10.4-9.4-2.11-.56-3.02-1.34-4.91-2.31-1.96-1.01-4.81-1.47-7.8-3.76s-6.36-11.57-17.2-11.13c-5.36.22-7.33-2.21-11.16-6.52l-.19-.23s.12-2.2.12-2.37c0-.94.15-2.05 1.25-2.71l2.62 1.71 2.17 3.18zm16.478-27.34l-.58-1.3c.006.014 2.024.145 2.024.145 2.11 1.33 4.914 4.486 4.914 6.077 0 10.126 3.615 8.68 8.963 14.32l1.31 3.697 2.15 7.15 3.32 3.47s1.44 4.34-.15 4.34-1.59-3.76-1.59-3.76-2.75-1.74-3.91-3.77-1.16-8.68-3.72-11.62c-1.01-1.16-2.5-2.7-2.5-2.7 1.3.65-2.93-1.31-3.47-3.62-.55-2.34-2.07-7.51-3.47-9.26-.02-.04-3.3-3.15-3.32-3.18zm-58.76 23.91l-.047-2s1.81-2.86 2.62-2.67c.81.19.38 1.86.38 1.86l-.52.573-1.19 1.855-1.24.382zm86.62 6.534c-.237-.86-.846-1.66-1.484-2.51-.944-1.25-3.105-3.528-3.105-5.226v-5.35l-3.18-3.33s4.04.72 4.62 1.88c.57 1.157-.44 6.943 2.31 8.97 2.74 2.023 4.6 4.483 5.35 7.23l5.2 5.79s-.29 1.735-2.46.143c-2.17-1.59-5.49-4.63-7.08-4.05-1.59.58-1.01 1.16-1.01 1.16l-.29 2.32s-1.59.73-1.59-3.18c0-2.31-4.63-4.92-5.21-7.08-.58-2.17.29-6.51-1.59-9.26-1.88-2.74-4.05-4.48-2.32-4.62 1.74-.15 3.04 3.76 3.04 3.76s2.31 6.36 2.17 8.1c-.15 1.73 4.33 5.21 4.33 5.21s3.83 6.2 2.28.06zm-24.464 38.55c-2.312 2.17-5.3 1.645-7.01.36l-.395-.3.09-.485c.09-.45.3-4.93-3.89-1.82-.39 0-6.29.43-8.8.76 0 0-.86-.79.71-1.34.9-.32.87-1.09 5.27-.94 1.8.05 3.33-1.86 5.99-3.33 3.26-1.81 4.1-3.12 7.67-3.96l1.8-.25s3 2.08 4.55 1.95c2.67-.22 3.91-2.22 6.93 1.23 0 0-.93 2.61-2.97 3.54-1.81.82-4.05.94-4.05.94-.87 0-5.6 3.86-5.93 3.61zm2.457 2.314l.22 1.52c-.95.592-1.73 2.17-4.04 3.615-.63.968-.39 2.298-1.08 2.243-1.2-.08.07-2.25-2.31-2.53l-3.54-2.75-.14-2.386c1.58-1.37 2.59 2.653 4.63 2.89 2.33.273 2.36-1.49 2.82-2.603h3.47zm-75.09-.868l-1.81-1.025c-2.57-.75-5.7-.71-5.85 1.892 5.64.574 5.52 1.33 7.45.98 0 0 .27-.405.79-.84l-.58-1.012zm6.65 17.36c1.58 0 4.42 2.26 6.15 3.254l3.9 2.1.15.65-2.38-.146c-1.39.51-5.44-2.886-5.56-2.97l-3.18-2.53.94-.36zm-28.29-80.627c2.6-1.252 4.48-2.86 6.84-1.675l.14.07.1.11c.74.816 1.68 1.33 2.67 1.87 1.36.744 3.97 2.12 5.03 3.853l.12.19-.35 2.05c.01 1.48-.86 1.3 3.34 3.89.22 3.24-2.47 1-3.45 3.02-.62 1.29.89 1.75.43 3.67-.32 1.37-1.4 2.81-1.72 5.72-2.48-.21-2.14 1.43-2.69 2.05-3.52 2.21-7.86 3.35-11.49.74l-.12-.02-.11-.06c-4.18-2.41-15.1-13.26-10.36-15.96-.25-1.29.43-3.34 1.16-4.79l.01-.31 2.72-.61c2.04-3.83 2.48-4.1 7.76-3.77v-.01zm32.16 23.47l2.02-1.723c.46-.43 1.06-3.955 2.24-3.848 1.19.105 1.03 1.51 1.03 1.51v2.495s-2 2.892-3.61 2.785c-1.61-.107-1.68-1.223-1.68-1.223zm29.91-59.047c-.32 5.823 1.94 7.224 1.94 7.224.54 4.633-.23 8.16-2.59 14.34-1.33 3.48-2.69 6.04-6.79 5.82-1.19-.064-1.76 1.1-2.69 1.187-7.6.72-10.76-6.474-14.22-12.833l-3.44-5.93-.16-3.81c-.23-1.134-.48-2.16-.48-3.2 0-3.65.44-5.07 2.59-7.44 1.37-1.512 1.4-3.126 1.94-3.665.54-2.27-.25-2.78-.75-3.24 0 0-1.94.54-2.15.11-.22-.43 1.94-2.81 1.94-2.81l1.23.08-.05 2.18c4.74.75 11.58.62 15.63.21 3.23-.33 3.45-3.02 7.11-2.59l2.51.39 2.13 1.11c-.2.36 4.31 4.96 4.31 6.26 0 .89-1.35 1.87-1.72 1.18-5.82-10.89-12.38-5.97-12.07-3.13.22 1.94 4.01 3.11 3.77 4.2l2.05 4.31zm-2.37-.216c.21-1.62-5.27-1.525-6.18-1.525l-3.41.66v-.864c.85-.64 4.88-2.9 4.83-3.15-1.06-.19-1.96-.46-3.54-.51 0 0-1.43.29-1.95.41-1.54.88-2.08 1.68-2.08 2.6 0 .81.08 1.03 1.35 2.93.65.97 1.23 1.94 1.4 3.13 2.35 1.43 4.98.6 7.26-1.06l2.34-2.6zm-28.31-14.947c-.46-.15 1.72-1.4 1.72-1.4s1.03-1.58 2.13-1.554c1.11.02 1.25.82 1.25.82l-2.13 2.13s-2.5.15-2.96 0zM285.58 292s-1.11-.02-1.62.218c-.92.42-1.34 1.223-1.83 1.293-.755.11-3.018-2.48-3.018-2.48.54-.32-5.856-4.62-5.856-4.62l-.937-1.37 1.66.14c1.57.9 4.75 1.73 5.45 2.73.58.83 2.51 1.82 3.45 2.05l3.13-.43s1.18 3.02 2.69 3.02h-.44c.54.75 1.9.73 2.49.43 1.49-.75 2.84.35 3.86 1.19.82.69.51 3.99.04 4.4l-.49.47-.47.33-1.54.07c-1.04.11-1.99-.26-2.83-.96-.49-.4-1.36-.65-1.4-1.29.21-1.29.75-3.34-.54-3.45-1.3-.11-1.83-1.72-1.83-1.72zm-1.56 42.66c.34.19.76.643.66 1.077-.1.436-.4 2.517-.748 2.714l-1.36-.1v-.73c0-.37.077-3.71 1.44-2.95zm-6.45 6.26c3.042-6.224 1.91.62 3.61.65 2.18.04 5.474.24 6.5 0 3.32-.767 2.68-2.016 5.665-.898l.12.825-2.537 2.656c-4.76-.457-5.05 1.104-10.688.96l-2.71-1.194s-4.45-1.92-4.23-2.64c.21-.72 4.26-.36 4.26-.36zm12.79-11.79c-.186-.07-.033-.64-.033-1.128 0-.667 1.767-1.517 1.995-2.045.234-.544.375-.916.375-1.215 0-.25-.21-.448-.458-.658-3.62-.92-2.82-3.702-2.35-4.155l.11-.11.13-.06c1.55-.7 2.68-.94 3.25-2.64.65-1.95-.52-4.78 1.97-5.17l.79-.13s4.75 1.03-.31 9.85c.2.13 0 .99.14 1.01 1.38.21 4.2-4.56 5.57-5.86l1.01.36c-.79 5.16-1.44 6-4.48 11.28 0 0-.36.91-1.19 1.26-.75.32-4.8.04-6.54-.61zm12.134-3.36c.456-2.91 2.345-3.215 2.345-3.215s1.35-2.82 1.89-2.835c1.36-.04.35 3.768-.87 5.52-.74 1.06-.47 1.45-.61 2.534l-1.1 1.25-1.21.71c-1.03.26-3.67.61-3.63.156.04-.452 1.09-1.17 1.09-1.17l2.07-2.95zm6.946-1.197c-.793-.216-.793-1.08-.793-1.08l1.05-2.685 1.55-.57.793.432s.433 1.59-.144 2.24c-.58.65-1.66 1.88-2.46 1.663zm9.325 12.3c-.073-.728 6.07-3.04 6.07-3.04l1.23-.58 1.944.21-1.3 1.524s-7.88 2.605-7.95 1.88zm-11.315-81.85l.43 4.85s.4 8.285-.322 7.44c-.16-.19-1.4-1.797-1.722-3.56-.53-2.907-.21-6.58-.533-7.55-1.4-4.17-5.495-3.665-5.82-5.606-.32-1.94-1.613-6.36-.86-6.47.753-.106 2.8 4.854 2.8 4.854.42.45 3.165 2.52 3.517 2.52l.577.51 1.94 3.02zm-22.09 21.457c3.34-2.264 7.003-2.265 12.714 2.155l.215 3.45c.08 1.73.68 2.515-.68 4.22l-.15.184-.23.07c-3.88 1.29-5.52-.49-11.34 1.23-2.48-1.65-3.23-5.29-3.45-7.01-.22-1.73-2.05-3.13-2.05-3.13l.75-.65c1.13-.13 2.88-.1 4.2-.54zm5.925-54.02c.505.158 1.44 2.457 1.8 2.91l-.186 1.62c-.64.23-2.02.3-2.95.066l-.52-.13-.08-.53c-.13-.893 1.31-.22 1.81-.81.64-.754-5.02-3.17-4.53-3.02l-6.36-.54s.75-2.26 3.88-1.83c3.12.43 7.11 2.263 7.11 2.263zm-31.465-22.1l.66 1.483v1.584l-1.475.43-.156-1.554.32-1.618.64-.324zm16.27-.86l-1.51-.648.11-2.158h.752l1.292 1.618-.647 1.186zm3.156 26.99l3.846-.465s.97-.324 1.723.54c.754.862-2.91 1.94-2.91 1.94l-6.356-.108-4.64-1.294-1.4-1.4v-1.725h2.37l3.77 2.263 2.26.43 1.32-.18zm-6.928-7.69c-2.377 1.01-4.095 1.08-6.573 1.942-2.113.734-3.6 1.065-6.034 1.94l-1.07-1.295c.54-4.96 6.66-4.52 10.02-5.067l3.88-2.154 2.48-.324.33-.216c.65-.216 1.86-.496 1.89-.503.73-.34 1.5-.487 2.3-.55 2.1-.43 5.63-1.32 6.92-.995 1.3.324 2.16 1.726 2.7 2.588.54.862-2.8.97-2.8.97-1.27.58-3.96 1.102-5.38 1.078-.6-.01-2.67.4-3.23.433-.37.075-2.48.54-5.07 1.725l-.32.43zm-12.176 64.046c.558-.605 1.292-2.02 1.292-2.695 0-.73-.567-2.76-.9-3.77-.315-.94-.65-3.01-.65-3.01 0-.03-.027-.05-.027-.08-.04-1.22 1.36-1.43 1.36-1.43.755 1.08.254 1.17.25 1.5.03.79.485 2.32 1.26 3.25.7.84 2.26.4 2.26 1.62 0 .71-1.01 2.14-1.776 2.98.03.21.06.42.06.61 0 1.62-.22 1-.96 2.27-.71 1.22-1.41 7.31-3.24 8.28 0 0-.74-.05-1.72.65-2.58 1.83.93 4.54-1.83 6.04-1.38.75-2.37-.43-3.88-.75-1.3-.28-3.98 1.08-2.91-.54 1.1-1.65 3.31-.76 3.31-.76-.02.02-.03.04-.05.04l-1.96-2.4h1.94c1.19.33 7.11-2.91 6.04-7.54-.21-.91 1.94-2.48 2.16-4.2h.01zm-3.01-73.072c-.526 1.5-2.557 2.257-4.04 2.808l-.816-.143-.755-.97-.54-.87 1.62-.76c1.18-.86 1.91-2.17 3.4-2.5l.56-.13.29.49c.53.87.44 1.59.29 2.05zm-.378 50.564s1.987 4.18 1.017 4.503c-.97.33-2.56-1.56-2.56-1.56l-.56-2.75s.22-2.04 1.19-2.26c.97-.21.92 2.08.92 2.08zm-17.3 8.922l-2.586.97c-1.507.075-2.586-.11-4.848-1.295-2.726-1.428-3.233-1.725-6.804 1.278l-.54.788-1.815.1c-1.72-.1-3.65.45-4.31 1.08-2.48 2.37-2.05 4.42-2.05 4.42-.71 1.72-1.03.52-2.47 2.27-4.2 5.07-5.06 8.95-.52 14.3l3.76 5.33h-1.29l-5.54-5.28c-2.6-.14-2.02 2.46-2.32 2.16-1.11-1.1.43-2.37 1.3-3.77-3.23-2.48-.44-12.73-2.26-18.87 1.08-2.37 1.11-.62 3.37-2.65l.6-.83 1.74-4.6 4.96-2.15c4.53-4.37 6.04-5.5 10.24-4.42 1.9 0 3.81-.57 6.25-.32 9.81 2.59 14.87 3.45 20.38 12.85l.13.21-.01.24c-.22 4.57.02 5.2 1.52 8.75l.46 1.1-.27 3.07c-.54 0-2.91 0-4.53 1.4-.72.63 2.24 4.29 1.51 4.32-5.17.21-5.43-4.19-5.6-4.64-.54-1.4 6.68-1.72 3.51-4.21l-.46-.11-.11-.46c-.23-6.53-5.32-5.81-7.88-7.93-1.49-1.23-3.44-3.02-3.44-3.02zm-31.677 39.032l-.313-6.315.204-2.205 1.51-3.126 3.77 2.91c.86.97.74 1.162 3.555 3.666l6.053 4.643-.2.52c-.57 1.48-1.542 1.47-2.512 2.71-.94 1.203-1.67 1.994-2.263 3.45-4.3 5.744-3.44 7.763-3.01 9.38.43 1.617-1.18 6.04-1.18 6.04 0-.003 1.08 2.802 1.08 5.82 0 1.614-1.23 3.75-1.4 3.126-.97-3.66-3.03.28-3.99-.75-4.31-4.63-1.08-4.81-1.07-7.87-.07-1.35.65-2.9-1.4-4.96-.1-.1.91-.14 1.08-1.94.37-3.98.18-11.52-.1-11.75-1.26-1.01-.97-3.66.22-3.34zm44.772 41.31c.7.79.7 1.405-.09 1.757-.95.42-1.76-.27-1.76-.27s-1.42-.74-.53-1.23c.89-.5 1.57-1.16 2.37-.27zm-40.73-.263c1.06.85 1.95 1.32 3.68 3.51 4.65 5.88 6.88 6.09 10.71 5.64l1.26-.01-.29 1.12c-.19.73-4.47 4.49-6.07 5.1-1.2 1.76-2.42 4.35-3.86 5.7-1.97 1.84-2.02 3.33-3.08 4.04l-1.31-1.77c-.09-2.27.25-3.91-.23-5.53-.49-1.66-1.03-3.51-1.03-5.25 0-1.95 3.09-2.65 6.16-2.13-.29-2.12-2.38-1.71-3.95-3.08l-3.16-2.28-.81-5.38 1.95.29zm28.08 58.49c1.14 1.49.08 1.87-.23 3.44-.53 2.7-1.42 5.58-2.76 8.94 0 0-3.43 2.46-4.09 1.89-.66-.58 1.36-6.2 1.36-6.2 1.36-8.27 2.88-28.03 3.77-27.5.89.53 1.4 6.58 1.4 6.58.26 4.57.74 9.15.52 12.82zm6.49-6.06c.78 2.53 4.47 3.51 6.02 6.58.26.53 1.01-.17 1.75-.9-.95-2.67-3.85-6.48-6.37-7.97-2.37-.79-1.41 2.28-1.41 2.28zm-2.11-1.41s.52-2.9-.62-4.39c-1.14-1.5-.62-3.08-.62-3.08-.02-.04.35-1.76.35-1.76-.79-2.11-.55-3.62-.7-7.82-.18-4.83.52-4.74 1.93-6.85-.04-.27 1.31-2.9 1.31-2.9s.34-1.2 1.23-.97c0 0 1.05 0 .5 1.41-.61 1.57-1.26 4.65-.07 6.47l.69 1.07c3.78.97 5.18 2.55 8.34 2.73 1.23-.96 2.56-4 3.51-5.19 1.31-1.64 1.58-2.38 2.11-3.48l1.45-.59.29 6.26c-2.64 3.16-2.69 8.31-4.3 11.33 0 0-2.2 9.93-2.11 11.42.09 1.49-1.61 6.49-2.36 11.52l-.07.43-.41.17c-1 .43-1.12 3.81-1.12 5.26 0 0-1.23 3.34-1.84 2.28-.61-1.06-.5-3.61-.5-3.61-.03-2.02-.82-3.86-1.88-5.97-.35-.7 1.67-1.94-.26-2.11-1.93-.18-1.93 2.55-2.55 2.28-.61-.27-.61-3.78-.61-3.78-1.46-1.62-1.43-3.92-1.31-5.89l-.35-3.34-.09-.97zm19.66 18.7s-4.75 4.67-5.27 3.74c-.52-.93.25-2.21.25-2.21.54-4.85.63-9.35 2.74-12.69.89-5.09 1.58-10.36 1.84-14.58 1.58-1.93 2.59-6.05 3.86-9.05l1.84-1.14c-.61 3.46-1.41 7.5-1.58 11.41-.42 9.51-2.2 18.27-3.69 24.5zm10.09-21.43c1.23 7.46-1.23 18.79-1.23 18.79s-3.78 6.06-4.04 4.48c-.27-1.58.52-3.4.52-4.66 0-2.43.17-5.62.84-7.75-.17-1.15.21-.87.21-1.92 0-3.88.94-7.76 2.02-11.24 0 0 1.01-4.86 1.91-5.59.9-.74 1.55.28 1.55.28-.31 4.51-2.38 4.09-1.8 7.59zm-4.16-46.82l2.02.5 3.54.07c3.83.72 3.17 1.53 6.87 3.11 2.39 1.02 8.56 3.84 11.18 4.34l1.67 1.59 1.23 3.47c2.24 2.31 3.69 4.69 1.81 6.22-.51 2.17-5.59 1.91-8.03 1.73-1.95-.15-3.25-.63-4.27-.44l-3.55.07c-4.26-.29-1.29 2.81-6.5.65l-5.21-1.01s-1.23-.58-2.97-1.01l-3.6-1.4-.66-.64s.94-1.43 2.67-.64l3.4 1.38 3.54.5c.92-.23-.53-1.82.51-2.1 6.43-1.74.87-2.1-.65-2.53-4.63-1.23-5.24-3.05-8.1-4.27-2.53-1.08-3.24-.93-5.49-2.89l-1.37-2.39 1.3.14c1.14.16 4.63 3.16 6.36 3.76 7.73 2.68 10.62 4.48 11.56 3.11-.4-1.15-2.46-2.53-7.3-3.98 0 0-4.91-1.09-9.76-5.79l-2.96.29-.14-1.88c2.02-.15 5.06-1.16 9.68 2.82.63.54 1.23-.15 1.88-.51-.65-2.02 1.3-2.31 1.3-2.31zm7.95 7.01c.5-1.23-4.77-4.63-7.95-3.62-1.79.57 7.44 4.84 7.95 3.61zm25.69 47.52c.92 1.23.03 2.42 1.17 5.85 1.97 5.93 8.05 11.41 6.46 11.89-2.02.61-5.62-5.1-5.62-5.1s-2.07-5.82-5.18-11.95c-1.87-3.69-4.46-6.63-6.23-10.89-2.81-6.77-4.47-15.82-3.69-15.82.79 0 2.37 4.21 2.37 4.21s3.77 12.56 10.71 21.78zm-3.25 20.15l-.61.13c-5.26 1.2-8.87.71-11.59-2.63l-1.93-4.71c-.45-1.95-1.79-8.89-1.79-8.89l-.07-.32c-.81-4.52-1.76-5.35-1.66-9.72.14-6.15.18-23.09.18-23.09 2.69.99 2.78 1.61 3.25 3.86.33 1.65.61 4.65 1.66 7.55 0 0 1.4 10.98 6.84 19.5 3.63 5.69 11.23 11.68 5.71 17.68l-.01.62zm21.46-9.56c-3.93 1.22-4.83 4.6-6.02 4.71-1.19.11-2.64-3.05-2.64-3.05-3.5-3.07-1.85-1.99-4.83-7.26 0 0-2.12-4.27-2.11-4.22-2.28-6.15-8.53-14.18-8.95-21.12l-.18-2.77 1.61 2.26c1.92 2.72 2.44 4.42 3.56 7.39 1.62 4.34 3.36 9.5 7.1 12.73 1.62-.51 1.85-4.78 1.85-6.59 0-.62-.04-1.3-.1-2.06-.05-.71-.11-1.44-.11-2.11 0-.49.03-.93.11-1.32-.37-6.59-2.35-8.49-4.47-14.45-1.38-3.9-2.48-10.11-3.33-14.14-.28-.28-4.92-5.53-6.41-6.85-.39-.35-7.11-2.72-7.11-2.72-.88-1.23 7.68-3.24 10.88.7 3.07 3.77 3.9-1.07 2.98-3.6-.74-2.03-2.98-1.58-2.28-2.2.3-.26 1.06-1.49 5.09 1.49 7.2-2.81 7.99-1.4 7.99-1.4s4.39 4.66 3.43 5.18c-.97.52-7.23-2.19-9.75-1.67-3.87.79.27 1.78-.44 2.28-.88.61-2.64 1.31-1.49 2.54 1.14 1.23 4.74 2.39 4.74 4.3 0 1.07-.18 3.07.53 4.39.48.91 1.54 1.39.96 2.11-3.51 4.39-.92 4.79 1.13 5.95l.88 1.34s.17 5.71.61 6.32c.44.61-.18 2.54.08 7.81.26 12.82-4.91 16.69-3.19 18.98 1.06 1.4 2.33 1.2 3.8 1.05 2.02-3.34 4.57-3.21 4.57-6.76 0 0 .97-5.53.97-5.54-1.17-.35-.93-2.03-.35-3.08.48-.88 1.02-5.04 1.02-5.04l.12-13.06c.96-2.46 1.14-2.46.61-3.17-4.28-5.73-2.54-6.43-3.42-6.94-2.98-1.76-4.52-3.44-5.7-6.16 0 0-4.22-2.28-2.9-2.45 1.32-.18 3.96.42 3.96.42 1.35.55 2.25 1.67 3.33 2.47 3.78 1.58 6.95 7.41 10.36 12.91 1.31 4.55 2.55 11.38 2.55 16.95 0 2.56.7 5.53-.3 8.04-3.7 4.06-5.95 8.46-7.07 12.33-.31 1.82-.86 3.51-1.7 4.97zm35.7-4.49c0 2.16-2.93 3.78-3.14 3.65-1.39.49-.58-8.31-2.64-8.02-2.13.3-2.43 6.29-3.99 7.6l-.15.2-1.14 5.69c-1.51 1.07-1.93 1.83-3.61 2.76l-1.46.89s-1.02.71-1.93.2c-.91-.51 2.23-8.63 4.36-9.64.46-.22-.29-1.24.61-2.74.87-1.46 5.88-11.81 5.88-13.5 0-.15.79-2.88.79-2.88 1.23-4.53 1.53-5.41 2.45-9.29.94-4.01 1.78-8.89 3.95-12.48l1.62-2.95h.71c.03.68-.51 2.06-.51 2.74 0 3.49-.8 6.82-1.83 10.45-1.72 12.58 0 27.27 0 27.3zm7.61-9.03s-.41 1.11.5 4.16c.91 3.04-1.42 10.55-1.42 10.55s.71 3.24-1.11 3.14c-2.63-.15-.31-.71-3.25-1.02-2.94-.31 1.32-4.47 1.83-5.48.51-1.02.3-2.64.3-2.64s1.21-1.73.61-3.15c-.61-1.42-1.42-4.77-1.42-4.77l-.01-4.38c-1.31-8.31 1.82-24.2 2.13-26.27.61-3.96-2.03-8.42-1.22-11.77.33-1.37 2.13-.61 2.63-1.12.51-.51-1.11-3.65-1.11-3.65l-1.22-.21c-.45.17-3.25 3.55-2.44 5.48-.87 1.31-1.95.09-2.43.61 0 0-1.2.95-1.22.91-3.95 4.77-4.93 13.32-6.69 19.07-2.06 6.77-3.08 16.45-10.34 28.51 0 0-5.88 6.15-6.97 7.82-1.02 1.55-2.06 3.16-3.79 4.24l-1.69 1.05.5-1.92c.72-2.78 2.81-5.05 5.03-7.47 1.86-2.04 5.78-7.88 6.91-10.33 3.1-7.36 2.37-8.89 4.76-16.44 3.84-12.1 3.25-23.44 12.07-30.85l.43-2.14c-1.71-1.44-.68-4-1.88-5.71-1.55-2.2-2.96-4.92-5.2-5.93-.43.44-2.02-2.93-2.02-1.96 0 .07-.95.58-.94.65-.15.22.14.73.14.73.97.88 1.67 2.88 2.06 4.03 0 0 .76 1.05.44 1.33-.33.29-1.37-.3-1.37-.3-.99-.22-2.5-5.28-5.95-3.99-.33.17 0 1.54 0 1.83 0 .25 3.37 3.6 3.64 4.23 0 0 1.69 4.09.82 3.94-.5.43-3.97-6.37-7.23-5.57-2.11.52 7.49 9.96 6.14 10.63-2.53-.51-4.62-5.64-8.82-6.51-3.61.51 6.28 9.51 4.05 10.42-1.08.29-4.04-4.94-7.22-6.15-3.11.07 7.01 9.33 5.64 11.14-.66.02-8.45-9.04-9.32-7.23-1.88 1.23 8.67 13.02 6.8 15.76-1.59 1.04-2.15-2.87-3.62-4.99-.74-1.07-2.1-.65-3.11-4.05-.76-1.13-1.71-1.21-2.53-2.1-2.98-3.2-5.86-5.72-5.86-5.72l2.02-2.39 4.19-5.97c2.83-3.07 6.36-5.93 8.38-9.51l4.84-.87c.51-.73-.36-1.45-3.64-1.89l-.1-.39.25-.31c1.68-.31 2.36-.08 4.14.12 1.3.14-1.09 1.74.79 2.03 1.88.29 3.76-3.11 2.46-3.4-1.3-.29-2.62-.51-3.11-1.45-1.49-.66-1.62-2.55-2.53-3.83-4.53-5.71-11.18-4.84-11.18-4.84-3.65-4.06-4.66-1.22-5.27-2.94-.6-1.73-5.8-8.78-5.8-8.78l-1.38-.87c-.2-.14-4.79-.39-4.99-.51-.26.04-4.92-.72-8.02-1.59l-2.17-1.59-.07-.07-4.56-2.97c-1.77 0-2.87-2.31-4.92-1.59-1.63.57-4.29 1.42-6 1.7l.01.11c-2.69-.07-2.16 1.16-2.11 1.23.38 0 2.17 1.44 2.17 1.44l-1.16 5.64c-3.9 1.74-4.48 6.65-8.73 12.49l-.92 1.27-.1.07c-5.48 4.06-9.49 2.67-14.45.4l-1.69-.77h-.09l-3.31-3.72c-4.25-3.81-6.62-7.26-9.6-6.27-.4.63-.63 1.28-.63 1.96 0 .99 1.65 3.98.49 6.43.33.19 1.16 1.43 1.16 1.43.81.4 3.4.94 4.04 1.9l-.87 2.17-.29 1.15c-7.08.58-6.07 2.17-9.25 1.59-.95-.48-3.9-2.16-4.77-3.03l-.14-1.3 1.39-.21c1.17-.4 2.28-.9 2.49-2.11.12-.28.17-.55.17-.81 0-1.33-1.51-1.94-2.61-2.51-2.21.08-4.93-1.7-6.33-2.91-1.82-1.58-3-2.49-5.04-.63 1.14 2 2.3 4.14 2.99 6.43 1.72 5.7.83 10.11 7.95 9.84l7.09 1.45c4.26-.5 6.89-2.76 10.12.29l1.15 2.31s-1.16 1.3-.73 3.9c.26 1.57-3.84.72-5.5.29-2.65-.69-6.88-.42-9.1 1.44l-1.15-1.16h-4.62c-6.38-.01-9.32-1.46-12-8.97-4.66-7.94-1.44-16.05.87-17.79l1.56-5.13.13-.12c6.39-5.45 11.2-1.1 11.88-2.12 1.73-2.61 4.71-1.92 8.08-4.7l.16-.13.21-.04c7.74-2.08 10.29 1.64 13.96 5.3 3.23 3.22 5.63 8.39 11.27 8.1 2.05-1.4 4.26-4.98 5.2-7.24 1.44-3.47 6.07-5.93.58-6.37 0-.43 1.45-.87 1.45-.87s-.72-.87-2.03-2.32c-.53-2.13 4.08-6.09 6.07-6.94 1.01.15 4.77 1.16 4.77 1.16.36.72 2.17 1.15 2.6 2.31l-.29 1.3c-6.9 1.74-6.5 1.59-8.24 2.89-1.3 1.45.72 1.3.72 1.3 2.95-.38 2.46-.03 5.21-1.01l5.06-2.75 6.36 1.3 7.37 5.5-.44-.29 1.09.22c1.73.15 3.22.38 4.64 1.11.66-.01 9.65 2.11 9.88 3.02l1.08 2.32s3.61 6.29 7.51 7.52c3.91 1.23 5.42.44 7.66 1.81s6.29 6.44 6.29 6.44L346 336c4.26 4.99 11.56 10.63 12.14 14.68l2.22.23c1.05.24 1.02.55 1.63 1.46l1.12 1.83 2.84 1.92c-.61 1.9-.1.71-1.01 1.32l-.1.3.3 1.32c.21.91-1.13 2.42-.81 3.85.23 1 1.29 2.25 1.83 2.94l.65 2.14.06.6c.67 2.26.34 4.78-.41 6.29-1.83 3.65-4.664 17.86-3.55 23.44l.81 1.82 1.22 2.13zm4.86-360.7l-1.48 1.14-2-.67-.07-1.97 1.37-1.03 1.48.8s.8.91.68 1.71zM349.05 99l-3.62-2.374-1.75-1.057-.26-2.64h1.213l1.78 2.07 14.39 12.22s1.03 3.59-2.4.57c-2.852-2.52-7.307-8-9.362-8.8zm-5.257-16l-2.17.8-3.31-1.257-.454-1.83 2.97-.23 1.6.227 1.48 1.03m.8 6.4l-3.09-.687-4.11.57-2.63-1.256v-1.03l3.54.23 5.59-.115s1.83 1.713.69 2.285zm24.2 90.28v-6.515s.91-2.514.68-4.113c-.23-1.6-.91-10.515-.91-10.515l.23-2.058.23-5.49c-.49-1.59-.45-4.46.8-6.29l2.06 4v4l-.68 6.28-.68 3.65.68 11.31.12 6.85V322.5s-1.83 3.317-2.63 1.03c-.8-2.285 0-7.885 0-7.885l.11-45.37v-91.87zm4.19-63.16l.1.127.04.165c.38 1.396.18 2.864-.55 4.025-.67 1.08-1.75 1.8-3.02 2.033l-.28.05-.24-.134c-1.51-.825-2.59-2.44-2.74-4.12-.14-1.466.42-2.79 1.57-3.732l.17-.147.23-.025c2.01-.253 3.5.304 4.72 1.76v-.003zm-5.84-44.345l.81-2.58.34 2.486c-.76 5.04-.37 8.53-.27 12.71.07 2.82.8 14.03-1.19 14.42-1.98.4-1.63-6.49-1.63-6.49.44-6.73-.22-13.63 1.94-20.53zm-34.8-31.965l-.15-.46.34-.345c.97-.974 3.09-.623 4.29-.803 1.71-.257 2.36-.528 2.77-1.72l-1.58-5.16.97-2h.79l1.54-.004c.67.34.85 1.058.99 1.58l.16.47-.21 1.013-.26 1.33c-.26 1.75-3.7 4.92 3.57 6.35l1.32-.33c1.68.25 3.57.53 4.45 2.48l.2.42-.28.38c-2.22 3.02-4.57 1.82-6.29.95-1.82-.92-2.91-1.37-4.3.17l-.37.35-2.16-.58c-2.25-.54-4.81-1.16-5.77-4.05zm7.75 33.073c-.71-.238-1.15-.596-1.34-1.097-.29-.753.13-1.465.46-2.033l.35-.732.19-.45.28-.11c1.67-.71 2.35.6 2.64 1.16l.24.4.34.79-.14.36c-.36.93-.91 2.33-3.01 1.73m3.06-12.29c-1.29.19-3.04.21-4.03-.74-.32-.31-.69-.85-.69-1.69 0-.07.02-.15.02-.22-.08-.29-.16-.57-.16-.82 0-1.42 1.27-2.08 2.1-2.5l1.2-.79.37-.28h.24c.9 0 1.46.65 1.87 1.13l.47.49.34.46.06 1.51c.12 1.11.29 2.8-1.77 3.47zm-17.41 64.18l-.23.69c-.18.99-.33 3.04-1.82 3.77-1.81.61-2.72-.17-3.55-1.01l-.91-.81-.31-.27-.04-.29c-.21-1.66 1.09-2.54 2.14-3.24l1.03-.79.2-.16 1.67-.15c1.72-.49 1.15.66 1.85 1.42l.36.38-.38.49zm-44.98-1.65c2.06-.4 3.67.62 4.12 2.61l.03.14-.02.15c-.21 1.46-1.12 1.94-2.01 2.77l-.7.42-.38-.05c-1.46-.21-1.74.65-3.11-1.21l-.78-.82-.04-.24c-.31-1.86 1.03-3.4 2.89-3.76zm52.29-18.46l-.57 1.37-1.71 2.18c-2.4 2.06-3.54 3.77-6.28 5.83-.74.56-.76.58-1.37 1.03 0 0-.68 3.31-2.97.46-2.28-2.86-13.59-15.77-13.59-15.77s-1.6 0-1.82-1.02c-.54-2.46-1.83-2.51-1.83-2.51-1.37.35-1.52.71-1.6.8l-4.91 5.49s-3.77 3.2-7.53 8.34c-1.71 2.33-3.43 4.57-3.43 4.57s-1.48.69-2.51 0c-1.03-.68-.69-.8-.69-.8l.22.57-5.91-7.8-2.53-2.53-4.35-4.06.12.35-2.51-3.89-2.2-2.4c-2.18-3.19-4.56-.35-4.79.11-.23.46-6.74 7.08-8.91 9.94s-5.48 9.03-6.97 7.88c-1.36-1.04 5.02-7.66 5.02-7.66s9.01-10.04 10.38-11.64c1.37-1.6 1.6.8 1.6.8l2.61-.55 1.06-1.17s1.66.55 1.69.58l1.83 3.08 2.28 2.53v.1l4.21 4.88 2.53 2.53 6.97 6.07h1.03l9.02-11.2 4.34-4.91 5.71-1.49s.69-.23 1.49 1.6l8.79 9.83s-.46 1.6 1.82 2.29c2.28.69 2.51 1.72 3.43 2.86.92 1.15 2.17 2.4 3.31 1.26 0 0 1.37-1.26 2.51-2.29.59-.59 5.48-6.86 5.48-6.86l.69-.45-.58.69 1.49-2.29 5.25-5.83s.69-1.26 1.95 0-4.57 6.86-4.57 6.86l-1.59 1.6-1.14.69zm-70.24-50.33l-.15.02-.15-.04c-1.9-.54-2.86-2.38-3.09-3.79l.15-.5.39-1.1c.17-.78.09-1.6 1.68-1.8l.26.01h1.59c.99.34 2.6 1.08 3.35 2.38l.1.18v.22c0 2.16-1.81 3.22-4.14 4.44v.01zm3.77 8.58l-1.18 2.3-.37.24c-1.22.76-2.23 1-3.48.23-1.02-.63-1.55-1.67-1.44-2.85l.01-.12.05-.12c.67-1.61 2.21-2.52 3.74-2.21 1.35.27 2.68 1.01 2.68 2.52h.01zm-7.04 13.85c.39-1.16 1.84-1.29 2.56-1.41.41-.06 4.16-.26 4.66.46.18.29 1.82.12 1.61.84l-1.48.76-.06.1c-1.34 2.09-3.23 1.34-4.49.84L260.8 77l-1.012-.25-.12-.848h-.002zm-1.52 7.66c.43-1.08 1.72-.42 2.84-.49 1.39-.08 5.82.32 6.57 1.67l.33.61-.56.42c-1.71.19-6.16-.31-7.17-.72l-1.29-.38-1.06-.27.32-.82zm1.88-58.64l.36-3.23c1.37-.55 1.17-1.29 1.55-.96.92.79 1.91.24 1.84 6.15v1.45l1.98 1.23-3.1-.12c-.9-.49-1.82-1.8-2.03-2.75l-.6-1.79zm-2.86 10.74l-.24-2.39c2.26-.91 4.9-.36 6.92.12 2.05.48 7.76-.6 7.04 1.55 0 0 .05 2.49-1.67 2.99-.78.5-1.55.72-6.32-1.31-1.67-.26-2.8.58-3.7.36l-2.02-1.31zm-13.55 86.16l.16.19.02.24c.13 1.74-.33 3.07-1.71 3.91-1.27.78-2.01.73-3.41-.14l-.19-.12-.1-.2c-1.09-2.18-.55-4.26.94-5.22 1.39-.89 2.76-.61 4.31 1.33zm-14.97-65.39c-.62 1.31-1.56 2.44-2.77 2.75l-.58.15c-1.34.27-2.76-1.18-3.32-1.76l-.38-.39-.05-.2c-.05-2.09 1.03-3.52 2.55-5.04l.27-.02.99-.02c.89-.08 2.51.5 3.18 2.04l-.01-.01v.02h-.01c.24.53.36 1.02.36 1.48 0 .36-.08.7-.23 1.02h.01zm-1.11 13.76c-.47.22-.77.37-.9.67l-.16.39-.41.08c-1.51.31-3.56-1.71-4.32-2.97l-.19-.31.11-.34c.45-1.35 1.52-3.04 3.06-3.36.71-.15 1.79-.07 2.91 1.18l.1.11.05.13c.78 1.95.43 4.12-.27 4.44zm-8.81-32.06l-.1-.3.13-.28c.71-1.57 2.59-.4 3.42-.35.97.07.63-.99.82-1.93.06-.62-1.15-1.76.29-4.39.84-1.55-1.92-1.77.94-3.27 1.16-.29 1.25.43 1.8 1l.41.43.05.21c.41 1.64-.26 2.55-.94 4.03-.48 1.04-1.06 2.51-.84 3.11.15.43.79.83 1.76 1.15l2.78.08c1.72-.11 3.14.26 4.91 2.34l.29.34-.15.42c-.37 1.13-1.14 1.7-2.26 1.96-.85.2-1.66-.03-2.28-.64-1.18-1.18-2.56-.67-4.34-.88-1.31-.16-3.94.83-6.71-3.03zm2.46 40.35l.8-.54c2.25.23 5.29-.88 6.81.14l.69 1.72s-2.98 2.44-1.56 2.67c2.58.42 3.16 2.86-2.33 1.9-.61-.1-5.25-1.1-5.25-2.05 0-.95 1.86-.92 1.86-.92l-1.02-2.91zm.99 14.23c.23.46-8.22 10.63-8.22 10.63-1.03 2.86-3.89 4.92-4.69 5.6-.8.69-1.02-.11-1.02-.11s5.71-7.88 6.73-9.03c1.02-1.14 6.51-8 6.51-8l1.37.46 1.03-.81 1.36.81 5.71 6.51h-.11l12.56 13.85-.02.02.1.07-.77 1.49s-.68-.22-.69-.23c-.1-.06-1.33-1.3-1.33-1.3-3.01-3.15-9.29-10.23-12.15-13.54h-.11l-5.72-6.59m83.74 137.38c-4.09-2.65-9.2-10.33-11.08-15.48l-.06-.17.02-.17c.67-7.13 1.84-13.6 6.36-19.26.51-1.88-.94-3.38-2.81-3.96-3.43.13-5.24-1.12-7.31 1.21-1.85 2.07 1.94 4.1-3.88 3.45-1.32.33-2.6 2.21-3.45 1.72-1.43-.83-4.01.83-4.42-.86-.36-1.5.21-6.11-.73-6.62-.68-.36-2.82-1.4-4.12-.93-1.77.97-2.96-.45-3.23 1.41-.87 5.82 1.83 6.68-1.51 7.98l-.66.5-.22-.07c-.85.53-3.17.14-3.97.42-.82.3-.9.79-2.11.55l-.47-.08-.35-1.2c-.53-1.85-.31-2.49-1.28-4.22-1.19-1.61-5.61-1.61-6.58.87 0 .37.1 4.85.1 4.85s1.62 3.13-1.61 3.67c-.95.16.35 1.41-.54 1.62-2.37.54-4.84 3.89-5.49 3.99-.64.11.46-3.32.37-3.5-.31-.59-1.52-1.22-2.55-1.25-3.68-.92-7.09 1.75-9.95 4.37-.15.2-.23.41-.23.62 0 .08.01.16.02.24.22.89 1.38 1.83 2.39 2.35 10.49.09 13.26 8.86 18.27 14.7l.76 1.99-.04.28c-1.9 3.04-.22 5.52-1.39 9.33l-.85 7.64s-4.11-2.57-7.55-6.34c-3-3.27-5.69-3.52-6.04-4.63-1.4-4.53-8.34-13.75-7.87-21.67.21-3.56-.76-7.72-.22-11.53 2.69-18.87 15.35-33.5 34.58-36.66 8.15-.74 13.73.58 20.15 2.8 2.84.98 4.78 1.27 7.97 2.05l5.39 3.45s1.9 1.39 3.88 2.58c3.44 2.06 7.7 8.77 9.59 12.72 0 9.7 3.66 10.89 4.2 18.76.36 5.26-2.29 12.47-4.31 16.93.08.34-.76-.01-.86 1.18-.17 2.03-.82 4.1-1.83 5.07-2.69 2.59-4.53-.65-4.53-.65v.01zm6.25 4.53c0 .06 1.44-2.53 1.94-2.26 4.95-6.79 7.54-17.91 7.54-27.6 0-7.41-1.29-10.46-3.66-16.92-4.61-8.67-9.65-13.84-17.86-18.84l-2.79-1.7c-.27-.07-7.69-3.07-7.69-3.07-8.51-2.32-18.06-5.66-27.26-2.37-13.92 3.69-29.18 14.53-32.76 29.86-5.23 15.49-2.41 34.97 7.98 47.44 2.14 3.03 5.28 5.76 8.62 7.12 3.45 1.4 5.06 3.78 5.06 3.78l.64 1.29c.38 3.22.78.61-.76 2.92l-1.04 4.55-1 .08c-10.54-6.4-26.29-7.87-33.08-.76-1.39.77-2.97.58-3.77 1.62-.19.19-3.67 4.85-4.42 4.96-.75.11-1.18-5.39-1.18-5.39 2.48-4.42.43-28.25.43-39.84 0-21.12-.33-34.5-.33-56.33 0-3.38-.22-7.04-.22-10.46 0 0 .2-11.91-.22-13.15-.4-1.17-.93-.88-1.73-2.27-.51-.88-.03-2.06.94-2.81l.22-.16h.27c1.38 0 5.53.21 6.42-1.95.57-2.85-2.39-4.79-3.77-4.91h-1.6l-.68-.8c.68-.69 1.8-1.45 2.22-1.92l.58-.58c-.12-.49-.41-3.1-.41-3.1-.36-1.35-.8-.64-.8-2.17 0-.46-.3-1.04-.22-1.53l.03-.2.11-.15c.67-.92 2.01-1.2 2.7-2.12.8-2.74 5.71-8.91 9.71-13.48l1.83-1.15c2.84.54 4.17 2.97 6.17 6.4l3.89 3.68.22.32-1.49 2.86c1.03 11.66-1.14 17.6 1.94 18.74l1.54.9-.16.59c-.34 1.16.44 3.67 1.7 5.37 1.38 1.83 2.75 0 8.57 1.37 1.19.28 1.26-3.2 1.03-5.6.79-.29-.74-.01-.45-1.14.34-1.37 4.74-1.23 4.72-1.59-.02-.34.87-1.27.19-2.87-.35-.82-3.56.7-2.97.12.4-.39 2.63-3.08 1.53-6.3l-.09-.09-.06-.11c-.09-.18-2.18-4.81-2.18-4.81 5.94-6.86 7.88-9.94 12.55-15.67l2.49-2.1h.29l3.17.85s9.36 7.61 9.71 11.43c.11 1.26.73 7.4 1.37 5.6l-2.74.69-1.14 2.05c-1.49 2.97-2.63 2.7-2.63 5.83 0 .39 1.52 2.78 1.6 3.2.63 1.34.94 2.35 1.94 3.43 1.53 1.68 2.71.73 2.71 3.17 0 .41-.09.87-.19 1.33.13.24.33 1.67.33 1.67 1.49 3.88 4.44 3.55 6 3.71l1.06-.15c2.39-.32 3.53-4.15 4.81-6.34.39-2.17.47-3.51 2.64-5.68.69-.69.23-5.26.23-7.89 0-1.47-1.7-1.93-2.51-3.43-.35-.92 2.01-3.79 2.52-4.34 2.04-2.2 3.43-3.77 5.37-6.05 1.65-1.95 3.2-4.04 3.2-4.04 2.74.04 3.88-1.96 5.7-1.9 3.08.09 5.65 5.84 8 8.57l-2.26-.14-.07.38c-.02.11-.03.21-.03.31 0 .82.63 1.4 1.6 2.22l2.96 2.67.36.35-.4.53c-2.27 2.35-2.16 2.35-1.82 4.63 0 0-2.14 9.7-2.18 10.21.18.33.46.42 1.49.36 1-.05 2.84-1.05 3.6.47l.12.25-.05.26c-.08.4 0 .8-.12 1.15-1.15 3.64 2.27 4.94 3.87 5.81 2.17-.57 6.97-1.48 7.77-4.22-.18-.46-1.48-1.89-1.48-2.28 0-1.55.7.1 1.63-.71.98-.85 1.59-1.43 1.59-2.24 0-.26-.07-.55-.21-.89l-.22-.51.41-.38c1.39-1.27 2.96-4.17 2.96-5.42 0-1-.28-1.9-.54-2.54-1.46-1.73-2.94-3.01-3.16-5.04l-.01-.41s4.5-7.32 9.06-9.61c2.16-1.08 0-4.57 5.71-5.71 0 0-.11-.99 1.14-1.14 1.94-.22 4.68 4.23 4.68 4.23l11.08 9.72c.36 1.71-.95 3.12-1.14 4.69-.28 2.3 0 7.89 3.89 8 0 0 5.94.23 5.71 1.6-.23 1.37-6.4 1.03-6.4 1.03l-2.3-2.5c-1.08-.3-3.98.14-4.81 2.22.96 3.36 2.26 4.25 5.62 4.62 0 0 .7.32.91.35.8.12.86.35 1.71.35l.1 1.28c.47 8.09 1.05 9.35.13 15.86l.57 9.71V211c.11 32.172 1.17 69.84-.07 101.01l-.05 1.302-1.14-.65c-6.45-3.7-7.97-12.91-10.15-19.16-2.91-8.36-3.06-12.493-13.08-12.82l-.96.5-4.57-2.765c-1.37-1.836-.76-2.3-.34-4.57.62-3.39.2-6.637-3.86-7.8-1.23-.52-3.07-1.42-4.48-1.64-3.11-.49-7.05-.52-8.69-4.16l-.58-7.165c1.51-3.99-7.22-8.95-8.6-10.49-2.5-2.79 3.09-7.42 3.09-7.42l1.42-.75zM204.47 402.48c-.324-1.996-.79-4.493-.44-6.5.656-3.733 3.52-8.086 3.777-15.28.05-1.532.3-3.05.23-3.8-.1-2.795-.97-3.01-1.37-4.63-.17-.68-.55-1.28-.53-1.98l-.025-3.945 1.54-.32c1.52 4.91 3.833 7.31 4.45 11.79.78 5.68-3.6 10.894-5.62 18.008-.7 1.93.44 6.41.44 6.41s-.52 4.92-1.75 3.51c-.46-.53-.46-1.75-.704-3.25h.006zm-8.26-361.81v-3.48l.54-.178c1.004-.336 1.675.5 2.038.95l.4.5c.37.738-.717 2.203-.717 2.203h-2.27zm-1.553 52.91c.16-.11.955-4.655 1.075-6.924.19-3.615 1.48-10.816 1.67-15.76.14-1.11.43-3.008.83-4.06.97-1.45.41-1.823.59 1.552-.37 1.16 0 1.6-.28 2.71-.12.88-.19 1.79-.19 2.71 0 1.66.14 3.37.29 5.05.14 1.68.23 3.93-.31 5.4-1.67 4.56 1.21 7.5 0 9.43l-1.79 2.03-1.91-2.15zm6.295 27.38l-.21-.03-1.34-.39c-1.26-.3-2.84-.67-3.23-2.46-.44-1.46-.06-2.823 1.03-3.75 1.27-1.07 3.24-1.33 4.69-.62 1.17.58 1.8 1.72 1.73 3.12l-.02.258-.16.2c-.17.2-.21.65-.25 1.1-.08.9-.23 2.57-2.278 2.57l.004-.008zM316.72 88.82c.02-.12.46-1.572.34-1.813-.253-.536-.782-1.002-1.17-1.157l-2.54-.005c-1.623.066-.787-.402-2.163-1.01l-.508-.228.04-.563c.1-1.198.17-2.198.17-2.767 0-.334 1.46-2.33 1.46-2.33.39-2.83-1.3-2.638-2.63-2.75 0 0-2.03-.51-2.03-1.995 0-1.486 2.17-4.915 2.74-6.857.76-2.582 2.23-3.14 2.23-4.8 0-1.31-.63-2.49-2.17-3.667l-.35-.267.04-.45c.14-1.43 1.12-2.56 1.86-3.45.5-.59.93-1.17 1.18-1.8l-.28-1.5c-.4-2.41-.33-4.59-2.2-5.6l-1.33-.93 6.35-3.38c1.84-1.65 1.88-1.1 2.9-3.52.31-.67.45-1.3.45-1.91 0-2.51-3.4-5.61-5.88-7.72 0 0-3.7-.98-3.86-1.77l-.09-.49.4-.3c.6-.45.79-1.81.79-2.7 0-1.01-.25-2.05-.4-2.7-2.06-2.51-4.67-3.97-8.31-4.68-4.6.28-6.89 1.64-7.24 4.23-1 2.47-.47 3.2-.47 4.05 0 2.47 1.45 1.6-.34 2.84-1.85 1.28-5.44-.95-5.52 1.5-.04.31-.05.6-.05.89 0 2.77-3.88 8.67 3.55 12.2.6 1.11 1.42 1.27 2.83 1.45l2.27.53s4 .98 2.67 2.44c-1.32 1.46-4.76 0-4.76 0-1.94 1.17-2.23.72-2.23 3.17 0 .91.16 1.85.49 2.74.12.59.52.86 1.16 1.27.64.41 3.48 2.51 3.48 3.67 0 .31-1.87.17-2.02.56l-.09.24-.21.14c-2.67 1.84-2.82 5.06-2.82 7.81v.81l.84 1.27c.52.89 5.73 2.75 3.89 4.26l-2.09.2-.82.7c-1.46 1.26-.96.75-.96 1.97 0 .08.01.16.01.25.81 2.71 4.38.88 4.38 2.18 0 1.8-4.01.13-4.23.93l.13 2.12 1.32 2.78c-1.24.82-4.51.65-5.58.83-1.15.19-2.06.46-2.88 1.29l.16.31c.36.72-.09 2.13.62 2.6 3.84.93 5.95.27 7.94.14 1.35-.09-.38-1.9 1.58-3.18 2.17-1.41 7.05-.89 9.39.93 0 0 .61 2.32.63 2.37l4 .67c3.53.46 3.17.4 5.82 0zm-16.88-65.452c.48-.963 1.56-1.495 3.022-1.495l.76.04.537 1.68c.08 1.365.26 5.03.39 6.354l-1.88-.185c-.92-.924-3.43-4.097-2.84-6.383zm-5.2 14.772l-.53-.794-.08-5.005.81-.16c4.822.66 11.275 1.51 15.533 2.91l1.72 2.25-3.44 2.91c0 1.22-4.377-.66-7.94-2.52-3.04-1.59-3.895.76-6.08.4zm10.973 42.74c-.93.53-6-.517-6-.517v-2.27l1.48-.34 3.324.625c0 .058 2.115 1.985 1.19 2.514zm1.32-19.45c-.19 1.167-1.56 2.56-3.24 3.677l-.307.204-.354-.11c-2.435-.7-3.943-1.92-4.346-3.52l-.062-.25.1-.23c.653-1.63 2.635-2.91 4.416-2.83 1.42.06 2.79.63 3.264 2.14l.53.93zm-1.58-6.85l-.136.053h-.143c-2.287 0-4.693-1.34-4.786-3.81-.348-1.25.555-2.08 1.224-2.68l.776-.82.296-.345.28-.04c1.962-.243 3.78 1.178 4.33 3.386l.264.267c.3 2.4-.274 3.32-2.11 4.01z"/>
+  <path d="M346.262 512.832c0-12.343-.68-25.316-1.252-35.294.04-6.272 1.02-13.666 1.252-20.442-.415-3.375 2.988-9.74-.1-12.452-10.788 1.265-25.06 1.237-32.867 1.87-10.106 1.324-16.487 4.398-21.476 7.206-4.63 2.604-7.6 4.485-9.61 7.01-.62.776-6.44-8.533-11.71-8.954-9.7-1.86-2.02-1.62-21.44-1.665-2.21 0-3.71-.97-6.4-1.36-10.39-1.49-13.15-3.18-18.37-4.78-4.38-1.34-8.13-1.7-9.43-1.84-1.71-.18-.54 8 .82 13.01.05 5.15-.61 10.6.62 14.94-1.11 1.99-1.45 22.2-.05 26.59-1.4 6.76-.79 18.95-.92 28.34-.69 4.58-2.72 7.46-4.08 10.66-.01 1.58.48 2.67.37 3.99-.12 1.37-.96 2.12.9 3.61 2.39.85 5.3 1.33 7.76 2.11 15.52 5.62 32.6 8.46 49.06 6.44 6.46-1.44 12.24 5.79 19.95 4.44 17.35-5.49 34.02-3.57 49.72-6.07 4.53-3.37 7.42-.53 10.79-4.34-1.36-12.31-.97-26.42-3.57-32.98zm-124.902-12.27c.745-9.784-.934-19.777-.046-19.743l-.045-5.05c-.98-1.41-.4-15.45-1.47-18.2-.14-.36 0-.76.01-1.14 0-.29 0-.56.01-.84-.29-1.17-.01-1.98-.76-3.03-.09-.13.22-.81.23-.96l1.12-.09c.49 1.23 1.81 2.39 1.81 3.75 0 .04-.01.07-.01.1.14.54.11 1.26.07 1.8-.09 1.49.26 1.75.26 2.85 0 .38.57 3.37.57 9.17.16 1.6.69 2.75.62 2.89l-.79 3.94.13 3.95s-.44 22.5-1.14 22.02c0 0-.49.13-.62-1.45zm29.504 43.867l-7.803-.18-8.94-2.9c-5.96-1.14-5.22-2.28-8.81-5.53l-2.63-.14-.09-1.93c2.55-7.11 2.52-10.99 3.42-18.25 2.59-20.75 3.16-39.4.46-58.98l-.24-1.6s.14-.68.88-1.31 2.63-.5 2.63-.5c8.41 3.12 7.37 4.87 26.14 3.92l12.33 1.76c2.28.96 4.1.73 5.11 1.64 1.02.91 3.19 3.82 1.82 4.1-.83.17-4.94-2.17-4.94-2.17-2.18-.31-10.81-1.04-12.57.45 0 .04 0 .08-.01.12-.09 2.45 7.47 1.31 12.01 2.96 0 0 10.34 3.64 10.23 4.43-.11.79-20.33-2.99-20.33-2.99-.98-.16-1.29 0-1.36.06 0 0-.04.09-.1.3-.08.18-.59.36-.59.52 0 .67 1.6 1.1 1.65 1.14 3.47 1.13 6.38 1.7 10.06 2.5l5.29.96s3.07 1.03 2.79 1.54c-.28.51-18.53-1.56-19.2-1.59-.75.67-1.23.56-1.23 1.21 0 .17.03.36.08.54.13.16.79.68.98.92 1.98.37 4.56-.21 6.71.17 3.18.57 14.49 2.27 14.49 3.13 0 .85-3.86.57-3.86.57l-5.57.28c-4.55-.46-8.3-1.37-12.38-.35-.04.14-.09.28-.09.41 0 .37.13.67.27.89.34.52.95.88 1.55.88l3.03.03c5.29 1.76 8.33.14 12.66 2.05l2.45 1.58-1.02 1.08c.31-.06-9.09-.79-10.4-1.08-3.96-.87-8.86-.74-8.92 1.31 1.14 1.54 5.55.79 8.58 1.37 2.39.46 7.27 2.3 9.49 3.13l5.84.72-.16 1.53c-2.66.35-6.74-.98-9.37-1.18-3.81-.29-14.37-1.82-14.77-.51-.57 1.82 5.12 1.63 7.61 1.76 1.27.06.94-.09 1.82.34l3.18.91s10.34 1.53 10.34 2.5-5.68.28-5.68.28c-2.95.89-7.32.37-9.83.06-2.95-.37-7.38-.34-7.89.97-.15.39 1.16 1.63 2.1 1.64 3.18.53 2.73-.21 6.37-.27l10.8 1.88s3.87.05 3.47.74c-.39.68-9.21.41-12.1.45-6.93.11-10.57-.34-11.02 1.99-.09.78 1.58 1.55 1.99 1.81.31.02 22.14.77 21.99 2.85-.14 2.08-11.53 0-11.53 0-3.75-.06-9.54.09-13.01.57-1.31 1.93.06 2.9.06 2.9 1.59.51 17.72.73 19.82.57 1.26-.09 4.13.66 5.35.91 0 0 1.05.08 1.32.84s-1.49.7-1.49.7c-1.25-.65-3.68-.62-5.45-.62h-.13c-2.06 0-18.82-.56-19.77.49-.33.36-.49.86-.49 1.5v.17c.03 2.36 4.9 2.25 7.1 2.09 0 0 3.07-.01 2.97-.03l14.73.43.07 1.57-12.04-.04c-4.54-.05-11.08.58-11.08.62 0 .25-2.16 1.02-1.93 2.61.23 1.59 2.21 1.29 2.73 1.31 3.5-.64 6.76-.82 10-.74 0 0 10.89.52 11.13 1.53.24 1.01-14.32 1.42-18.35 1.82-4.76.47-5.95-.72-6.54 2.47l.9.9c.6 0 26.03-.59 26.37 1.34.27 1.55-20.48 1.05-21.93.96-2.24-.14-4.72.12-4.78 1.94.3 1.21 1.19 1.85 1.65 1.94 0 0 19.78-1.25 20-.51.23.74-10.28 1.88-10.28 1.88-2.5.85-5.33.69-8.18.8-3.55.14-3.01 1.08-3.24 1.54 0 .48 1.25 1.65 1.25 1.65l2.05.45 10.29-.46h8.13c.65-.65 6.25-.34 6.37.29.12.63-1.01 1.12-1.82 1.25-3.7-.35-8.83.97-14.4 1.06-5.57.09-14.47-1.71-14.47-1.71zm90.857-5.82l-1.82 2.27c-1.97.39-.61 2.27-2.89 2.76-21.78-.09-30.08-1.45-44.63 2.74l-.14.04-1.99.02c-2.11-.18.44-2.81-.79-4.61l-.08-8.16-.25-.33.03-.3c.53-6.85.18-7.82.18-14.95 0-2.39-.29-4.75-.3-7.11 0 0 .53-16.54.7-14.39l-.61-34.71 1.32-1.58c.87.02 3.73-.44 8.73-3.95 8.44-2.1 6.93-1.23 10.08-3.07 1.3.88 21.44-3.17 24.03-1.98 1.12.51.7.86 1.1 2.09l.06.14-.01.15c.32 4.03.52 8.91.74 12.61.92 15.4.49 29.75 2.15 44.88l2.28 15.83c.53 3.55 1.38 4.03 1.66 6.86l.55 4.21-.04.48zm-.95-71.59c-.32.94.77 16.01-.09 16.1-.86.09-1.55-4.01-1.44-3.47l-.38-14.76c-.01-.03-.28-1.45-.29-1.48h-.01c0-.05 0-.13-.01-.19-.15-.58.03-.37.03-.9 0-.11.04-.21.04-.32-.13-1.02-.33-1.99-.33-3.06 0-2.08-.87-4.84.1-6.42l1.73-.96 1.73.57c.46.92-.25 2.94-.25 3.74 0 1.22-.45 10.07-.8 11.1zm-207.62-57.8c-1.34-.15-2.39-.45-1.79-1.35.6-.9 10.62 0 10.62 0 4.94 3.29 10.32 4.18 10.32 4.18s3.14 1.49 12.11 10.62c9.88 10.05 8.08 33.66 8.08 33.66s.15 4.49-.6 11.22c-.74 6.73 4.94 6.28 4.94 6.28 4.49 4.19 5.98 2.54 5.98 2.54s1.5 2.09 2.84 1.49c1.35-.6-.15-2.84-.59-4.19-.45-1.35-1.79-30.82-1.79-30.82.45-9.28-5.38-22.9-5.38-22.9-2.84-10.47-18.69-19.15-20.33-19.6-1.65-.45-8.37-3.6-8.37-3.6.45-1.05-2.24-3.29-2.24-3.29s8.67-1.05 13.31-1.5c4.64-.45 23.03 2.39 22.88-.9-.38-9.54-.2-19.41-1.05-28.73-.15-1.65.78-2.34.9-5.09.21-4.93-.3-13.16-.3-18.55 0-17.36.6-27.09.44-52.18-.1-16.27-.07-25.3-.14-41.04l-.45-7.03c.45-1.95 2.1-4.34 4.2-5.38.49-.16.99-.62 1.3-1.35.19-.47.29-1.01.29-1.55 0-.66-.14-1.32-.42-1.85-1.01-1.59-.88-3.35-3.27-3.2-1.5.09-2.04-.77-2.04-.77 3.23-1.03 2.84-3.26 3.69-4.2.86-.94 1.44-.1 1.44-1.12v-.17l.07-.16c.54-1.26.72-2.9.43-4.07-1.1-4.41-1.49-4.34-2.87-7.26l-.23-.27.05-.35c.18-1.7.61-4.27 1.45-5.59l.64-1.02c.35-1.32.5-2.55.5-3.71 0-4.01-3.05-5.88-5.12-9.47 0 0-2.32-3.05-2.63-3.61-1.66-.6-2.16-.63-2.99-.15-1.3.75-1.27 2.94-2.45 5.01-1.58 2.77-2.03 3.67-3.07 6.51-.21 1.4-.45 1.45-.45 2.84 0 2.47.51 3.57.51 3.57l.08.09c.63.82 1.66 3.61 1.66 4.27 0 1.34-2.39 7.18-2.39 7.18-.45 1.44-.9 1.27-.9 2.69 0 1.07 1.65 2.69 2.43 3.51l-.89 1.25-10.36-7.76c-5.08-6.58-9.87-13.92-10.77-26.01-.23-.72-.37-1.38-.37-1.92 0-1.27.51-2.1 1.04-2.62 1.8-1.74 3.41-1.84 5.16-1.17 2.04-.62 2.42-2.58 2.42-4.41-.03-.73-.21-1.25-.53-1.54-.61-.55-1.65-.95-2.93-.79-1.18.14-2.86.63-3.89.3v-3.74l2.4-4.34c0-.6-.02-2.05-.3-2.99-.44-1.5-.25-2.39-1.49-4.49-1.23-2.07 1.8-4.79 1.5-11.07-.06-1.23-1.49-3.29-2.99-5.54.13-.59-3.11-3.53-3.11-4.2 0-3.07.46-4.69-1.13-6.42-.34-.06-1.39-.22-2.04.16 0 0-.09.28-.52.47-.71 1.3-.54 4.72-1.57 5.96-2.05 2.44-4.49 7.48-3.89 9.87.22.88 1.95 3.89 1.95 3.89 1.19 1.5 2.17 1.99 1.94 3.14-.15.75-1.43.81-3.29 1.79-1.39 1.66-3.24 5.31-3.14 7.33.45 8.53 4.91 7.54 5.5 9.58l-.41.89s-3 .12-3.36.12c-2.02 1.15-8.07-.74-8.07 1 0 .39.78 4.79 2.46 6.2.9.75 7.03.3 7.03.3l1.8 1.49c-.15 4.63.66 5.57-.45 9.72-.49 1.86-.62 5.66-.74 7.33-.49 1.33-1.34.85-2.09 2.1-2.84 9.72-13.47 15.33-19.26 11.98l-1.22.14s.9-2.55.6-3.15l-.89-2.85c.42-.73.89-2.1.89-4.1.01-1.13-2.81-3.84-3.13-4.73-.75-2.1 2.24-1.59 2.24-4.49 0-3.93-4.74-9.69-5.98-13.47-1.36-1.61-1.19-3.74-3.9-3.19l-1.39 1.43c-1.88 3.7-4.46 7.55-5.61 11.14-.28.78-.4 1.53-.4 2.27 0 1.81 2.34 3.33 3.09 5.11 0 0 .6 1.05-1.79 5.24-.28.48-1.2 2.54-.45 4.81.29 1.36.97 1.64 1.84 2.57 1.02 1.1 2.08 2.23 2.32 4l.03.23-.09.2c-.63 1.55-2.52 2.29-5.04 1.96-1.49.29-2.69-.17-3.55 1.56l-.37.72c-.04.27-.07.52-.07.76 0 2.29-1.27 4.39 1.8 5.48 1.61.58 2.84-1.79 4.19.3l.9 8.08-1.19 7.48c.89 4.19.58 6.57.58 10.06 0 1.34-.52 10.09-.74 11.34 0 32.62.44 58.37.44 96.95 0 6.97 1.32 21.32 1.35 28.28 1.94 4.94 6.7.89 9.87 1.8 3.14.9 12.83.19 13.92.11 2.49-.2 6.02.15 7.19 3.64l.26.76-1.92-.01s-2.69-.15-3.89-.15c-1.19 0-10.46 2.39-10.46 2.39s-11.81 2.24-13.91 3.89c-2.17 1.7 2.84 4.19 4.63 2.69 1.8-1.49 13.31-4.63 20.49-5.23 7.18-.6 13.31 1.19 17.79 2.69 4.49 1.49 17.65 6.28 18.09 7.48.45 1.2 1.95 2.99 1.95 2.99 1.05.15 3.29 2.09 3.29 2.69 0 .6 4.64 8.38 5.68 8.97 1.05.6 1.65 2.55 1.65 2.55l2.39 9.73.45 22.59.15 5.08s.3 6.43.15 7.78-2.84.3-2.84.3.15-1.35-.3-1.95c-.44-.6-.44-3.74-.44-3.74s.15-19.3-.15-29.92c-.3-10.62-11.06-19.9-11.06-19.9s-1.35-.15-1.35-1.65-13.453-9.58-22.723-11.97c-9.27-2.39-18.83.45-18.83.45l-5.23.45s-3.59 2.09-7.62 2.54c-6.55.73-2.24 2.4-1.05 4.34 1.2 1.95 5.23.3 8.075-1.05 2.84-1.35 12.41-1.65 12.41-1.65.3 0 2.54 1.95-.3 1.95-4.507 0-6.43.6-6.43.6-1.94 0-4.78 1.5-4.78 1.5s-2.54.9-5.087.75c-2.54-.15-1.65 3.59-1.65 3.59-1.2 0-6.88-10.77-6.88-10.77-1.944-2.25-3.14-3.59-5.533-6.59L96.75 393c-10.686-17.463-12.3-27.99-20.34-55.96-5.39-24.39-6.24-47.082-5.04-64.29l.556-9.92c1.6-13.27 3.734-24.09 7.322-36.96 8.09-31.11 24.67-59.55 47.696-86.03 10.013-10.62 15.712-15.51 25.71-23.94 1.306-1.093 3.665-2.06 5.834-3.59.93-.65 1.48-1.78 2.46-2.45 5.91-4.03 12.245-8.03 12.245-8.03 3.393-1.64 13.26-8.97 12.214-10.02-1.2-1.642-11.35 5.47-16.15 8.08-5.385 4.19-7.765 5.4-12.41 8.83-11.96 8.826-23.177 17.805-32.746 29.476-9.88 10.44-18.05 22.063-25.56 34.41-.78 1.29-1.18 2.877-1.94 4.19-.76 1.317-2.45 2.01-3.18 3.35-13.31 24.36-22.15 52.77-25.97 86.87-.67 5.775-1.05 9.55-1.05 14.96 0 9.55-.4 19.33.05 29.03.12 2.497 1.5 5.896 1.75 8.376.23 2.26-.67 3.6-.3 5.84.02 0 3.59 13.62 3.59 13.62 2.54 12.72 5.38 16.904 8.07 24.684 4.41 12.75 12.06 28.106 19.1 39.85l8.06 13.87c.02 0 8.71 10.54 8.71 10.54 5.77 7.23 15.31 18.43 22.45 24.467 5.53 6.14 8.81 8.16 15.25 12.27 4.48 2.86 7.47 6.14 12.71 8.98 1.94 1.05 1.9-1.85 2.99.45.96 2.04 6.22 5.38 13.6 8.08 2.1.95 1.98 2.15 4.97 1.52.84-.822.02-2.072-1.15-3.12-2.14-1.54-3.48-1.92-5.88-2.84-3.29-1.944-10.22-2.1-9.9-8.125 1.49-28.576-1.36-33.39-5.09-42.043-7.92-12.72-15.99-14.664-24.82-17.206-1.94-.15-5.98-.9-7.32-1.05zm-28.12-219.8l.91-.9 1.96 2.05c-.08.16-.04.3.16.71l.22 1.52-.53 1.4s-2.24.3-3.29-.6c-1.04-.9.59-4.19.59-4.19zm3.75 21.99c-.73.09-1.69-1.25-2.09-1.65-.71-.69-.06-4.65-.06-4.65l2.16-.74c2.21-.26 3.1.47 3.59 2.54l.01 1.47-.3.75c-.27.75-1.47 2.8-3.29 2.26zm70.57-18.85l1.5-.3c.55 1.41 1.44 4.91 1.05 6.73l-2.48 1.91-.46.12c-1.11.29-1.77-.43-2.3-1.01l-.38-.42-.06-.22c2.84-2.19.85-6.15 3.14-6.83zm-1.79 21.69c.49-2.26 2.75-4.5 4.19-3.59 2.4 1.49 2.81 5.12 2.81 5.12l-1.03.99c-1.09 1.09-2.92 2.92-4.76 1.24l-.22-.21-.37-1.46-.6-2.1zm-11.66 19l2.7-.17 2.09 3.76s-.59 60.15.75 65.68c1.35 5.53-.82 24.8-.3 53.71l-.3 23.04-1.8.1-.35.03c-7.18.6-14.88.31-16.08 1.66l-3.74-.6-1.58-1.98c-1.06-22.63.24-49.95-.06-72.54-.2-15.67.6-26.19.15-41.9l1.68-11.23.1-.19c5.56-9.84 12.27-15.21 16.76-19.4zm-21.6-90.67l1.63.69.68 3.8c-1.19 2.24-1.73 3.24-2.39 3.14-1.94-.3-1.47-2.02-1.94-2.85l.59-1.5c-.02-1-.06-2.51 1.44-3.29zm-1.3 20.78c0-.96.44-1.73 1.27-2.18 1.46-.81 4-.35 5.03.9.73 1.29.76 2.96.16 4.19-.4.81-1.05 1.33-1.84 1.5-.97.8-2.1.95-3.06.33-.97-.63-1.56-1.89-1.56-3.19 0-.28.05-.56.11-.84-.06-.25-.09-.5-.09-.73zm-3.86 43.56l2.55-5.84.6-16.21 1.2-.7s.9-1.2 2.39-.9c0 0 .6.3 0 2.99 0 0 0 7.33-.44 8.97-.45 1.65-5.08 14.51-7.62 17.06-2.54 2.54-7.62 8.83-18.09 11.52 0 0-1.04-1.05-.89 2.24 0 0-11.96.6-12.86 0-.89-.6.75-.9 5.24-1.8 2.24-.45 2.4-.75 10.47-3 8.08-2.25 17.2-11.22 17.5-14.36zm-3.88 13.31c4.16-4.16 5.95-5.28 8.98-9.73l1.35-1.65 2.09.15 1.35 4.49 3.44 3.59c3.66 3.48 2.87 3.18 6.13 6.71l.17.18-.01 3.27-5.23 6.88c-1.19.89-2.01-.36-3.43 1.94-1 1.98-.9 2.69-1.95 4.49-1.16 1.98-1.23.29-2.01 2.34l-.17.45-.46.04c-2.5.26-4.27-.45-5.54-2.22-1.54-3.12-.59-3.62-3.17-6.01-3.28-3.04-5.83-3-7.78-6.29l-.98-3.17 7.26-5.5zm41.03 8.91s-.45-2.23.69-1.89c1.14.34 4.49-.9 4.49-.9s1.2-.01 1.65 1.04c.45 1.05-1.04 1.05-1.04 1.05zm.69 122.75l.3 10.32s1.5 1.34.75 2.09c-1.52 1.52-.56 21.34-.56 21.34l-.41.2c-3.82 1.86-6.2-.45-10.93.08-1.98.22-4.04 0-6.03-.09-.63 0-7.32.3-7.32.3h-5.98l-3.44-.15-5.25.12-22.25 1.07c-14.05.3-8.52-2.99-8.52-2.99l30.65.15c2.93-.52 2.33-4.97 2.54-7.94l-.6-3.14v-30.52s.75-33.52-.59-35.76l.45-8.23-.15-39.5c.1-.23.3-4.91.75-5.09.75-.3 1.5.75 1.64-.45.24-1.88 3.6-6.58 3.74-4.19.15 2.54-3.14 5.23-3.14 5.23s.3 25.14-1.04 32.02c-.45 2.35.75 6.73.75 6.73l.6 43.69v25.59-.3s-.33 16.28-.28 17.56c.13 3.37.15 2.97 1.78 3.54h.15l7.78.3c.02 0 4.64.45 4.64.45-1.01.09 1.07-.84 3.22-.74 3.68 0 13.29-.02 13.67-.02 1.79-1.01.48-13.6.53-15.53.03-1.54-.08-18.58.82-20.97l-.45-15.26v-69.4s.15-20.05-.75-23.49c-.9-3.45-.3-7.34 2.24-7.19l1.2 6.88-.3 19.3s1.65 3.59 1.8 5.99c.15 2.39-2.39 3.29-2.39 3.29l1.05 5.68s-1.05 28.88.15 30.52c1.19 1.64.59 34.86-.15 35.91-.75 1.04.74 7.03.59 8.53-.15 1.5-1.19 4.04-1.19 4.04zm-41.89-106.21s-5.42-4.52-3.29-4.34c1.8.15 4.79 4.19 4.79 4.19l3.29 3.29s1.5 2.09 0 2.39c-2.2.44-4.78-5.54-4.78-5.54zm1.8-67.48l10.17-.3s2.99-.15 3.29.6c.3.75-5.53 1.19-5.53 1.19l-9.12.6s-2.09-1.8 1.2-2.1zm33.34 47.13c.9.3 2.1.9-2.09 2.09-4.18 1.19-7.92 5.83-9.12 4.93-1.19-.9 2.54-2.99 5.23-4.34 2.69-1.35.9-3.14.9-3.14l-7.62-6.74s-8.88-11.53-10.49-14.91c-1.02-2.15-1.5-6.22-.87-6.49 1.05-.45 2.99 5.53 4.64 9.72l4 4.62 3.93 5.55c7.93 9.87 10.23 8.25 11.52 8.68zm-60.84 7.63c-3.29-.3-2.09 7.48-2.09 7.48s.75 9.42.75 10.32c0 .89-.59 8.82-.59 8.82s.45 3.29 0 3.59c-.45.3.15 8.98.15 8.98-.9 1.19.15 9.42.15 9.42-.9 1.79-.3 20.5-.3 20.5s1.2.89.6 1.49c-1.35 1.35-.44 8.83-.44 8.83-1.19 2.09.45 7.48.45 7.48v21.09l-.15 26.48c.9 2.69-.29 8.68-.29 8.68s2.1 6.58-.89 6.58-1.19-4.94-1.19-4.94l-.15-21.85-.3-33.97-.15-32.17s.75-22.59-.45-24.54c-1.19-1.95.6-3.74.6-3.74s0-26.34.6-29.33c.6-2.99 2.39-.3 2.39-.3l10.77.3 3.29 2.69 2.69.15c1.9.97 5.2 3.31 5.23 4.04.04.74-4.18-2.1-2.69 1.04 7.63 5.69 5.23 9.63 8.23 14.96l.74 10.67v.13c-.81 17.14-.52 33.93-.21 51.7.3 17.36-1.13 33.99-.2 53.6v.14l-.48 7.19-17.8 1.94s-3.58-1.58-4.4-2.58c-.82-1.01.67-7.29.37-12.98-.2-3.9.56-8.39.3-12.42-1.34-27.08.09-52.09-.45-74.66-.28-11.69-.64-26.8-.57-38.92v-.29l.17-.22c.8-1 1.9-2.32 3.4-3.82 0 0 .45-1.5-4.04-1.35 0 0 .3 0-2.99-.3zm55.77 235.06l-.83.5-2.45-.95c-20.33-13.17-49.79-45.94-48.74-48.63 1.05-2.69 8.52-4.94 8.52-4.94 1.65.3 3.44.3 5.24 0 3.13-.52 4.96.65 4.96.65l8.05 1.06c9.13 2.34 12.01 3.51 18.85 11.17 8.82 9.88 6.58 31.13 6.43 41.15zM384.04 96.75c2.803 1.73 11.65 5.923 12.692 7.17 2.41 1.4 10.64 7.27 19.28 13.016 7.42 6.67 17.48 17.615 28.94 28.804 23.53 25.95 39.21 55.553 47.33 86.573 4.2 12.533 4.43 23.904 6.03 37.134l.89 8.5c1.2 17.157-.63 36.533-6.04 60.85-8.07 27.89-15.87 47.874-26.16 65.77l-.79 1.88c-.11 1.923-4.59-1.19-6.13-2l-.84-.465c-3.53-2.04-7.46-3.4-11.26-4.72l-6.302-1.96v-1.01c-.575-1.44 5.23-3.03 7.72-2.82 1.084.09 2.11.17 2.886.01 3.996.22 11.98-1.43 14.692-1.37 5.774.11 4.77.29 5.926-3.18.03-6.94-1-15.55-1-22.49 0-36.707.45-47.183-.442-76.296-.03-3.73-.345-5.22-.29-6.94-.065-5.637.686-29.87.29-30.81-2.024-4.77-1.46-5.795 0-9.835l1.01-.58.075-.14c1.2-1.01 2.88-1.61 4.495-2.19 3.077-1.09 4.75-1.28 4.75-3.56 0-.24 0-5.02-2.65-5.3-2.558-.38-6.11-.16-6.75-1.71l-.088-.2.03-.22c.24-1.76-.36-3.48 2.162-5.25.944-.66 2.425-1.77 2.72-3.13.232-.58.34-1.13.34-1.68 0-2.67-5.49-6-6.015-6.77-.53-.77 1.72-4.41 1.72-4.41.75-1.78 1.42-3.22 1.53-5.16.04-.73-.12-1.48-.4-2.25-1.15-3.58-6.43-5.46-8.21-10.5l-1.4-1.43c-1.61-.37-1.89.33-3.25 1.93-.94 4.64-3.31 7.83-3.31 11.74 0 2.9 1.8 4.07 2.93 6.72l.85 3.03-3.21 2.56c-1.41 1.55-1.76 3.48-1.76 4.88 0 .6.19 1.25.61 1.98l.29.54c.38.68 1.12 1.88 1.12 2.8 0 .16.27.98-.31 1.13-.58.15-2.6-.57-2.6-.57l-5.95-4.22c-3.15-7.36-4.44-4.17-8.23-11.08-.12-1.67-3.5-9.28-3.69-11.74-.33-4.27-2.74-10.42.47-14.39 0 0 4.04-.56 5.4-.46 2.19.17 2.43-.47 3.31-.96.17-.46.66-.61.66-1 0-1.74-.85-4.4-3.12-4.93-4.63 1.1-5.67-1.07-5.95-1.74-.28-.66 1.33-2.75 1.33-2.75.59-2.03-1.61-.49-1.61-2.46 0-2.02 1.41-3.55.95-5.77-1.51-1.42-3.12-3.27-3.12-5.31 0-1.18 1.85-3.18 1.85-3.18l.08-.11c-.13-.49.34-2.05.34-2.96 0-1.89-1.16-4.09-3.21-6.53-1.03-1.23-4.35-2.74-4.41-4.54-.42-.18-1.14-.48-1.14-.48-.65-.38-1.67-.33-2.01-.27-3.13 2.12 1.14 1.52-3.88 9.09-.37.56-.13 2.92 0 3.5.79 1.39 1.88 5.08 2.27 6.25.57 1.71-2.12.64-3.36 2.7-1.25 2.1-2.45 4.12-2.45 6.38 0 .98.23 2.01.77 3.11l3.99 4.75-.91.29c-1.03.34-2.26.18-3.45.04-1.27-.17-5.33-.71-5.94-.17-.32.28-.5.8-.53 1.53 0 .83 1.18 1.32 2.24 2.2.85 3.03 2.55 2.49 3.66 2.82 2.3 1.06 4.56.17 6.37 1.91.54.52.29.91.29 2.18 0 .54 0 3.98-1.23 6.35 0 10.45-.52 14.46-6.15 19.66 0 0-.43 3.91-2.89 5.35-2.45 1.44-4.33 4.19-4.33 4.19-.29.29-3.47-.46-4.05.44-1.3 2.02-2.95 5.54-4.19 1.59 0 0 1.62-1.71 1.59-1.88-.14-7.67-.46-6.45-1.14-7.16-.79-.83-3.95-2.74-3.95-4.08 0-.66.47-1.34.47-1.34l1.16-3.47c1.98-1.37 1.88-2.02 2.17-5.35.09-1.01-.43-4.19-.14-4.91-3.32-3.33-3.84-4.14-4.48-7.23-.48-2.32-.42-5.33-1.73-6.07-.83-.48-3.08-.44-4.75.16l-2.1 3.81c-2.08 3.58-3.94 7.65-3.94 11.65 0 1.16.15 2.38.51 3.7l.64 1.02c.85 1.32 2.85 3.68 2.85 4.12 0 .43-1.3.72-1.3.72l-1.45 3.61c-2.46 2.17-3.47 2.32-4.48 7.81-.22 1.18 1.84 2.35 2.38 3.61l.07.16v.17c0 1.01 1.1 1.59 1.59 2.76.29.69-.66 1.85-.14 3.15 0 0 1.01 1.3 1.01 1.88 0 .58-2.39 1.42-3.9 1.45-1.52.02-2.51-.52-3.53 1.07-.28.53-.42 1.19-.42 1.85 0 .53.09 1.07.29 1.54.3.73 1.73 2.78 2.22 2.93 4.01 0 3.99-.96 5.85 2.04l.13.2v.24c-.07 15.7.23 33.96-.2 50.18-.47 18.22-.14 36.43-.14 54.39 0 15.75 1.59 29.07.87 43.97.41.33 3.69 2.95 4.01 3.21h27.94s2.74.26 2.74 1.56-2.14 1.06-2.14 1.06c-14.16 2.94-25.47 6.61-33.27 16.25-2.99 3.19-6.46 6.85-6.83 11.13-3.74 8.63-4.61 18.35-4.83 28.12-.13 5.37.01 12.99-.58 18.8-.41 4.04-1.64 7.15-1.64 8.3 0 2.79-1.54 5.98-1.54 5.98-.19 1.06-.14 1.45.29 2.31.67 1.34-2.31.77-.82 3.1 4.1.75 17.88-8.28 20.34-10.96 1.94-2.11.45.9 6.71-3.575 6.23-4.45 27.64-18.31 32.41-24.835 8.84-7.43 15.99-15.37 20.35-20.8 0 0 .23-.45 7.83-10.29 7.6-9.85 18.1-29.76 18.1-29.76 1.28-2.79 1.33-4.49 2.79-7.46.97-1.97 2.31-5.15 3.88-9.15.6-1.53 2.06-2.53 2.79-4.51 2.84-7.73 4.56-15.32 7.31-22.72 0 0 2.89-13.43 2.91-13.42 2.41-14.19 3.13-17.23 4.02-31.54.34-5.38 1.05-20.63.45-26.39-6.03-57.49-23.92-93.73-52.09-127.51-4.47-6.08-16.53-19.66-32.95-33.3-6.33-5.26-11.96-8.64-16.66-12.66-7.88-5.57-11.16-5.91-15.17-8.52l-5.79-2.92c-1.78.71-1.99 2.02-2.14 3.64.94.84 3.08 1.38 5.38 2.99zm83.043 102.98h.76s1.487.91.92 2.425c-.57 1.52-1.783 1.97-2.36 2.03-.575.06-1.805-1.07-1.805-1.07l.222-1.52c.19-.4.232-.55.152-.71l2.11-1.14zm-2.953 20.008c.496-2.062 2.47-3.38 4.682-3.123 0 0 2.315.22 2.125 2.49-.09 1.07-1.38 2.38-2.1 3.07-.404.39-3.32 2.04-4.05 1.95-1.82.53-.764-1.81-1.04-2.56l.324-1.58.06-.26zm-42.08-41.28l6.65-.29 6.204-.472c.964.746 4.286.312 4.202 1.05l-1.3 1.012-4.193.58c-.297-.1-7.415.6-7.66-.148-.254-.772-4.48-.435-3.903-1.736zm32.892 51.068c.178-.737 2.325-.44 3.01-.44.69 0 2.666.723 2.856 1.576.18.852-.57-.19-1.23.19-.67.378.28 2.556-.29 2.46-.57-.093-4.35-3.786-4.35-3.786zm15.14 6.25s2.27-1.23 2.364-.19c.095 1.042-1.798 1.137-1.798 1.137s-.19 1.135-2.09.757c-1.9-.38 1.51-1.7 1.51-1.7zm-15.54 9.837l.13-.02c1.934-.25 3.376.308 4.542 1.756l.17.22.004.29c-1.21 12.91.46 23.45.38 35.62-.15 22.57-2.15 46.06-.15 70.59-.27 4.02.35 8.13.58 12.01.3 5.16 1.11 9.7.29 14.41l-.11.65s-21.29 1-22.01-.16c-.73-1.16 0-4.34 0-4.34l-.44-13.88c-.77-17.02.86-22.42-.29-36.74-.09-1.02.87-1.96.89-3.09.2-11.76.84-29.74-.9-34.22-.05-4.34.457-9.1.29-13.45-.05-1.39.397-4.01.397-4.01l.04-.14c2.58-8.98 7.09-19.15 16.05-25.42l.115-.06zm-23.85-96.88l.322-.763 1.407-.07c1.51.785.78 2.73.76 3.727l-.01.6-.74.694c-.47.83-.68.86-1.13.95-.66.13-.88.01-1.51-.48l-.38-3.03 1.3-1.63zm-2.623 17.16c1.03-1.244 3.02-1.515 4.63-1.42.95.058 1.8.946 2.74 2.272.13.187.61.88.56 1.126.06.28.11.56.11.84 0 1.29-2.48 1.89-3.46 2.51-.96.61-2.1.47-3.08-.33-.8-.16-1.45-.68-1.85-1.49-.6-1.22-.41-2.2.32-3.49zm1.23 37.593l.66-3.504s.09-13.92 1.13-13.257c1.04.663 1.8.19 1.98 1.99.19 1.798-.48 6.627-.48 6.627l.05 3.793 1.47 1.13s.57.57.85 4.168c.29 3.598 4.45 7.007 4.45 7.007l.1 1.707 4.17 5.49s.29.757-.85-.19c-1.13-.947-6.34-6.06-6.62-8.71-.28-2.653-4.26-7.956-4.26-7.956s-.94-2.65-2.17 2.66-3.03 9.95-6.91 13.26c0 0-8.42 10.23-11.83 11.27 0 0 .28 1.23-2.75 2.09 0 0-6.53 3.6-7.19 1.33-.52-1.79.85-2.66.85-2.66s.57-.1.66.66c0 0 .85 1.89 6.43-1.52s2.1-1.39 4.73-2.84c.39-.22-2.48 1.79.85-.57s10.59-11.16 12.11-15.15c1.52-3.98 2.56-6.82 2.56-6.82zm20.5 34.71c-1.84 2.816-3.61 3.36-5.93 5.496-2.59 2.384-5.1 4.85-6.65 7.956-1.29 1.765-3.04 3.902-7.09 3.18 0 0-.73-1.3-1.3-3.18-.63-2.05-2.48-2.08-3.47-4.05-1.44-2.296-4.9-4.857-6.94-6.51l-3.04-2.896s-2.24-3.525-.18-6.246c2.06-2.72.17-.18.17-.18 4.34-3.11 7.89-9.47 11.57-12.95l4.77-4.34s2.02-.86 3.76 1.31c1.73 2.17 2.31 4.2 3.61 5.5 1.3 1.3 3.61 2.9 6.79 6.51l6.65 4.77c-.32 1.27-1.02 3.91 2.02 4.63 0 0 4.48-2.02 5.49-2.46 1.01-.43 1.59.15 1.88.58.29.44 4.04 3.47 4.04 3.47s.58 1.01-.29 1.01c-.87 0-2.17-1.59-2.46-.72-.29.87-.14 2.75 1.3 2.9 1.45.14-.29 1.45-.29 1.45s-1.3 4.92.43 5.21c1.73.29 1.88 2.894 1.59 4.05-.29 1.16-.87 35.15-.87 35.15v62.2l.87 20.102-.29 14.03s1.44 3.474-2.17 3.185c-3.62-.29-2.39-1.062-9.83-.576-6.65.43-16.48-.29-16.48-.29l-16.91.43-10.12.723-10.55.29s-3.18 1.734-4.77-1.74c0 0-1.59-9.546-.72-10.56.87-1.01 0-10.85 0-10.85l-.43-33.412v-84.04l-.29-5.21s-1.3-3.47 0-4.913c1.3-1.45.72-3.185.72-3.185s.58 4.196.58 5.354c0 1.15.73 2.17.73 8.39v40.64l.73 56.12.29 36.45s.87 4.19 3.33 3.76l26.02-.437s4.34.29 4.48-1.016c.15-1.3-.14-11.86-.14-11.86l-.58-27.19-.72-41.37.44-24.3s1.59-12.58-2.02-17.36c0 0-6.51-13.16-9.69-15.33-3.18-2.17-12-9.26-17.06-9.69-5.06-.43-1.01-1.3-.43-1.16.58.15 9.54 1.59 11.56 4.63 0 0 9.98 8.25 10.7 9.55.72 1.3 5.64 9.26 5.64 9.26s1.16 2.32 2.17.44 1.15 1.01 1.15 1.01-.29 5.07 2.02.87c2.31-4.19 7.8-12.29 8.96-11.14 1.15 1.16-8.1 8.1-8.97 15.62l-1.73 3.62-.29 34.57v40.07l1.44 37.9s.15 3.04 3.18 3.33c3.04.29 15.32.73 18.65-.14 3.32-.87 7.37.58 7.37.58s2.45 1.16 2.02-3.04c0 0 1.01-6.8-.15-13.02l-.87-24.73s.87-5.79-.72-9.84c0 0 1.59-15.48.72-17.79l-.15-20.83s-.14-34.57-.43-36.74c0 0 1.44-16.2-1.3-16.78 0 0-3.33.58-6.36-1.74 0 0-4.19 1.01-6.36 3.33l-3.04 2.46s-3.32 2.03 1.16-2.02c4.48-4.05 5.2-4.92 5.2-4.92s2.02-3.9-2.17-1.3zm-55.56-43.984l.31-.827.26-.686.77-1.22c2.29.68 2.41 5.5 2.31 5.93l-1.14.67-.39.41c-.52.58-1.18 1.3-2.31 1.01l-.46-.12-.1-.47c-.39-1.81.18-3.27.73-4.67zm-.33 22.634l1.24-1.505 1.44.44c.73 0 2.61.73 3.91 2.32l-.43 2.75-1.22 3.11-.22.2c-1.85 1.69-2.51-.34-3.6-1.43l-1.73-1.3.64-4.58zm10.57 164.26l-.36-.033s-1.76.464-2.19-1.417c-.44-1.88 1.3-3.905 1.3-3.905-1.16-28.2-1.36-50.44-1.41-76.76-.02-5.54.24-11.93.12-16.6l-.32-37.11s0-1.16 1.73-2.02c1.73-.87 4.04.15 4.04.15 7.22 4.48 10.12 9.84 16.19 18.95l2.78 5.41v.22c-.17 15.51-.24 41.96-.62 57.58-.29 11.72.92 4.63-.15 27.19l.72 20.25-.16 7.04c-8.22.05-14.73.2-21.73 1.06zM399 470.103l-.81-3.656.096-7.53.483-9.16c-.68-5.02.86-11.67 5.3-19.77 5.16-9.43 15.89-10.65 25.41-11.66l6.45-.12 4.95.77c3.37.52 6.19-.13 6.48 1.49.38 2.08 1.96 2.66 3.98 3.33 0 0 4.25-2.91 3.35-5.82-.54-1.77-9.61-3.8-9.61-3.8-.45-1.34-9.62-2.46-9.62-2.46-6.04-3.36-18.11.89-20.35.89-2.24 0-5.38 3.3-5.38 3.3-5.52.67-5.22 4.262-5.8 4.52-.58.25 0 .23-.67-.22s-2.01 0-2.01.67-1.85 3.21-1.85 3.21c-5.78 3.66-7.68 24.953-7.68 24.953s1.27 19.04 1.27 22.393c0 3.36-1.34 2.688-1.34 2.688s-.67-5.82-.67-6.94-.9-22.82-.9-22.82c.67-1.34 2.68-12.97 2.68-12.97 1.78-1.56 1.55-3.58 1.79-4.47 1.3-4.95 9-9.87 9-9.87 1.83-1.54 1.5-1.98 1.5-1.98 3.45-3.44 11.57-5.69 17.58-6.5 3.35-.45 6.65-.09 6.65-.09 8.67.09 10.2 1.67 10.2 1.67 1.56.9 17.44 6.04 17.44 6.04 5.81-3.58.89-5.59.89-5.59-15.43-7.38-31.53-6.93-31.53-6.93-2.01 0-6.04-.89-16.99 3.58-10.95 4.48-20.12 17.9-20.12 17.9-2.91 1.57-.07 5.12-.67 5.82-2.6 2.98-2.02 7.83-2.02 7.83s-1.74 11.06-1.34 25.95c.11 4.05-.9 10.74-.9 10.74-1.34 3.58-3.13 4.03-1.56-1.12 1.57-5.14.22-14.54.22-14.54-.9-1.34-.22-2.68-.22-2.68 2.01-2.68 0-7.38 0-7.38-2.02-10.07 5.81-28.41 5.81-28.41 2.46-2.01 2.01-1.79 2.01-1.79.89-3.13 3.8-3.8 7.15-7.83 3.35-4.02 10.95-7.6 10.95-7.6 2.01-.67 12.52-3.13 12.52-3.13 6.26.89 8.5-.67 8.5-.67.89.44 5.14.89 5.81.67l3.35-1.12c6.71 4.47 12.52 4.25 12.52 4.25 4.03 3.8 9.84 4.92 9.84 4.92 2.24-.22 1.79 1.12 1.79 1.12s-9.61 14.09-11.4 15.88l-4.7 4.7-13.19 15.43c-.52.18-11.37 10.44-31.42 24.94l-7.76 5.55-1.11 1.66-3.74 1.25s-3.74 1.52.14-1.11c0 0 1.94-.41 2.49-1.66 0 0 1.8.14 2.77-1.52 0 0 5.34-3.27 3.92-5.17zM69.43 357.78c2.024 6.97 4.79 14.374 7.47 21.657-3.64 4.79-5.17-3.067-9.575-1.15-6.624 2.825-13.022 6.323-19.34 8.622-1.06.52-2.987 1.57-4.023 2.1-1.34 1.91 4.022 4.6.958 6.13-5.17 3.06-3.993-7.53-5.612-9.99-1.618-2.46-2.43-5.33-3.238-8.2 2.227-3.28 4.497 2.83 7.126 3.24 2.845-.83 4.404-1.73 7.852-3.45 3.895-.37 7.504-1.51 10.93-3.04 1.964-.87 3.815-.23 5.73-2.91 2.43-3.41-3.888-6.94-7.085-8.24-5.17-2.11-9.767.38-11.49-3.07-2.21-4.43 9.383-3.64 17.043-6.9 2.062-.88 3.255 5.17 3.255 5.17zm2.108 28.555c2.508-.837 4.927-3.693 6.51-2.107 1.916 1.916 8.044 16.864 13.98 25.87.766.383-.19 4.6-4.787-.383-8.03.002-4.13 2.306-11.68 5.365-.37.416-1.45.675-2.49 1.15-1.13.52-1.57 1.7-3.06 2.3-4.55 1.83-9.36 3.556-8.61 6.324.58 4.79-1.26 3.477-2.68 3.066-1.72-5.558-6.59-9.98-8.62-15.715.81-1.436 1.64-2.682 3.26-2.682.77 4.6 3.54 7.196 5.36 5.557 8.1-4.51 15.48-6.894 23.17-12.84 0-2.05.24-2.948-.57-4.79-4.78-5.174-16.66-4.6-15.89-8.24-.1-.933 1.54-1.34 6.13-2.875zm30.065 38.71c.81 1.436 4.02 2.875 1.532 4.984-4.213.95-3.256-4.03-6.894-2.5-3.64 3.48-17.13 13.52-20.1 16.29-2.68 2.49 7.28 10.73.19 9.2-4.24-5.75-16.27-18.78-12.44-19.74 2.3-2.11 5.42 4.01 7.09 3.83 3.83-1.35 6.46-4.12 8.81-7.09 5.17-3.07 13.29-6.32 13.41-8.63.58-11.5 5.75-.77 8.43 3.64zm25.277 32.387c.134 6.032-3.83 11.306-9.383 17.247-2.344 2.06-5.167 3.31-7.66 4.98-3.064-.19-5.214-.05-8.043-.58-4.475-2.43-7.085-7.86-9-12.27-1.213-4.51-9.49.18-7.468-5.56 9-3.07 8.234-7.29 10.15-6.13.207 3.64.352 9.28 1.34 12.83.828 2.98 2.2 4.12 5.17 5.17 8.043 1.34 17.59-8.34 17.81-12.08.19-3.26 1.53-6.71.574-9.2-1.26-3.27-4.988-5.81-8.234-5.56-2.49.19-7.098 5.78-6.894 8.43.19 2.49 3.315 5.17.766 5.94-1.915.57-10.35-10.29-13.788-14.18.202-1.23.88-2.07 2.298-2.69 2.427-1.23 3.552 3.39 5.17 1.34 2.834-1.84 5.955-4.53 9.192-5.55 7.468-1.54 15.895 11.49 18 17.82zm12.256 6.133c2.023 3.486 11.047 5.265 8.618 9.773-3.035 1.23-5.042-2.98-7.47-1.342-3.828 7.282-14.17 17.44-14.17 22.614-.202 2.458 4.788 3.45 2.49 6.707-5.058-1.437-11.826-7.85-16.277-10.923-.766-7.475 3.125.246 5.553-.576 6.033-4.886 11.682-14.18 16.852-19.93.916-2.068-.096-3.306-.383-4.79-2.88-1.342-.95-2.258-1.15-2.875 2.68-3.45 2.9.932 5.93 1.342zm33.514 26.062c1.914.574 4.24-1.598 6.06-1.19 2.025.618 2.184 1.834 1.98 3.68-2.022 1.845-5.552 7.283-6.892 7.283-1.34 0-7.66-16.864-14.797-17.208-2.82.727-5.88 1.303-2.63 8.777 10.92 12.45 13.75 15.36 12.64 25.87-2.83 3.48-6.72 5.26-11.1 3.64-8.81-3.26-11.49-11.12-15.13-13.42-1.42.61-6.81 1.24-6.89.19-.13-1.73 1.5-2.82 2.11-3.64 2.03-1.85 3.26-4.03 4.6-3.26 5.18 2.96 7.53 14.5 14.37 15.52.43 1.09 1.15-.62 1.92-.77.61-.37 1.62 1.4 2.3.96 1.59-1.06 2.72-4.51 2.3-5.94-5.26-7.99-17.97-13.26-14.93-24.53 1.22-3.9 5.54-7.26 9.38-7.67 10.73 2.49 12.83 11.11 14.75 11.69zm337.435-131.12c.855 2.09-1.068 5.015-3.627 5.43-2.136-1.46-1.478-1.74-3.4-3.827-.213-2.924.4-1.257 1.254-3.764 2.717-1.254 4.705-.344 5.773 2.162zm16.59 3.695c.637 1.253-.538 4.87-2.247 6.123-1.708.837-1.935.99-4.652.99-2.988-2.508.645-4.607-.208-7.322 2.562-1.88 5.395-2.507 7.106.21zm-24.037-222.95c1.045 3.766-2.608 3.485-3.25 2.025.212-1.673-1.313-3.07-3.02-3.906-4.83 1.85-9.405 6.28-14.42 11.3-3.563 3.57-8.058 4.97-8.152 7.32-.096 2.41 2.09 5.23 4.39 5.86 4.153 1.14 10.852 1.29 11.076 2.3.218.99-2.035 1.99-4.18 3.35-1.96 1.25-3.74 2.86-5.373 3.66-5.98-5.64-8.09-12.45-13.86-17.67-.22-1.67-1.47-3.35 1.25-3.76 3.71-.57 9.92-7.95 14.83-10.87 3.63-2.5 11.49-5.23 8.15-10.45 1.07-1.46 2.27-1.25 3.55-.21l8.98 11.09zm20.9 39.53c-3.142-9.426-14.004-29.28-15.884-28.235-1.88 1.046-.647 8.158.42 10.667-.875.655-1.845.466-2.718 1.046-7.48 4.973-14.746 8.39-20.482 15.685-.918 3.293.297 5.01 1.462 7.53 1.275 2.758 2.66 6.273 5.225 8.784 2.57.41 2.25 3.34 4.6 1.46 9.2-3.77 17.34-12.76 27.59-11.92 3.63-.42 1.08-2.93-.21-5.02zm-10.71 3.87c-5.14 2.647-10.366 7.308-16.25 8.678l-3.553-.836s-3.344-3.137-3.344-6.483c.67-5.33 5.79-6.72 9.83-8.57 2.75-1.26 7.44-4.76 8.96-5.46l2.35-.99.24-.1 2.89-.35c2.78 1.81 5.11 5.41 6.27 10.23l.08.42-7.44 3.48zm18.235 13.278c-2.134-4.176 1.32-1.888-1.88-5.437-2.136-.836-3.284 1.75-3.71 3.006-6.193 4.38-16 7.66-22.834 10.79-3.85 4.38-5.16-4.6-8.57-1.26 8.52 18.14 1.25 11.71 13.37 23.84 9.82.21 19.51-2.94 25.91-11.51.42-3.97 2.51-13.39-2.3-19.45zm1.414 12.095c-1.833 2.546-6.64 5.474-11.5 8.134-2.172 1.18-6.306 3.52-8.515 4.66-2.278.56-4.4.66-6.48-.84l-1.807-1.44-2.37-3.58 1.46-2.93c4.595-3.13 11.713-5.69 16.93-8.16 0 0 7.13-4.16 7.317-4.22 2.143-.26 4.387 3.17 4.387 3.17s2.41 2.64.57 5.19zm12.59 53.368c1.67.627 4.387 14.64.625 13.595-5.434-6.902-6.06-.628-11.076 0-3.63 0-14.042 5.73-13.585 8.784.63 4.183 14.7 3.767 21.32 6.065 4.06 1.464 1.6-6.69 5.02-5.437 2.72 2.3-2.51 7.11 2.09 8.783-1.07.416.84 6.274-1.67 6.485-2.71-.21-1.63-4.604-3.55-5.648-8.75-2.09-23.23-4.818-31.77-8.784-1.28-1.67-.67-2.34-.46-4.638 11.12-7.91 27.64-14.603 29.72-14.603.42-.837 1.68-5.23 3.35-4.602zM516.85 306.36c8.064 1.48 18.184.418 25.707 1.463 2.15-.29-.208-5.647 3.97-4.6 2.35 4.597.42 11.084-.417 18.823-1.068.208-1.87.416-2.508-.628-2.717-.21.21-5.437-2.717-6.692-9.823.21-18.183-2.092-26.125-.836.21 3.137.646 7.02-1.49 8.274-.852 0-2.103-.137-2.348-1.044-2.014-7.44 2.166-17.688 1.33-20.826 3.843-3.76 2.676 4.396 4.598 6.066zm26.125 27.19c2.933 4.983 0 11.292-3.135 16.73-.595 2.158 2.51 3.765.836 6.065-.96 1.32-6.06-2.51-6.06-2.51l-9.823-.208c-1.283-1.673-.233-3.138.835-4.183 7.733 1.045 7.942 2.3 11.914-2.51 2.032-2.462 2.945-7.114 2.09-9.62-2.134-3.55-7.66-3.557-11.078-4.183-5.978.63-12.87-3.54-16.928 3.14-.854 2.93-4.39 7.32.208 10.46 1.493.21 1.882 1.26 3.972 2.3.21 2.09-4.85 1.13-6.348.92-2.134-.42-3.672-4.05-4.102-6.35 1.462-6.48 1.88-13.8 6.598-16.62 12.003-2.2 14.935.31 24.333.94 2.3 1.26 4.337 2.31 6.688 5.65zm0-93.908s2.298-2.51-1.045-5.438c-3.344-2.928-12.123-5.647-18.81-3.137-6.687 2.51-17.973 6.902-14.63 21.542 3.345 14.64 22.154 7.52 22.154 7.52s15.624-4.42 13.376-17.36c-.836-4.81-3.553 5.02-3.553 5.02s-7.315 3.34-7.733 5.02c0 0-10.24 2.93-11.285 3.76 0 0-11.5 2.3-10.45-10.04 0 0 15.04-10.04 21.31-10.25 6.27-.21 6.48-1.05 8.57 1.88s2.09 1.46 2.09 1.46zM500.02 376.028c.404 1.417 1.62 2.024 2.83 2.43 7.278 4.045 19.57 10.998 21.824 11.29 2.253.295 5.06-4.312 6.372-3.562 1.312.75-2.085 7.468-4.31 10.503-5.624 1.31-14.55 1.2-20.617.18-.61.6-3.59 1.05-1.32 2.81 4.12 3.18 10.47 9.02 13.3 13.88-2.83 4.24-6.18 11.93-9.21 15.58-1.22.4-2.97 1.48-3.91-1.33-.38-3.57 5.43-6.38 2.71-8.7-6.88-5.87-15.65-10.17-23.33-13.81-2.63-.41-2.25 6-5.81 4.87-.94-2.63 5.46-12.56 7.87-16.7 1.41-.61 2.22 1.05 2.62 2.06-1.5 5.63 6.71 5.6 9.74 8.44 0 0 10.24 9 11.99 7.69 1.5-1.13-6.09-7.39-10.12-11.82-1.35-1.48-.55-3.69-1.31-3.76-2.06-.19-4.73-3.06-6.03-4.32-5.41-5.25 4.15-3.19 4.15-3.19 5.46 1.82 17.99 2.25 19.12 2.25s-12.75-8.06-18.56-9.75c-.96-.02-1.1 1.74-1.88 2.06-1.42 0-2.81-.38-2.81-2.25 2.62-5.44 2.81-9.01 4.87-9.19 2.43-.61 1.77 2.26 1.77 4.28zm-61.93 85.177c1.022-1.022 5.644.52 7.87 1.126 3.75 1.32 8.247.57 10.186.71.184 4.39 1.337 10.42 1.435 15.62-1.5 4.32-.86 6.66-.93 8.63 0 0-1.68-1.12-4.12 2.07 0 0-3 1.88-6.18-2.63-3.18-4.5-8.99-10.5-9.56-11.63-.56-1.12 0-5.25-3.37-7.12 0 0 2.82-1.5.94-4.31 0 0 2.07-.75 3.75-2.44zm-4.686 1.314c-4.685 1.12-5.886 6.23-9.757 8.21 0 0-3.516 1.39-2.425 2.66 1.125 1.31 4.685-2.25 5.06.37 3.04 2.18 5.435 7.13 5.435 7.13 6.177 5.66 5.247 5.06 11.62 15.19.14.95-2.433 2.83-2.436 3.75 0 .76 0 1.69 1.32 1.69 5.44-3.94 12-8.88 17.06-13.13 3.94-7.13 12.93-9.38 11.13-12.86-3.07-4.4-5.36 2.09-7.38.48-.49-1.5-.75-3.57-.18-5.07-2.25-2.26-3.32-4.17-2.81-5.82 8.81-1.69 10.68-.38 13.5.75 3.44 1.21-5.43 3 .57 6.94 3.75-1.13 3.56-6.57 10.5-10.13.61-1.22 5.87-6.61 4.25-7.42-1.01 0-3.27.39-3.87 1.6-2.24 0-1.8 2.75-3.37 2.81-4.87-3.38-13.63-1.73-19.68-1.88 0 0-.18-12-2.62-15.57-2.43-3.57-2.43-3.75-6.18-.57-3.75 3.19-3.21 5.15-3.21 5.15.58 2.73 4.2-.02 6.02-.84 1.31-1.5 3.46 8.4.75 11.25-2.02 2.13-2.06-2.44-10.12-1.32-1.5-1.69 4.31-1.31 0-5.82-5.26 2.02-4.87 3.75-8.81 7.5 0 0-4.12 2.63-4.31 4.88zm27.922-23.26c4.124-3.57 11.995.56 15.932 2.06 9.933 2.81 17.43 6.75 18.74 6.19 1.314-.57 5.81-6.94 5.25-8.82-.563-1.88-19.426-22.01-19.426-22.01-.81-2.23-3.44-6.88-4.377-5.38-.937 1.5-8.505 8.48-6.56 10.13 2.436 2.06 4.498-.38 4.498-.38 4.123-.94 5.333 1.77 6.747 3.19-2.02 2.43-5.81 9.56-8.996 7.87-.958-.82-6.185-1.13-2.06-4.5 0-1.32-.938-1.88-2.25-1.88-6.067 1.01-5.53 5.16-9.37 9-5.623 6.56.765 5.46 1.872 4.5zm18.4-4.3l-.56-.37.504-.45c.45-.4 1.446-3.15 1.71-3.91.38-1.08 2.378-1.07 3.375-1.5.657-.29 2.107.82 3.185 1.31 3.37 2.53 7.493 8.79 7.026 10.11-.466 1.32-11.754-2.97-15.24-5.22zm-60.19 47.62c3.636 5.87 8.847 10.03 10.87 16.5 1.21 2.43 3.18 4.43 5.81 2.81 3.185.56 2.81 1.5 2.06 3-3.795.85-4.132 3.64-6.56 2.62-4.684-2.25-11.344-5.56-16.4-9-.806-.21-1.415.4-1.82 1.01.98 7.42 1.368 11.84 1.166 18.11-3.64.8-9.934 7.87-12.183 4.31-1.13-2.44 2.24-4.32 1.68-5.63-2.44-5.69-6.69-11.52-12.56-19.88-1.73-2.46-6.75 2.06-5.06-2.25 0 0 10.73-6.21 12.3-6.77 1.57-.55 2.41.71 1.94 2.26-.39 1.26-4.31 3.37-1.31 5.81 1.68 1.69.07 2.63.93 3.94 3.93 4.87 5.57 11.12 8.81 12.94 3.56-10.88-1.82-16.75-2.63-23.63 3.23-1.82 2.35 1.7 5.99 1.5 9.37 3.56 11.11 7.93 12.93 7.12-1.82-4.25-7.5-11.26-11.62-15.38-.04-.01-4.42 1.64-5.25-.56 0-1.34.37-1.69 4.12-2.82 1.34-.41 2.28-2.4 3.75-3.38 2.25-1.5 3 7.31 3 7.31zm-255.2-425.99c4.676 6.86 9.965 14.77 14.847 21.63 3.007 2.26 3.964-1.75 6.203-1.13 4.886 4.32-.378 2.81-2.82 4.89-2.644 1.45-8.02 7.77-11.277 7.15-1.13-1.88 1.6-4.26 1.5-5.27-.46-4.4-3.39-7.37-6.77-10.91-1.7-1.78-3.43-5.84-5.27-7.71-2.26-2.3-2.85-4-4.89-6.02-1.63.21-3.86 3.05-5.08 2.63-.82 0-2.45-.94-2.07-2.82 0 0 3.74-2.89 6.58-4.89 3.19-2.26 7.89-3.95 7.89-3.95 4.7 1.12-.71 4.31 1.13 6.39zm-23.496 6.58c2.068 3.57 4.887 8.27 3.935 11.7-.552 1.98-13.52-.8-19.16 4.28-1.15 2.03-3.066 2.52-2.254 5.64 3.46 3.94 6.15.75 10.01 1.58 7.53-2.29 18.82-7.41 25.33-1.59 2.04 1.66 2.66 5.61 2.26 7.9-1.53 6.51-4.72 7.56-9.4 10.53-1.08.68-4.35 1.2-5.45 1.88-1.08.66-1.01 3.8-2.06 4.52-1.82 1.25-3.94 3.2-5.45 4.88-.94.94-4.13 1.51-2.25-3.95 1.13-3.01.94-5.64 1.51-8.65 3.01-3.01 7.52-1.13 12.59-1.5 3.57-.96 5.93-4.31 4.7-9.41-12.4-7.69-20.86 10.91-36.09.94.21-4.16-1.94-11.76 1.32-14.67 5.9-6.45 13.07-2.06 16.73-12.04 1.84-.21 3.76-4.35 3.76-2.07zm-20.486 47.03c-3.76-.38-5.827 1.69-6.766 1.13-.94-.57 1.315-7.72 0-12.04-1.316-4.33-6.58-4.33-13.533-3.76-.785.59-.878 2.21-1.692 3-4.51 2.07-7.454 6.93-10.713 11.1-1.627 2.91-8.458 4.89-3.76 9.4 3.196-.38 2.49-4.58 5.336-4.16l15.866 14.76c1.933 1.97 5.224 4.29 5.865 8.02.168.98-3.384 2.07-.94 4.51 3.383.75 6.578-8.65 12.525-11.87 0 0 .624-1.66 0-2.08-2.188-1.48-2.748 1.78-4.444 2.47-3.57-2.07-3.57-.19-3.57-.19-4.7-1.13-3.75-4.95-6.39-8.28-.753-2.82 2.38-3.27 3.194-4.52 4.272.2 8.458 1.69 13.533 3.95 3.863 1.45 10.034-2.75 9.774-6.4-.19-2.64-8.28.37-14.29-5.08zm-15.224 5.83c-1.44 1.68-4.18.48-6.166-1.3-.6-1-.82-1.81-1.728-2.47-1.433-1.05-1.88-1.13-2.444-3.01.166-2.05.438-4.26 3.57-6.4l2.86-.82c1.705.13 4.757.89 6.163 3.45 0 0-.08 7.2-2.255 10.53zm-45.673 48.34c0 2.25 4.548 3.96 9.022 9.78.2 1.87 7.89 6.96 5.82 9.03-2.07 2.06-24.81-2.07-24.81-2.07-3.05-1.04 2.44-4.14-.94-6.02-3.87-.42-3.03 4.88-5.27 6.96-.21 2.91-5.45 5.76-3.01 8.46 5.49-1.04 1.88-2.26 6.58-1.13 8.13 0 33.74 4.8 34.77.94 1.03-3.86.08-4.4-.94-5.65-4.22-6.2-9.17-13.14-12.97-17.12-2.06-2.16-4.51-2.64-4.51-3.76 0-1.55-3.77-9.06-3.76.56z"/>
+  <path d="M59.27 159.48c-1.222 1.04-3.81 7.434-5.64 6.395-4.135-2.822 2.256-11.286 4.7-12.602.94-3.198 3.563-6.267 4.987-8.967 2.338-5.08 5.725-13.416 9.86-15.297 1.89-.86 1.88-4.18 2.955-4.46 2.073-.55 4.94-.06 7.947 4.08 1.71 2.36 5.07 1.88 3.94 4.32-1.52 3.28-15.42-3.2-18.05 5.26-1.02 2.49-5.47 2.52-4.14 6.58 3.05 2.49 7.03 6.92 10.9 7.33 6.71-1.87-4.57-12.05 3.57-9.97 1.22 2.91 9.58 5.08 9.02 8.09-2.24.83-8.27.94-7.52 5.07 2.03 4.16 7.25 5.27 10.71 7.14 2.84-4.58 5.26-7.72 4.7-13.17-2.24-1.25-1.63-7.16-2.45-9.03 4.47-3.74 7.97 4.33 11.84 6.21.2 2.7-4.32 6.18-5.64 8.84-3.39 6.77-7.54 12.84-12.22 18.24-2.03-.21-.74-2.44-.94-4.52-8.54-5.82-16.92-12.6-27.37-16.45 0 1.25-1.52.82-1.39 3.85 0 0 .75.94.19 3.01zm-17.293 39.31c6.916 2.496 18.49 6.642 24.998 9.97 3.254 2.078 3.57-7.148 6.767-2.446-.813 4.573-3.384 4.703-4.837 15.03-.61.832-1.178 1.146-2.442.414-2.683-3.218 1.055-2.9-3.623-6.228-4.518-.71-15.036-6.96-24.058-9.216-1.65.112-1.315 2.82-3.383 3.574-2.07.752-2.82-.94-2.82-.94-.21-5.614 4.6-11.86 5.82-17.68 6.01-1.318-1.31 6.9 3.57 7.523zm-6.767 14.67c-.61 3.12-1.68 5.747.753 6.396 8.458 2.258 29.133 7.524 29.885 8.653.752 1.12-.863 7.07-1.88 9.78-3.57 2.82-21.293 1.19-27.598 3.68-2.238.62-4.68.62-6.713 2.08 6.592 1.72 18.523 2.51 26.98 3.64 1.626-.47 1.395-2.51 2.632-3.39 1.31-.75 2.76-1.02 3.38.56.62 1.58-2.11 13.65-3.2 13.35-3.39-.94-1.13-4.14-3.01-5.08-5.15-2.76-13.82-2.39-19.17-3.76-3.26 1.04-11.47-4.52-10.53 3.01-2.04 1.25-3.53 1.32-4.14-.76.1-1.25 1.4-2.21 1.5-3.58.3-4.11-.34-8.86 2.25-11.66 8.74-3.12 33.08-2.45 34.02-4.33.94-1.88-25.94-7.34-27.44-7.15-1.51.19-1.7 3.76-4.16 3.23-3.96-.85.39-7.74.39-7.74l1.69-8.09c2.44-.84 3.3.09 4.32 1.13zm22.038 50.1c4.277-1.196 2.773 22.692 1.862 24.387-.453.842-3.255 2.495-3.255 2.495-10.577 0-19.76-.428-28.914-.428-3.05.413-.74 2.063-3.38 4.702-.56.563-1.88 1.504-3.19 0 .45-3.378 1.19-6.516 1.32-9.405-.56-6.39-.28-9.8 1.13-9.4 2.82-.94 2.16 4.78 3.76 4.7 8.46-.37 17.98 2.57 26.32 1.32 4.27-2.7 3.95-6.58 3.24-11.78l-1.62-3.12c-2.93-.89-18.34-2.02-27.82-1.87 0 0-1.42 3.04-3.49 3.23-2.06.19-.94-10.91.57-13.16 2.45-2.49 2.78 4.39 5.45 4.52 16.36.76 21.06.76 28.06 3.83zm377.1-165.01c1.67-8.07 4.465-14.833 6.674-21.15-.6-2.003-2.846-3.972-4.45-4.174-8.063 4.174-19.185 14.75-28.083 21.15-1.21-1.404-2.43-1.112-5.29-4.175-1.61-.6-3.92-2.2-3.32-4.2 2.68-3.96 5.3-8.98 7.49-14.16.28-2.78 2.49-7.78 5-10.29 8.9 2.51 2.46 13.34 6.95 16.14 2.22 1.39 7.78-10.57 7.23-11.96-.35-.87-12.28-8.05-20.58-12.8-4.95-2.83-7.82-4.59-8.34-4.17-1.39 1.11-8.34 12.24-5.29 12.52.95.09 2.53-2.44 5-3.61 3.89.56 7.68-1.81 9.73-.55-5.01 8.35-9.18 18.65-12.79 26.16-2.61.6-10.29-4.17-10.29-1.95 0 6.68 13.9 7.55 18.35 13.36 4.45 3.06 11.68 9.18 12.51 6.96.83-2.22-6.4-6.96 3.61-9.46 2.78 2.78 6.34 4.6 8.34 6.4.8 2.8-1.59 5.11-1.39 7.51-1.2 1.21-3.89-4.45-5-1.11-3.06 1.95 10.34 12.15 11.4 10.02 1.94-3.89-2.5-4.73-2.23-5.84.4-1.59 2.94-5.57 4.73-10.57zm-5.84-3.62c-.653.57-1.743-.29-1.743-.29s-4.652-2.492-6.042-4.16c-1.39-1.67 6.952-6.958 6.952-6.958l6.395-3.34c.835 2.506-3.824 13.243-5.56 14.75zm48.106 11.967c.277 2.226-7.33 6.01-9.732 10.017-6.118 1.392 1.032-9.572.833-10.574-1.112-3.34-1.945-5.287-3.336-6.678-7.81 5.81-16.41 17.81-19.47 22.54.8 1.2 4.07 3.955 3.87 5.557-3.87 5.85-2.7-1.03-4.71-.83-.35-1-1.12 1.11-3.06-1.67-3.62-3.62-9.48-5.73-7.23-9.18 2.2-.61 4.12 2.63 6.12.83 5.2-7.21 13.97-15.82 20.57-21.43-1.39-.98-3.19-.99-4.73-1.67-1.54-.69-2.82-2.04-4.45-1.95-2.5 1.39-3.62 2.78-6.31 3.09-1 0-2.2.2-2.81-1 2.71-4.6 5.36-6.88 7.76-9.69h2.2l24.45 22.62zm-93.348 397.306c.81 1.845 1.784 2.954-1.215 4.267-2.99 3-5.62 1.37-6.87-1.808-1.21-2.256-.92-3.73.7-4.757 2.23-.614 6.39.454 7.4 2.298zm7.83 16.12c.81 2.252 1.27 4.77-1.36 5.59-2.02.41-3.853 2.308-5.32-.672-1.053-2.14-2.343-4.64-.116-6.08 5.248-2.06 5.583-.06 6.795 1.17zm76.88-392.828s-6.724-5.604.757-6.057c6.242-.38 5.487.757 5.676 2.27.18 1.515-1.52 4.734-2.46 5.112-.95.38-3.98-1.325-3.98-1.325zm-10.592 11.925s1.154 3.476 5.296-.946c2.838-3.03-.032-4.316-.756-4.922-2.27-1.892-7.944 1.135-6.81 3.975 1.135 2.84 2.27 1.894 2.27 1.894zM58.92 335.905s7.816.293 4.347 8.442c-2.94 6.907-7.158-.127-7.158-.127s-4.61-7.548 2.81-8.315zm-13.803 4.86s8.052.895 6.39 5.884c-1.66 4.98-9.458 5.24-9.842.76-.383-4.48 1.407-6.78 3.452-6.65z"/>
+</svg>
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 452eaca2f..d195242c7 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -640,7 +640,7 @@ tagAccessPredicate AuthTime = APDB $ \mAuthId route _ -> case route of
         -> return Authorized
       | otherwise
         -> mzero
-     
+
   CSheetR tid ssh csh shn subRoute -> maybeT (unauthorizedI MsgUnauthorizedSheetTime) $ do
     Entity cid _ <- MaybeT . getBy $ TermSchoolCourseShort tid ssh csh
     Entity _sid Sheet{..} <- MaybeT . getBy $ CourseSheet cid shn
@@ -1241,7 +1241,7 @@ siteLayout' headingOverride widget = do
       navbar = $(widgetFile "widgets/navbar/navbar")
       asidenav :: Widget
       asidenav = $(widgetFile "widgets/asidenav/asidenav")
-        where logo = preEscapedToMarkup $ decodeUtf8 $(embedFile "assets/logo.svg")
+        where logo = preEscapedToMarkup $ decodeUtf8 $(embedFile "assets/lmu/logo.svg")
       footer :: Widget
       footer = $(widgetFile "widgets/footer/footer")
       alerts :: Widget
diff --git a/static/css/utils/asidenav.scss b/static/css/utils/asidenav.scss
index fa7eadb1d..8af1074e8 100644
--- a/static/css/utils/asidenav.scss
+++ b/static/css/utils/asidenav.scss
@@ -164,6 +164,27 @@
   }
 }
 
+/* SEAL */
+
+.asidenav__sigillum {
+  position: absolute;
+  bottom: -40px;
+  right: 25px;
+  opacity: 0.2;
+
+  > img {
+    width: 350px;
+  }
+}
+
+@media (max-width: 768px) {
+  .asidenav__sigillum {
+    right: auto;
+    left: 50%;
+    transform: translateX(-50%);
+  }
+}
+
 /* LIST-ITEM */
 
 .asidenav__list-item {
diff --git a/static/img/lmu/sigillum.svg b/static/img/lmu/sigillum.svg
new file mode 120000
index 000000000..bf7553917
--- /dev/null
+++ b/static/img/lmu/sigillum.svg
@@ -0,0 +1 @@
+../../../assets/lmu/sigillum.svg
\ No newline at end of file
diff --git a/templates/widgets/asidenav/asidenav.hamlet b/templates/widgets/asidenav/asidenav.hamlet
index 2c49a065d..39b5e6ec3 100644
--- a/templates/widgets/asidenav/asidenav.hamlet
+++ b/templates/widgets/asidenav/asidenav.hamlet
@@ -26,3 +26,6 @@ $newline never
                         <li .asidenav__nested-list-item>
                           <a .asidenav__link-wrapper href=#{route}>_{menuItemLabel}
                       $of _
+
+    <div .asidenav__sigillum>
+      <img src=@{StaticR img_lmu_sigillum_svg}>